From 9f6a2f3cca3b460a1b62491855fee5bc7e710c01 Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Thu, 28 Jul 2022 16:45:49 +0000 Subject: [PATCH 1/4] Update Bazel from 4.2.0 -> 5.2.0 --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index 6aba2b2..91ff572 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -4.2.0 +5.2.0 From f7dbb20c23d431f4f216a633d5d036caef4bff5a Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Thu, 28 Jul 2022 16:50:52 +0000 Subject: [PATCH 2/4] Update BUILD --- dokka/BUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dokka/BUILD b/dokka/BUILD index 687d78c..81a1484 100644 --- a/dokka/BUILD +++ b/dokka/BUILD @@ -1,4 +1,4 @@ -load("@rules_java//java:defs.bzl", "java_binary", "java_library") +load("@rules_java//java:defs.bzl", "java_binary", "java_import") java_binary( name = "dokka_cli", @@ -11,9 +11,9 @@ java_binary( ], ) -java_library( +java_import( name = "dokka_gfm", - resource_jars = [ + runtime_deps = [ "@rules_dokka_dependencies//:org_jetbrains_dokka_dokka_base", "@rules_dokka_dependencies//:org_jetbrains_dokka_gfm_plugin", "@rules_dokka_dependencies//:org_jetbrains_kotlin_kotlin_reflect", @@ -24,9 +24,9 @@ java_library( visibility = ["//visibility:public"], ) -java_library( +java_import( name = "dokka_html", - resource_jars = [ + runtime_deps = [ "@rules_dokka_dependencies//:org_jetbrains_dokka_dokka_base", "@rules_dokka_dependencies//:org_jetbrains_kotlin_kotlin_reflect", "@rules_dokka_dependencies//:org_jetbrains_kotlin_kotlin_stdlib", @@ -37,9 +37,9 @@ java_library( visibility = ["//visibility:public"], ) -java_library( +java_import( name = "dokka_javadoc", - resource_jars = [ + runtime_deps = [ "@rules_dokka_dependencies//:com_soywiz_korlibs_korte_korte_jvm", "@rules_dokka_dependencies//:org_jetbrains_dokka_dokka_base", "@rules_dokka_dependencies//:org_jetbrains_dokka_javadoc_plugin", From d164f87ea1f620fdd517da82989b4ca2754e1618 Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Thu, 28 Jul 2022 16:53:24 +0000 Subject: [PATCH 3/4] Update BUILD --- dokka/BUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dokka/BUILD b/dokka/BUILD index 81a1484..fd5b7ce 100644 --- a/dokka/BUILD +++ b/dokka/BUILD @@ -1,4 +1,4 @@ -load("@rules_java//java:defs.bzl", "java_binary", "java_import") +load("@rules_java//java:defs.bzl", "java_binary", "java_library") java_binary( name = "dokka_cli", @@ -11,7 +11,7 @@ java_binary( ], ) -java_import( +java_library( name = "dokka_gfm", runtime_deps = [ "@rules_dokka_dependencies//:org_jetbrains_dokka_dokka_base", @@ -24,7 +24,7 @@ java_import( visibility = ["//visibility:public"], ) -java_import( +java_library( name = "dokka_html", runtime_deps = [ "@rules_dokka_dependencies//:org_jetbrains_dokka_dokka_base", @@ -37,7 +37,7 @@ java_import( visibility = ["//visibility:public"], ) -java_import( +java_library( name = "dokka_javadoc", runtime_deps = [ "@rules_dokka_dependencies//:com_soywiz_korlibs_korte_korte_jvm", From 051e81a0bdabf68795169b52e0a5f954c19dd652 Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Thu, 28 Jul 2022 09:55:15 -0700 Subject: [PATCH 4/4] Formatting --- dokka/BUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dokka/BUILD b/dokka/BUILD index fd5b7ce..9eb4fd7 100644 --- a/dokka/BUILD +++ b/dokka/BUILD @@ -13,6 +13,7 @@ java_binary( java_library( name = "dokka_gfm", + visibility = ["//visibility:public"], runtime_deps = [ "@rules_dokka_dependencies//:org_jetbrains_dokka_dokka_base", "@rules_dokka_dependencies//:org_jetbrains_dokka_gfm_plugin", @@ -21,11 +22,11 @@ java_library( "@rules_dokka_dependencies//:org_jetbrains_kotlin_kotlin_stdlib_jdk8", "@rules_dokka_dependencies//:org_jetbrains_kotlinx_kotlinx_coroutines_core", ], - visibility = ["//visibility:public"], ) java_library( name = "dokka_html", + visibility = ["//visibility:public"], runtime_deps = [ "@rules_dokka_dependencies//:org_jetbrains_dokka_dokka_base", "@rules_dokka_dependencies//:org_jetbrains_kotlin_kotlin_reflect", @@ -34,11 +35,11 @@ java_library( "@rules_dokka_dependencies//:org_jetbrains_kotlinx_kotlinx_coroutines_core", "@rules_dokka_dependencies//:org_jetbrains_kotlinx_kotlinx_html_jvm", ], - visibility = ["//visibility:public"], ) java_library( name = "dokka_javadoc", + visibility = ["//visibility:public"], runtime_deps = [ "@rules_dokka_dependencies//:com_soywiz_korlibs_korte_korte_jvm", "@rules_dokka_dependencies//:org_jetbrains_dokka_dokka_base", @@ -50,5 +51,4 @@ java_library( "@rules_dokka_dependencies//:org_jetbrains_kotlinx_kotlinx_coroutines_core", "@rules_dokka_dependencies//:org_jetbrains_kotlinx_kotlinx_html_jvm", ], - visibility = ["//visibility:public"], )