Skip to content

Commit d5ca050

Browse files
l46kokl46kok
committed
Update MODULE.bazel
1 parent 1ad848f commit d5ca050

5 files changed

Lines changed: 206 additions & 1703 deletions

File tree

‎.bazelversion‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎MODULE.bazel‎

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,47 @@ module(
1717
)
1818

1919
bazel_dep(name = "bazel_skylib", version = "1.7.1")
20-
bazel_dep(name = "rules_jvm_external", version = "6.4")
21-
bazel_dep(name = "protobuf", version = "29.0-rc1", repo_name = "com_google_protobuf")
22-
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis")
20+
bazel_dep(name = "rules_jvm_external", version = "6.6")
21+
bazel_dep(name = "protobuf", version = "31.0", repo_name = "com_google_protobuf")
22+
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
2323
bazel_dep(name = "rules_pkg", version = "0.10.1")
2424
bazel_dep(name = "rules_license", version = "1.0.0")
25-
bazel_dep(name = "rules_proto", version = "6.0.2")
26-
bazel_dep(name = "grpc-java", version = "1.66.0")
27-
bazel_dep(name = "rules_java", version = "7.12.1")
25+
bazel_dep(name = "rules_proto", version = "7.1.0")
26+
# bazel_dep(name = "grpc-java", version = "1.66.0")
27+
bazel_dep(name = "rules_java", version = "8.9.0")
28+
bazel_dep(name = "rules_android", version = "0.6.4")
2829

2930
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
3031
switched_rules.use_languages(java = True)
3132
use_repo(switched_rules, "com_google_googleapis_imports")
3233

3334
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
3435

36+
GUAVA_VERSION = "33.4.8"
37+
3538
# run 'bazel run @unpinned_maven//:pin' after updating versions below to generate a new lock file.
3639
maven.install(
40+
name = "maven",
3741
# keep sorted
3842
artifacts = [
3943
"com.google.auto.value:auto-value:1.11.0",
4044
"com.google.auto.value:auto-value-annotations:1.11.0",
4145
"com.google.code.findbugs:annotations:3.0.1",
42-
"com.google.errorprone:error_prone_annotations:2.33.0",
43-
"com.google.guava:guava:33.3.1-jre",
44-
"com.google.guava:guava-testlib:33.3.1-jre",
45-
"com.google.protobuf:protobuf-java:4.29.0-RC1",
46-
"com.google.protobuf:protobuf-java-util:4.29.0-RC1",
47-
"com.google.re2j:re2j:1.7",
46+
"com.google.errorprone:error_prone_annotations:2.38.0",
47+
"com.google.guava:guava:" + GUAVA_VERSION + "-jre",
48+
"com.google.guava:guava-testlib:" + GUAVA_VERSION + "-jre",
49+
"com.google.protobuf:protobuf-java:4.31.0",
50+
"com.google.protobuf:protobuf-java-util:4.31.0",
51+
"com.google.re2j:re2j:1.8",
4852
"com.google.testparameterinjector:test-parameter-injector:1.18",
4953
"com.google.truth.extensions:truth-java8-extension:1.4.4",
5054
"com.google.truth.extensions:truth-proto-extension:1.4.4",
5155
"com.google.truth:truth:1.4.4",
52-
"org.antlr:antlr4-runtime:4.11.1",
56+
"info.picocli:picocli:4.7.7",
57+
"org.antlr:antlr4-runtime:4.13.2",
5358
"org.jspecify:jspecify:1.0.0",
5459
"org.threeten:threeten-extra:1.8.0",
55-
"org.yaml:snakeyaml:2.2",
60+
"org.yaml:snakeyaml:2.4",
5661
],
5762
fail_if_repin_required = True,
5863
lock_file = "//:maven_install.json",
@@ -61,7 +66,23 @@ maven.install(
6166
"https://repo1.maven.org/maven2",
6267
],
6368
)
64-
use_repo(maven, "maven", "unpinned_maven")
69+
70+
maven.install(
71+
name = "maven_android",
72+
# keep sorted
73+
artifacts = [
74+
"com.google.guava:guava:" + GUAVA_VERSION + "-android",
75+
"com.google.protobuf:protobuf-javalite:4.31.0",
76+
],
77+
repositories = [
78+
"https://maven.google.com",
79+
"https://repo1.maven.org/maven2",
80+
],
81+
fail_if_repin_required = True,
82+
lock_file = "//:maven_android_install.json",
83+
)
84+
85+
use_repo(maven, "maven", "maven_android", "unpinned_maven")
6586

6687
non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
6788
use_repo(non_module_dependencies, "antlr4_jar")

‎maven_android_install.json‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
{
2+
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3+
"__INPUT_ARTIFACTS_HASH": -2068874328,
4+
"__RESOLVED_ARTIFACTS_HASH": -350125018,
5+
"artifacts": {
6+
"com.google.errorprone:error_prone_annotations": {
7+
"shasums": {
8+
"jar": "77440e270b0bc9a249903c5a076c36a722c4886ca4f42675f2903a1c53ed61a5"
9+
},
10+
"version": "2.36.0"
11+
},
12+
"com.google.guava:failureaccess": {
13+
"shasums": {
14+
"jar": "cbfc3906b19b8f55dd7cfd6dfe0aa4532e834250d7f080bd8d211a3e246b59cb"
15+
},
16+
"version": "1.0.3"
17+
},
18+
"com.google.guava:guava": {
19+
"shasums": {
20+
"jar": "a1f8a4bafe5a77232d333356843e194599b30837574a7f4be1063daaaaab102c"
21+
},
22+
"version": "33.4.8-android"
23+
},
24+
"com.google.guava:listenablefuture": {
25+
"shasums": {
26+
"jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
27+
},
28+
"version": "9999.0-empty-to-avoid-conflict-with-guava"
29+
},
30+
"com.google.j2objc:j2objc-annotations": {
31+
"shasums": {
32+
"jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64"
33+
},
34+
"version": "3.0.0"
35+
},
36+
"com.google.protobuf:protobuf-javalite": {
37+
"shasums": {
38+
"jar": "4f0b249e8b31c9e8ec527f0f7d3ecf6b6b6810263917fc3c3f81a34f5738555c"
39+
},
40+
"version": "4.31.0"
41+
},
42+
"org.jspecify:jspecify": {
43+
"shasums": {
44+
"jar": "1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab"
45+
},
46+
"version": "1.0.0"
47+
}
48+
},
49+
"dependencies": {
50+
"com.google.guava:guava": [
51+
"com.google.errorprone:error_prone_annotations",
52+
"com.google.guava:failureaccess",
53+
"com.google.guava:listenablefuture",
54+
"com.google.j2objc:j2objc-annotations",
55+
"org.jspecify:jspecify"
56+
]
57+
},
58+
"packages": {
59+
"com.google.errorprone:error_prone_annotations": [
60+
"com.google.errorprone.annotations",
61+
"com.google.errorprone.annotations.concurrent"
62+
],
63+
"com.google.guava:failureaccess": [
64+
"com.google.common.util.concurrent.internal"
65+
],
66+
"com.google.guava:guava": [
67+
"com.google.common.annotations",
68+
"com.google.common.base",
69+
"com.google.common.base.internal",
70+
"com.google.common.cache",
71+
"com.google.common.collect",
72+
"com.google.common.escape",
73+
"com.google.common.eventbus",
74+
"com.google.common.graph",
75+
"com.google.common.hash",
76+
"com.google.common.html",
77+
"com.google.common.io",
78+
"com.google.common.math",
79+
"com.google.common.net",
80+
"com.google.common.primitives",
81+
"com.google.common.reflect",
82+
"com.google.common.util.concurrent",
83+
"com.google.common.xml",
84+
"com.google.thirdparty.publicsuffix"
85+
],
86+
"com.google.j2objc:j2objc-annotations": [
87+
"com.google.j2objc.annotations"
88+
],
89+
"com.google.protobuf:protobuf-javalite": [
90+
"com.google.protobuf"
91+
],
92+
"org.jspecify:jspecify": [
93+
"org.jspecify.annotations"
94+
]
95+
},
96+
"repositories": {
97+
"https://maven.google.com/": [
98+
"com.google.errorprone:error_prone_annotations",
99+
"com.google.guava:failureaccess",
100+
"com.google.guava:guava",
101+
"com.google.guava:listenablefuture",
102+
"com.google.j2objc:j2objc-annotations",
103+
"com.google.protobuf:protobuf-javalite",
104+
"org.jspecify:jspecify"
105+
],
106+
"https://repo1.maven.org/maven2/": [
107+
"com.google.errorprone:error_prone_annotations",
108+
"com.google.guava:failureaccess",
109+
"com.google.guava:guava",
110+
"com.google.guava:listenablefuture",
111+
"com.google.j2objc:j2objc-annotations",
112+
"com.google.protobuf:protobuf-javalite",
113+
"org.jspecify:jspecify"
114+
]
115+
},
116+
"services": {},
117+
"version": "2"
118+
}

0 commit comments

Comments
 (0)