Skip to content

Commit 8bdeb65

Browse files
committed
Use a private maven repo name to avoid conflicts.
1 parent 514fe37 commit 8bdeb65

File tree

12 files changed

+706
-1476
lines changed

12 files changed

+706
-1476
lines changed

MODULE.bazel

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ bazel_dep(name = "rules_java", version = "8.11.0")
99
bazel_dep(name = "rules_jvm_external", version = "6.7")
1010
bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java", version = "1.71.0")
1111

12-
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
13-
maven.install(
12+
grpc_kotlin_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
13+
grpc_kotlin_maven.install(
14+
name = "grpc_kotlin_maven",
1415
# Rerun whenever adding new artifacts.
15-
# $ REPIN=1 bazelisk run @maven//:pin
16+
# $ REPIN=1 bazelisk run @grpc_kotlin_maven//:pin
1617
artifacts = [
1718
"com.google.jimfs:jimfs:1.3.0",
1819
"com.google.truth:truth:1.4.2",
@@ -26,8 +27,8 @@ maven.install(
2627
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1",
2728
],
2829
fetch_sources = False,
29-
lock_file = "//:maven_install.json",
30+
lock_file = "//:grpc_kotlin_maven_install.json",
3031
generate_compat_repositories = True,
3132
strict_visibility = True,
3233
)
33-
use_repo(maven, "maven")
34+
use_repo(grpc_kotlin_maven, "grpc_kotlin_maven")

compiler/src/main/java/io/grpc/kotlin/generator/BUILD.bazel

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ kt_jvm_library(
1515
"//stub/src/main/java/io/grpc/kotlin:stub",
1616
"@com_google_protobuf//:protobuf_java",
1717
"@io_grpc_grpc_java//core",
18-
"@maven//:com_google_guava_guava",
19-
"@maven//:com_squareup_kotlinpoet",
20-
"@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
18+
"@grpc_kotlin_maven//:com_google_guava_guava",
19+
"@grpc_kotlin_maven//:com_squareup_kotlinpoet",
20+
"@grpc_kotlin_maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
2121
],
2222
)
2323

compiler/src/main/java/io/grpc/kotlin/generator/protoc/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ kt_jvm_library(
1212
deps = [
1313
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/graph",
1414
"@com_google_protobuf//:protobuf_java",
15-
"@maven//:com_google_guava_guava",
16-
"@maven//:com_squareup_kotlinpoet",
15+
"@grpc_kotlin_maven//:com_google_guava_guava",
16+
"@grpc_kotlin_maven//:com_squareup_kotlinpoet",
1717
],
1818
)

compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ kt_jvm_library(
1111
srcs = glob(["*.kt"]),
1212
deps = [
1313
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
14-
"@maven//:com_google_truth_truth",
15-
"@maven//:com_squareup_kotlinpoet",
14+
"@grpc_kotlin_maven//:com_google_truth_truth",
15+
"@grpc_kotlin_maven//:com_squareup_kotlinpoet",
1616
],
1717
)

compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/graph/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ kt_jvm_library(
1111
srcs = ["TopologicalSortGraph.kt"],
1212
deps = [
1313
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/sort",
14-
"@maven//:com_google_guava_guava",
14+
"@grpc_kotlin_maven//:com_google_guava_guava",
1515
],
1616
)

compiler/src/test/java/io/grpc/kotlin/generator/protoc/BUILD.bazel

+13-13
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ kt_jvm_test(
1111
deps = [
1212
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
1313
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing",
14-
"@maven//:com_google_truth_truth",
14+
"@grpc_kotlin_maven//:com_google_truth_truth",
1515
],
1616
)
1717

@@ -21,7 +21,7 @@ kt_jvm_test(
2121
test_class = "io.grpc.kotlin.generator.protoc.ConstantNameTest",
2222
deps = [
2323
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
24-
"@maven//:com_google_truth_truth",
24+
"@grpc_kotlin_maven//:com_google_truth_truth",
2525
],
2626
)
2727

@@ -32,7 +32,7 @@ kt_jvm_test(
3232
deps = [
3333
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
3434
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing",
35-
"@maven//:com_google_truth_truth",
35+
"@grpc_kotlin_maven//:com_google_truth_truth",
3636
],
3737
)
3838

@@ -47,7 +47,7 @@ kt_jvm_test(
4747
"//compiler/src/test/proto/testing:has_nested_class_name_conflict_java_proto",
4848
"//compiler/src/test/proto/testing:has_outer_class_name_conflict_java_proto",
4949
"//compiler/src/test/proto/testing:proto-file-with-hyphen_java_proto",
50-
"@maven//:com_google_truth_truth",
50+
"@grpc_kotlin_maven//:com_google_truth_truth",
5151
],
5252
)
5353

@@ -64,7 +64,7 @@ kt_jvm_test(
6464
"//compiler/src/test/proto/testing:service_name_conflicts_with_file_java_proto",
6565
"//compiler/src/test/proto/testing:service_t_java_proto",
6666
"//compiler/src/test/proto/testing:test_proto3_optional_java_proto",
67-
"@maven//:com_google_truth_truth",
67+
"@grpc_kotlin_maven//:com_google_truth_truth",
6868
],
6969
)
7070

@@ -76,7 +76,7 @@ kt_jvm_test(
7676
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
7777
"//compiler/src/test/proto/testing:example3_java_proto",
7878
"//compiler/src/test/proto/testing:implicit_java_package_java_proto",
79-
"@maven//:com_google_truth_truth",
79+
"@grpc_kotlin_maven//:com_google_truth_truth",
8080
],
8181
)
8282

@@ -86,7 +86,7 @@ kt_jvm_test(
8686
test_class = "io.grpc.kotlin.generator.protoc.MemberSimpleNameTest",
8787
deps = [
8888
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
89-
"@maven//:com_google_truth_truth",
89+
"@grpc_kotlin_maven//:com_google_truth_truth",
9090
],
9191
)
9292

@@ -97,7 +97,7 @@ kt_jvm_test(
9797
deps = [
9898
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
9999
"//compiler/src/test/proto/testing:test_proto3_optional_java_proto",
100-
"@maven//:com_google_truth_truth",
100+
"@grpc_kotlin_maven//:com_google_truth_truth",
101101
],
102102
)
103103

@@ -108,7 +108,7 @@ kt_jvm_test(
108108
deps = [
109109
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
110110
"//compiler/src/test/proto/testing:example3_java_proto",
111-
"@maven//:com_google_truth_truth",
111+
"@grpc_kotlin_maven//:com_google_truth_truth",
112112
],
113113
)
114114

@@ -119,7 +119,7 @@ kt_jvm_test(
119119
deps = [
120120
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
121121
"//compiler/src/test/proto/testing:example3_java_proto",
122-
"@maven//:com_google_truth_truth",
122+
"@grpc_kotlin_maven//:com_google_truth_truth",
123123
],
124124
)
125125

@@ -130,7 +130,7 @@ kt_jvm_test(
130130
deps = [
131131
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
132132
"//compiler/src/test/proto/testing:example3_java_proto",
133-
"@maven//:com_google_truth_truth",
133+
"@grpc_kotlin_maven//:com_google_truth_truth",
134134
],
135135
)
136136

@@ -141,7 +141,7 @@ kt_jvm_test(
141141
deps = [
142142
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
143143
"//compiler/src/test/proto/testing:example3_java_proto",
144-
"@maven//:com_google_truth_truth",
144+
"@grpc_kotlin_maven//:com_google_truth_truth",
145145
],
146146
)
147147

@@ -151,6 +151,6 @@ kt_jvm_test(
151151
test_class = "io.grpc.kotlin.generator.protoc.ScopeTest",
152152
deps = [
153153
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
154-
"@maven//:com_google_truth_truth",
154+
"@grpc_kotlin_maven//:com_google_truth_truth",
155155
],
156156
)

compiler/src/test/java/io/grpc/kotlin/generator/protoc/testing/BUILD.bazel

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ kt_jvm_test(
1010
test_class = "io.grpc.kotlin.generator.protoc.testing.DeclarationsSubjectTest",
1111
deps = [
1212
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing",
13-
"@maven//:com_google_truth_truth",
14-
"@maven//:com_squareup_kotlinpoet",
15-
"@maven//:junit_junit",
13+
"@grpc_kotlin_maven//:com_google_truth_truth",
14+
"@grpc_kotlin_maven//:com_squareup_kotlinpoet",
15+
"@grpc_kotlin_maven//:junit_junit",
1616
],
1717
)
1818

0 commit comments

Comments
 (0)