Skip to content

Commit f815d21

Browse files
committed
Update versions
1 parent d5ca050 commit f815d21

4 files changed

Lines changed: 66 additions & 127 deletions

File tree

.bazelrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ common --enable_bzlmod
22
common --enable_workspace
33
build --java_runtime_version=remotejdk_11
44
build --java_language_version=11
5+
build --host_cxxopt='-std=c++17'
56

67
# Hide Java 8 deprecation warnings.
7-
common --javacopt=-Xlint:-options
8+
common --javacopt=-Xlint:-options

@

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

MODULE.bazel

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

1919
bazel_dep(name = "bazel_skylib", version = "1.7.1")
20-
bazel_dep(name = "rules_jvm_external", version = "6.6")
21-
bazel_dep(name = "protobuf", version = "31.0", repo_name = "com_google_protobuf")
20+
bazel_dep(name = "rules_jvm_external", version = "6.7")
21+
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
2222
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
23-
bazel_dep(name = "rules_pkg", version = "0.10.1")
23+
bazel_dep(name = "rules_pkg", version = "1.0.1")
2424
bazel_dep(name = "rules_license", version = "1.0.0")
2525
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")
26+
bazel_dep(name = "rules_java", version = "8.12.0")
2827
bazel_dep(name = "rules_android", version = "0.6.4")
28+
bazel_dep(name = "googleapis-java", version = "1.0.0")
2929

3030
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
3131
switched_rules.use_languages(java = True)
@@ -34,33 +34,60 @@ use_repo(switched_rules, "com_google_googleapis_imports")
3434
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
3535

3636
GUAVA_VERSION = "33.4.8"
37+
TRUTH_VERSION = "1.4.4"
38+
39+
# Compile only artifacts
40+
[
41+
maven.artifact(
42+
neverlink = True,
43+
artifact = artifact,
44+
group = group,
45+
version = version,
46+
)
47+
for group, artifact, version in [coord.split(":") for coord in [
48+
"com.google.code.findbugs:annotations:3.0.1",
49+
"com.google.errorprone:error_prone_annotations:2.38.0",
50+
]]
51+
]
52+
53+
# Test only artifacts
54+
[
55+
maven.artifact(
56+
testonly = True,
57+
artifact = artifact,
58+
group = group,
59+
version = version,
60+
)
61+
for group, artifact, version in [coord.split(":") for coord in [
62+
"org.mockito:mockito-core:4.11.0",
63+
"io.github.classgraph:classgraph:4.8.179",
64+
"com.google.testparameterinjector:test-parameter-injector:1.18",
65+
"com.google.guava:guava-testlib:" + GUAVA_VERSION + "-jre",
66+
"com.google.truth.extensions:truth-java8-extension:" + TRUTH_VERSION,
67+
"com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
68+
"com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION,
69+
"com.google.truth:truth:" + TRUTH_VERSION,
70+
71+
]]
72+
]
3773

38-
# run 'bazel run @unpinned_maven//:pin' after updating versions below to generate a new lock file.
3974
maven.install(
4075
name = "maven",
4176
# keep sorted
4277
artifacts = [
4378
"com.google.auto.value:auto-value:1.11.0",
4479
"com.google.auto.value:auto-value-annotations:1.11.0",
45-
"com.google.code.findbugs:annotations:3.0.1",
46-
"com.google.errorprone:error_prone_annotations:2.38.0",
4780
"com.google.guava:guava:" + GUAVA_VERSION + "-jre",
48-
"com.google.guava:guava-testlib:" + GUAVA_VERSION + "-jre",
4981
"com.google.protobuf:protobuf-java:4.31.0",
5082
"com.google.protobuf:protobuf-java-util:4.31.0",
5183
"com.google.re2j:re2j:1.8",
52-
"com.google.testparameterinjector:test-parameter-injector:1.18",
53-
"com.google.truth.extensions:truth-java8-extension:1.4.4",
54-
"com.google.truth.extensions:truth-proto-extension:1.4.4",
55-
"com.google.truth:truth:1.4.4",
5684
"info.picocli:picocli:4.7.7",
5785
"org.antlr:antlr4-runtime:4.13.2",
86+
"org.freemarker:freemarker:2.3.34",
5887
"org.jspecify:jspecify:1.0.0",
5988
"org.threeten:threeten-extra:1.8.0",
6089
"org.yaml:snakeyaml:2.4",
6190
],
62-
fail_if_repin_required = True,
63-
lock_file = "//:maven_install.json",
6491
repositories = [
6592
"https://maven.google.com",
6693
"https://repo1.maven.org/maven2",
@@ -78,11 +105,9 @@ maven.install(
78105
"https://maven.google.com",
79106
"https://repo1.maven.org/maven2",
80107
],
81-
fail_if_repin_required = True,
82-
lock_file = "//:maven_android_install.json",
83108
)
84109

85-
use_repo(maven, "maven", "maven_android", "unpinned_maven")
110+
use_repo(maven, "maven", "maven_android")
86111

87112
non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
88113
use_repo(non_module_dependencies, "antlr4_jar")

repositories.bzl

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar")
1717
def antlr4_jar_dependency():
1818
http_jar(
1919
name = "antlr4_jar",
20-
sha256 = "62975e192b4af2622b72b5f0131553ee3cbce97f76dc2a41632dcc55e25473e1",
20+
sha256 = "eae2dfa119a64327444672aff63e9ec35a20180dc5b8090b7a6ab85125df4d76",
2121
urls = ["https://www.antlr.org/download/antlr-4.13.2-complete.jar"],
2222
)
2323

@@ -32,18 +32,27 @@ def bazel_common_dependency():
3232
)
3333

3434
def cel_spec_dependency():
35-
CEL_SPEC_VERSION = "0.24.0"
35+
CEL_SPEC_VERSION = "0.24.0"
3636

37-
http_archive(
38-
name = "cel_spec",
39-
sha256 = "5cba6b0029e727d1f4d8fd134de4e747cecc0bc293d026017d7edc48058d09f7",
40-
strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
41-
urls = [
42-
"https://github.com/google/cel-spec/archive/" +
43-
"v" + CEL_SPEC_VERSION +
44-
".tar.gz",
45-
],
46-
)
37+
http_archive(
38+
name = "io_bazel_rules_go",
39+
sha256 = "19ef30b21eae581177e0028f6f4b1f54c66467017be33d211ab6fc81da01ea4d",
40+
urls = [
41+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip",
42+
"https://github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip",
43+
],
44+
)
45+
46+
http_archive(
47+
name = "cel_spec",
48+
sha256 = "5cba6b0029e727d1f4d8fd134de4e747cecc0bc293d026017d7edc48058d09f7",
49+
strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
50+
urls = [
51+
"https://github.com/google/cel-spec/archive/" +
52+
"v" + CEL_SPEC_VERSION +
53+
".tar.gz",
54+
],
55+
)
4756

4857
def _non_module_dependencies_impl(_ctx):
4958
antlr4_jar_dependency()

0 commit comments

Comments
 (0)