diff --git a/BUILD b/BUILD index 5e7fe98..e007888 100644 --- a/BUILD +++ b/BUILD @@ -13,7 +13,7 @@ alias( # Assemble JARs, POM for publishing to Maven central # -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library") load("@vaticle_bazel_distribution//maven:rules.bzl", "assemble_maven") kt_jvm_library( diff --git a/WORKSPACE b/WORKSPACE index 7a3ff1f..6791bf5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -38,18 +38,18 @@ rules_kotlin_version = "1.9.0" rules_kotlin_sha = "5766f1e599acf551aa56f49dab9ab9108269b03c557496c54acaf41f98e2b8d6" http_archive( - name = "io_bazel_rules_kotlin", + name = "rules_kotlin", urls = ["https://github.com/bazelbuild/rules_kotlin/releases/download/v%s/rules_kotlin-v%s.tar.gz" % (rules_kotlin_version, rules_kotlin_version)], sha256 = rules_kotlin_sha, ) -load("@io_bazel_rules_kotlin//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies") +load("@rules_kotlin//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies") kt_download_local_dev_dependencies() -load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories") +load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories") kotlin_repositories() -load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_register_toolchains") +load("@rules_kotlin//kotlin:kotlin.bzl", "kt_register_toolchains") kt_register_toolchains() # ------------------------- @@ -59,7 +59,8 @@ kt_register_toolchains() git_repository( name = "vaticle_bazel_distribution", remote = "https://github.com/vaticle/bazel-distribution", - commit = "8767cdec452c14274493c576a2955059ff17f2e4" + commit = "8767cdec452c14274493c576a2955059ff17f2e4", + repo_mapping = {"@io_bazel_rules_kotlin" : "@rules_kotlin"} ) # Load //common diff --git a/src/main/java/com/google/summit/BUILD b/src/main/java/com/google/summit/BUILD index 9ed9466..16c93af 100644 --- a/src/main/java/com/google/summit/BUILD +++ b/src/main/java/com/google/summit/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library") package(default_visibility = ["//visibility:public"]) @@ -34,6 +34,6 @@ kt_jvm_binary( main_class = "com.google.summit.SummitTool", deps = [ ":SummitAST", - "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-stdlib", + "@rules_kotlin//kotlin/compiler:kotlin-stdlib", ], ) diff --git a/src/main/java/com/google/summit/ast/BUILD b/src/main/java/com/google/summit/ast/BUILD index 45c8ef9..6be5319 100644 --- a/src/main/java/com/google/summit/ast/BUILD +++ b/src/main/java/com/google/summit/ast/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") package(default_visibility = ["//visibility:public"]) diff --git a/src/main/java/com/google/summit/serialization/BUILD b/src/main/java/com/google/summit/serialization/BUILD index a169fbf..cf94ed2 100644 --- a/src/main/java/com/google/summit/serialization/BUILD +++ b/src/main/java/com/google/summit/serialization/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") package(default_visibility = ["//visibility:public"]) diff --git a/src/main/java/com/google/summit/symbols/BUILD b/src/main/java/com/google/summit/symbols/BUILD index 328ba36..53451ff 100644 --- a/src/main/java/com/google/summit/symbols/BUILD +++ b/src/main/java/com/google/summit/symbols/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") package(default_visibility = ["//visibility:public"]) diff --git a/src/main/java/com/google/summit/translation/BUILD b/src/main/java/com/google/summit/translation/BUILD index 01f60f4..9785b0d 100644 --- a/src/main/java/com/google/summit/translation/BUILD +++ b/src/main/java/com/google/summit/translation/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") package(default_visibility = ["//visibility:public"]) diff --git a/src/main/javatests/com/google/summit/BUILD b/src/main/javatests/com/google/summit/BUILD index 3ec318b..d24307f 100644 --- a/src/main/javatests/com/google/summit/BUILD +++ b/src/main/javatests/com/google/summit/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") filegroup( name = "testdata", diff --git a/src/main/javatests/com/google/summit/ast/traversal/BUILD b/src/main/javatests/com/google/summit/ast/traversal/BUILD index 22ca4da..0c9f545 100644 --- a/src/main/javatests/com/google/summit/ast/traversal/BUILD +++ b/src/main/javatests/com/google/summit/ast/traversal/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") kt_jvm_library( name = "tests", diff --git a/src/main/javatests/com/google/summit/serialization/BUILD b/src/main/javatests/com/google/summit/serialization/BUILD index e5e6449..6106699 100644 --- a/src/main/javatests/com/google/summit/serialization/BUILD +++ b/src/main/javatests/com/google/summit/serialization/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") kt_jvm_library( name = "tests", @@ -15,8 +15,8 @@ kt_jvm_library( "//src/main/java/com/google/summit/ast", "//src/main/java/com/google/summit/serialization", "//src/main/javatests/com/google/summit/testing", - "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-stdlib", - "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-test", + "@rules_kotlin//kotlin/compiler:kotlin-stdlib", + "@rules_kotlin//kotlin/compiler:kotlin-test", "@maven//:junit_junit", "@maven//:com_google_truth_truth", ], diff --git a/src/main/javatests/com/google/summit/testing/BUILD b/src/main/javatests/com/google/summit/testing/BUILD index 3b91a04..c8ccc9e 100644 --- a/src/main/javatests/com/google/summit/testing/BUILD +++ b/src/main/javatests/com/google/summit/testing/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") kt_jvm_library( name = "testing", diff --git a/src/main/javatests/com/google/summit/translation/BUILD b/src/main/javatests/com/google/summit/translation/BUILD index fafad95..c0a830e 100644 --- a/src/main/javatests/com/google/summit/translation/BUILD +++ b/src/main/javatests/com/google/summit/translation/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") kt_jvm_library( name = "tests", @@ -9,7 +9,7 @@ kt_jvm_library( "//src/main/javatests/com/google/summit/testing", "@maven//:junit_junit", "@maven//:com_google_truth_truth", - "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-test", + "@rules_kotlin//kotlin/compiler:kotlin-test", ], runtime_deps = [ "@maven//:com_google_flogger_flogger_system_backend",