Skip to content

Commit ebe714d

Browse files
mblandmbland
committed
Begin Bazel 8/rules_java 8 compatibility updates
These changes enable both `WORKSPACE` and Bzlmod builds to reach a point where both fail with the following errors. Part of bazel-contrib#1652. - To use `WORKSPACE`, specify `--enable_workspace --noenable_bzlmod` on the command line or add them to `.bazelrc`. Per that issue, the following breakages may be resolved by a new `protobuf-java:4.29.0` release (without the `-RC3` suffix. Then we can try to run the rest of the `rules_scala` test suite. Also per that issue, adopting Bazel 8 and rules_java 8 compatibility will necessarily break Bazel 6 and 7 compatibility. --- Hoisted the `load_rules_dependencies()` macro into the new `//scala:deps.bzl` file to avoid copying everything into `WORKSPACE`. Changed the order of `http_archive()` calls as well. Without importing these repos in this order, the build would break under `WORKSPACE`. Without the `rules_java_dependencies()` and `protobuf_deps()` calls where they are, the build also breaks. --- Under both `WORKSPACE` and Bzlmod, the following build command will fail with a `mismatched Protobuf Gencode/Runtime version suffixes` error: ```txt $ bazel build //src/... //test/... //third_party/... //scala_proto/... ERROR: .../external/protobuf+/src/google/protobuf/BUILD.bazel:130:14: ProtoScalaPBRule external/protobuf+/src/google/protobuf/wrappers_proto_jvm_extra_protobuf_generator_scalapb.srcjar failed: (Exit 1): scalapb_worker failed: error executing ProtoScalaPBRule command (from target @@protobuf+//src/google/protobuf:wrappers_proto) bazel-out/darwin_arm64-opt-exec-ST-d57f47055a04/bin/src/scala/scripts/scalapb_worker ... (remaining 2 arguments skipped) --jvm_extra_protobuf_generator_out: java.lang.ExceptionInInitializerError at scalapb.options.compiler.Scalapb$.registerAllExtensions(Scalapb.scala:8) at scalarules.test.extra_protobuf_generator.ExtraProtobufGenerator$.run(ExtraProtobufGenerator.scala:53) at protocbridge.frontend.PluginFrontend$.$anonfun$runWithBytes$1(PluginFrontend.scala:51) at scala.util.Try$.apply(Try.scala:217) at protocbridge.frontend.PluginFrontend$.runWithBytes(PluginFrontend.scala:51) at protocbridge.frontend.PluginFrontend$.runWithInputStream(PluginFrontend.scala:121) at protocbridge.frontend.PosixPluginFrontend$.$anonfun$prepare$2(PosixPluginFrontend.scala:40) at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18) at scala.concurrent.impl.ExecutionContextImpl$DefaultThreadFactory$$anon$1$$anon$2.block(ExecutionContextImpl.scala:60) at java.base/java.util.concurrent.ForkJoinPool.managedBlock(ForkJoinPool.java:3118) at scala.concurrent.impl.ExecutionContextImpl$DefaultThreadFactory$$anon$1.blockOn(ExecutionContextImpl.scala:71) at scala.concurrent.package$.blocking(package.scala:124) at protocbridge.frontend.PosixPluginFrontend$.$anonfun$prepare$1(PosixPluginFrontend.scala:38) at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18) at scala.concurrent.Future$.$anonfun$apply$1(Future.scala:687) at scala.concurrent.impl.Promise$Transformation.run(Promise.scala:467) at java.base/java.util.concurrent.ForkJoinTask$RunnableExecuteAction.exec(ForkJoinTask.java:1426) at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290) at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020) at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656) at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594) at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:183) Caused by: com.google.protobuf.RuntimeVersion$ProtobufRuntimeVersionException: Detected mismatched Protobuf Gencode/Runtime version suffixes when loading scalapb.options.Scalapb: gencode 4.28.2, runtime 4.29.0-rc3. Version suffixes must be the same. at com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersionImpl(RuntimeVersion.java:126) at com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(RuntimeVersion.java:71) at scalapb.options.Scalapb.<clinit>(Scalapb.java:11) ... 22 more java.lang.RuntimeException: Exit with code 1 at scala.sys.package$.error(package.scala:27) at scripts.ScalaPBWorker$.work(ScalaPBWorker.scala:44) at io.bazel.rulesscala.worker.Worker.persistentWorkerMain(Worker.java:96) at io.bazel.rulesscala.worker.Worker.workerMain(Worker.java:49) at scripts.ScalaPBWorker$.main(ScalaPBWorker.scala:39) at scripts.ScalaPBWorker.main(ScalaPBWorker.scala) ERROR: .../external/protobuf+/src/google/protobuf/BUILD.bazel:130:14 scala @@protobuf+//src/google/protobuf:wrappers_proto failed: (Exit 1): scalapb_worker failed: error executing ProtoScalaPBRule command (from target @@protobuf+//src/google/protobuf:wrappers_proto) bazel-out/darwin_arm64-opt-exec-ST-d57f47055a04/bin/src/scala/scripts/scalapb_worker ... (remaining 2 arguments skipped) ``` Later builds then fail with `java.lang.NoClassDefFoundError: Could not initialize class scalapb.options.Scalapb`: ```txt $ bazel build //src/... //test/... //third_party/... //scala_proto/... ERROR: .../third_party/test/proto/BUILD.bazel:4:14: ProtoScalaPBRule third_party/test/proto/proto_jvm_extra_protobuf_generator_scalapb.srcjar failed: (Exit 1): scalapb_worker failed: error executing ProtoScalaPBRule command (from target //third_party/test/proto:proto) bazel-out/darwin_arm64-opt-exec-ST-d57f47055a04/bin/src/scala/scripts/scalapb_worker ... (remaining 2 arguments skipped) --jvm_extra_protobuf_generator_out: java.lang.NoClassDefFoundError: Could not initialize class scalapb.options.Scalapb at scalapb.options.compiler.Scalapb$.registerAllExtensions(Scalapb.scala:8) at scalarules.test.extra_protobuf_generator.ExtraProtobufGenerator$.run(ExtraProtobufGenerator.scala:53) at protocbridge.frontend.PluginFrontend$.$anonfun$runWithBytes$1(PluginFrontend.scala:51) at scala.util.Try$.apply(Try.scala:217) at protocbridge.frontend.PluginFrontend$.runWithBytes(PluginFrontend.scala:51) at protocbridge.frontend.PluginFrontend$.runWithInputStream(PluginFrontend.scala:121) at protocbridge.frontend.PosixPluginFrontend$.$anonfun$prepare$2(PosixPluginFrontend.scala:40) at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18) at scala.concurrent.impl.ExecutionContextImpl$DefaultThreadFactory$$anon$1$$anon$2.block(ExecutionContextImpl.scala:60) at java.base/java.util.concurrent.ForkJoinPool.managedBlock(ForkJoinPool.java:3118) at scala.concurrent.impl.ExecutionContextImpl$DefaultThreadFactory$$anon$1.blockOn(ExecutionContextImpl.scala:71) at scala.concurrent.package$.blocking(package.scala:124) at protocbridge.frontend.PosixPluginFrontend$.$anonfun$prepare$1(PosixPluginFrontend.scala:38) at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.scala:18) at scala.concurrent.Future$.$anonfun$apply$1(Future.scala:687) at scala.concurrent.impl.Promise$Transformation.run(Promise.scala:467) at java.base/java.util.concurrent.ForkJoinTask$RunnableExecuteAction.exec(ForkJoinTask.java:1426) at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290) at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020) at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656) at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594) at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:183) java.lang.RuntimeException: Exit with code 1 at scala.sys.package$.error(package.scala:27) at scripts.ScalaPBWorker$.work(ScalaPBWorker.scala:44) at io.bazel.rulesscala.worker.Worker.persistentWorkerMain(Worker.java:96) at io.bazel.rulesscala.worker.Worker.workerMain(Worker.java:49) at scripts.ScalaPBWorker$.main(ScalaPBWorker.scala:39) at scripts.ScalaPBWorker.main(ScalaPBWorker.scala) ERROR: .../third_party/test/proto/BUILD.bazel:4:14 Building source jar third_party/test/proto/proto_scalapb-src.jar failed: (Exit 1): scalapb_worker failed: error executing ProtoScalaPBRule command (from target //third_party/test/proto:proto) bazel-out/darwin_arm64-opt-exec-ST-d57f47055a04/bin/src/scala/scripts/scalapb_worker ... (remaining 2 arguments skipped) ```
1 parent 8e71d14 commit ebe714d

24 files changed

+168
-157
lines changed

‎.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.4.1
1+
8.0.0rc4

‎MODULE.bazel

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ SCALA_3_VERSIONS = [
2020
SCALA_VERSIONS = SCALA_2_VERSIONS + SCALA_3_VERSIONS
2121

2222
bazel_dep(name = "bazel_skylib", version = "1.7.1")
23-
bazel_dep(name = "rules_cc", version = "0.0.9")
24-
bazel_dep(name = "rules_java", version = "7.11.1")
25-
bazel_dep(name = "rules_proto", version = "6.0.2")
23+
bazel_dep(name = "rules_cc", version = "0.1.0")
24+
bazel_dep(name = "rules_java", version = "8.5.1")
25+
bazel_dep(name = "rules_proto", version = "7.0.2")
2626

2727
# For now, users are revlocked to protobuf-21.7 or protobuf-25.5 (which doesn't
2828
# build under Bazel 6).
29-
bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf")
30-
single_version_override(
31-
module_name = "protobuf",
32-
version = "21.7",
33-
)
29+
bazel_dep(name = "protobuf", version = "29.0-rc2", repo_name = "com_google_protobuf")
30+
#single_version_override(
31+
# module_name = "protobuf",
32+
# version = "21.7",
33+
#)
3434

3535
scala_config = use_extension(
3636
"//scala/extensions:config.bzl",
@@ -233,4 +233,4 @@ use_repo(
233233
"org_golang_x_tools",
234234
)
235235

236-
bazel_dep(name = "rules_python", version = "0.36.0", dev_dependency = True)
236+
bazel_dep(name = "rules_python", version = "0.40.0", dev_dependency = True)

‎WORKSPACE

+15-20
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
workspace(name = "io_bazel_rules_scala")
22

3-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
3+
load("//scala:deps.bzl", "load_rules_dependencies")
44

5-
http_archive(
6-
name = "bazel_skylib",
7-
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
8-
urls = [
9-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
10-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
11-
],
12-
)
5+
load_rules_dependencies()
6+
7+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
138

149
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
1510

1611
bazel_skylib_workspace()
1712

13+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
14+
15+
rules_java_dependencies()
16+
17+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
18+
19+
protobuf_deps()
20+
1821
http_archive(
1922
name = "rules_python",
20-
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
21-
strip_prefix = "rules_python-0.36.0",
22-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
23+
sha256 = "690e0141724abb568267e003c7b6d9a54925df40c275a870a4d934161dc9dd53",
24+
strip_prefix = "rules_python-0.40.0",
25+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.40.0/rules_python-0.40.0.tar.gz",
2326
)
2427

2528
load("@rules_python//python:repositories.bzl", "py_repositories")
@@ -64,14 +67,6 @@ load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
6467

6568
rules_proto_setup()
6669

67-
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
68-
69-
rules_proto_toolchains()
70-
71-
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
72-
73-
protobuf_deps()
74-
7570
# needed for the cross repo proto test
7671
load("//test/proto_cross_repo_boundary:repo.bzl", "proto_cross_repo_boundary_repository")
7772

‎jmh/jmh.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ load(
66
)
77
load("//third_party/repositories:repositories.bzl", "repositories")
88
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
9+
load("@rules_java//java/common:java_common.bzl", "java_common")
10+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
911

1012
def jmh_artifact_ids():
1113
return [

‎scala/deps.bzl

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2+
3+
def load_rules_dependencies():
4+
if not native.existing_rule("bazel_skylib"):
5+
http_archive(
6+
name = "bazel_skylib",
7+
sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
8+
urls = [
9+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
10+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
11+
],
12+
)
13+
14+
if not native.existing_rule("rules_cc"):
15+
http_archive(
16+
name = "rules_cc",
17+
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.1.0/rules_cc-0.1.0.tar.gz"],
18+
sha256 = "4b12149a041ddfb8306a8fd0e904e39d673552ce82e4296e96fac9cbf0780e59",
19+
strip_prefix = "rules_cc-0.1.0",
20+
)
21+
22+
if not native.existing_rule("com_google_absl"):
23+
http_archive(
24+
name = "com_google_absl",
25+
sha256 = "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3",
26+
strip_prefix = "abseil-cpp-20240722.0",
27+
url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.tar.gz",
28+
)
29+
30+
if not native.existing_rule("rules_java"):
31+
http_archive(
32+
name = "rules_java",
33+
urls = [
34+
"https://github.com/bazelbuild/rules_java/releases/download/8.5.1/rules_java-8.5.1.tar.gz",
35+
],
36+
sha256 = "1389206b2208c5f33a05dd96e51715b0855c480c082b7bb4889a8e07fcff536c",
37+
)
38+
39+
if not native.existing_rule("com_google_protobuf"):
40+
http_archive(
41+
name = "com_google_protobuf",
42+
sha256 = "92571ddbab033a5c8facf71cf3c7987cbfeeea472db8bd3f92e94e8d1450c34a",
43+
strip_prefix = "protobuf-29.0-rc3",
44+
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v29.0-rc3.tar.gz",
45+
)
46+
47+
if not native.existing_rule("rules_proto"):
48+
http_archive(
49+
name = "rules_proto",
50+
sha256 = "0e5c64a2599a6e26c6a03d6162242d231ecc0de219534c38cb4402171def21e8",
51+
strip_prefix = "rules_proto-7.0.2",
52+
url = "https://github.com/bazelbuild/rules_proto/releases/download/7.0.2/rules_proto-7.0.2.tar.gz",
53+
)
54+

‎scala/private/common_attributes.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ load(
88
"@io_bazel_rules_scala//scala:plusone.bzl",
99
_collect_plus_one_deps_aspect = "collect_plus_one_deps_aspect",
1010
)
11+
load("@rules_java//java/common:java_common.bzl", "java_common")
12+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
1113

1214
common_attrs_for_plugin_bootstrapping = {
1315
"srcs": attr.label_list(allow_files = [

‎scala/private/macros/scala_repositories.bzl

+1-53
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("//scala:deps.bzl", "load_rules_dependencies")
12
load(
23
"//scala:scala_cross_version.bzl",
34
"extract_major_version",
@@ -117,59 +118,6 @@ def dt_patched_compiler_setup(scala_version, scala_compiler_srcjar = None):
117118
integrity = srcjar.get("integrity"),
118119
)
119120

120-
def load_rules_dependencies():
121-
if not native.existing_rule("bazel_skylib"):
122-
http_archive(
123-
name = "bazel_skylib",
124-
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
125-
urls = [
126-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
127-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
128-
],
129-
)
130-
131-
# Needed by protobuf-21.7 and Bazel 6.5.0, as later versions require C++14.
132-
if not native.existing_rule("com_google_absl"):
133-
http_archive(
134-
name = "com_google_absl",
135-
sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
136-
strip_prefix = "abseil-cpp-20220623.1",
137-
url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
138-
)
139-
140-
if not native.existing_rule("com_google_protobuf"):
141-
http_archive(
142-
name = "com_google_protobuf",
143-
sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae",
144-
strip_prefix = "protobuf-21.7",
145-
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.7.tar.gz",
146-
)
147-
148-
if not native.existing_rule("rules_cc"):
149-
http_archive(
150-
name = "rules_cc",
151-
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz"],
152-
sha256 = "3d9e271e2876ba42e114c9b9bc51454e379cbf0ec9ef9d40e2ae4cec61a31b40",
153-
strip_prefix = "rules_cc-0.0.6",
154-
)
155-
156-
if not native.existing_rule("rules_java"):
157-
http_archive(
158-
name = "rules_java",
159-
urls = [
160-
"https://github.com/bazelbuild/rules_java/releases/download/7.9.0/rules_java-7.9.0.tar.gz",
161-
],
162-
sha256 = "41131de4417de70b9597e6ebd515168ed0ba843a325dc54a81b92d7af9a7b3ea",
163-
)
164-
165-
if not native.existing_rule("rules_proto"):
166-
http_archive(
167-
name = "rules_proto",
168-
sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
169-
strip_prefix = "rules_proto-6.0.2",
170-
url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
171-
)
172-
173121
def setup_scala_compiler_sources(srcjars = {}):
174122
"""Generates Scala compiler source repos used internally by rules_scala.
175123

‎scala/private/rules/scala_binary.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ load(
2929
"phase_write_manifest",
3030
"run_phases",
3131
)
32+
load("@rules_java//java/common:java_common.bzl", "java_common")
33+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
3234

3335
def _scala_binary_impl(ctx):
3436
return run_phases(

‎scala/private/rules/scala_doc.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""Scaladoc support"""
22

33
load("@io_bazel_rules_scala//scala/private:common.bzl", "collect_plugin_paths")
4+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
45

56
ScaladocAspectInfo = provider(fields = [
67
"src_files", #depset[File]

‎scala/private/rules/scala_junit_test.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ load(
3131
"phase_write_manifest",
3232
"run_phases",
3333
)
34+
load("@rules_java//java/common:java_common.bzl", "java_common")
35+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
3436

3537
def _scala_junit_test_impl(ctx):
3638
if (not (ctx.attr.prefixes) and not (ctx.attr.suffixes)):

‎scala/private/rules/scala_library.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ load(
3939
"phase_write_manifest",
4040
"run_phases",
4141
)
42+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
4243

4344
##
4445
# Common stuff to _library rules

‎scala/private/rules/scala_repl.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ load(
2929
"phase_write_manifest",
3030
"run_phases",
3131
)
32+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
3233

3334
def _scala_repl_impl(ctx):
3435
return run_phases(

‎scala/private/rules/scala_test.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ load(
3131
"phase_write_manifest",
3232
"run_phases",
3333
)
34+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
3435

3536
def _scala_test_impl(ctx):
3637
return run_phases(

‎scripts/create_repository.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
SCALATEST_VERSION = "3.2.19"
3131
SCALAFMT_VERSION = "3.8.3"
3232
KIND_PROJECTOR_VERSION = "0.13.3"
33-
PROTOBUF_JAVA_VERSION = "4.28.3"
33+
PROTOBUF_JAVA_VERSION = "4.29.0-RC3"
3434
JLINE_VERSION = '3.27.1'
35-
SCALAPB_VERSION = '0.11.17'
35+
SCALAPB_VERSION = '1.0.0-alpha.1'
3636
PROTOC_BRIDGE_VERSION = '0.9.7'
3737
GRPC_VERSION = '1.68.1'
3838
GRPC_COMMON_PROTOS_VERSION = '2.48.0'

‎test/semanticdb/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,6 @@ scala_library(
5757
"*.scala",
5858
"tempsrc/*.scala", #Include src files that are dynamically generated by the test_semanticdb.sh (tmpsrc should be in .gitignore so its contents don't get checked in)
5959
],
60+
allow_empty = True,
6061
),
6162
)

‎third_party/repositories/scala_2_11.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ artifacts = {
6767
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
6868
},
6969
"com_google_protobuf_protobuf_java": {
70-
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
71-
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
70+
"artifact": "com.google.protobuf:protobuf-java:4.29.0-RC3",
71+
"sha256": "197ac48a0325b6f8ac1fbf9fc6d2ddb444386fe039e1921ba1473399683be441",
7272
},
7373
"com_lihaoyi_fansi": {
7474
"artifact": "com.lihaoyi:fansi_2.11:0.4.0",

‎third_party/repositories/scala_2_12.bzl

+10-10
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ artifacts = {
8282
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
8383
},
8484
"com_google_protobuf_protobuf_java": {
85-
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
86-
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
85+
"artifact": "com.google.protobuf:protobuf-java:4.29.0-RC3",
86+
"sha256": "197ac48a0325b6f8ac1fbf9fc6d2ddb444386fe039e1921ba1473399683be441",
8787
},
8888
"com_lihaoyi_fansi": {
8989
"artifact": "com.lihaoyi:fansi_2.12:0.4.0",
@@ -797,8 +797,8 @@ artifacts = {
797797
],
798798
},
799799
"scala_proto_rules_scalapb_compilerplugin": {
800-
"artifact": "com.thesamet.scalapb:compilerplugin_2.12:0.11.17",
801-
"sha256": "a9dc6cc0dbe6ff53a7c914433d5a19711018217b432b385c97778cd4050210d0",
800+
"artifact": "com.thesamet.scalapb:compilerplugin_2.12:1.0.0-alpha.1",
801+
"sha256": "8c771e34186ed2e382a3f4634ec424379d69deab1df2fce4b171cb7cf54e5a5f",
802802
"deps": [
803803
"@com_google_protobuf_protobuf_java",
804804
"@io_bazel_rules_scala_scala_library",
@@ -807,8 +807,8 @@ artifacts = {
807807
],
808808
},
809809
"scala_proto_rules_scalapb_lenses": {
810-
"artifact": "com.thesamet.scalapb:lenses_2.12:0.11.17",
811-
"sha256": "c984f7695e9a5034afbf725b7eab919fc00bb24dc30c8f6f923d6d32096a1fa0",
810+
"artifact": "com.thesamet.scalapb:lenses_2.12:1.0.0-alpha.1",
811+
"sha256": "c1ba1e1bfe373f5e984c9c7464a9554d16f5c0025820ddbcdb2370878bb72bb9",
812812
"deps": [
813813
"@io_bazel_rules_scala_scala_library",
814814
"@org_scala_lang_modules_scala_collection_compat",
@@ -831,8 +831,8 @@ artifacts = {
831831
],
832832
},
833833
"scala_proto_rules_scalapb_runtime": {
834-
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.17",
835-
"sha256": "6624beb8e47c11de33262f867dd86d25e66ddce5507c9c13bfd7cc2f2e7652fe",
834+
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.12:1.0.0-alpha.1",
835+
"sha256": "d103300acea36d2ef0fd42fc4b1882144e1761a52b87eae94d3581482582a116",
836836
"deps": [
837837
"@com_google_protobuf_protobuf_java",
838838
"@io_bazel_rules_scala_scala_library",
@@ -841,8 +841,8 @@ artifacts = {
841841
],
842842
},
843843
"scala_proto_rules_scalapb_runtime_grpc": {
844-
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:0.11.17",
845-
"sha256": "7919fbb62f3ae9de9eec3a102b24dc1ef570ff098d1e41e464cf2ac7398cff5f",
844+
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:1.0.0-alpha.1",
845+
"sha256": "029260ac16b227b6a037c72ca89c6b3eae0efe5f368ba53f52c9671b9ece9fbc",
846846
"deps": [
847847
"@io_bazel_rules_scala_scala_library",
848848
"@org_scala_lang_modules_scala_collection_compat",

0 commit comments

Comments
 (0)