Skip to content

Commit

Permalink
Normalize namespace to @rules_kotlin by using repo_mapping feature. (#61
Browse files Browse the repository at this point in the history
)

* Use repo_mapping feature to normalize Kotlin rules package name to @rules_kotlin.

---------

Co-authored-by: Aaron Hurst <aaronpaulhurst@gmail.com>
  • Loading branch information
aaronhurst-google and aaronpaulhurst committed Jun 13, 2024
1 parent 7adc0ac commit a295d9b
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
11 changes: 6 additions & 5 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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()

# -------------------------
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/google/summit/BUILD
Original file line number Diff line number Diff line change
@@ -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"])

Expand Down Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion src/main/java/com/google/summit/ast/BUILD
Original file line number Diff line number Diff line change
@@ -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"])

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/summit/serialization/BUILD
Original file line number Diff line number Diff line change
@@ -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"])

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/summit/symbols/BUILD
Original file line number Diff line number Diff line change
@@ -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"])

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/summit/translation/BUILD
Original file line number Diff line number Diff line change
@@ -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"])

Expand Down
2 changes: 1 addition & 1 deletion src/main/javatests/com/google/summit/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/main/javatests/com/google/summit/ast/traversal/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/main/javatests/com/google/summit/serialization/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
],
Expand Down
2 changes: 1 addition & 1 deletion src/main/javatests/com/google/summit/testing/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/main/javatests/com/google/summit/translation/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit a295d9b

Please sign in to comment.