update protobuf

timothyklim · Oct 3, 2024 · f9ac79c · f9ac79c
1 parent d809a9f
commit f9ac79c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/rules/scala/init.bzl b/rules/scala/init.bzl
@@ -1,5 +1,6 @@
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
+load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
 
 def rules_scala3_init():
     protobuf_deps()

diff --git a/rules/scala/workspace.bzl b/rules/scala/workspace.bzl
@@ -97,13 +97,13 @@ def scala_repositories():
     for dep in direct_deps:
         maybe(jvm_maven_import_external, name = dep[0], artifact = dep[1], artifact_sha256 = dep[2] if len(dep) == 3 else "", server_urls = repositories)
 
-    protobuf_tag = "21.12"
-    rules_proto_tag = "5.3.0-21.7"
+    protobuf_tag = "28.2"
+    rules_proto_tag = "6.0.2"
     skylib_tag = "1.5.0"
     rules_deps = [
         ["bazel_skylib", None, "https://github.com/bazelbuild/bazel-skylib/releases/download/{v}/bazel-skylib-{v}.tar.gz".format(v = skylib_tag), "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94"],
-        ["com_google_protobuf", "protobuf-" + protobuf_tag, "https://github.com/protocolbuffers/protobuf/archive/v{}.tar.gz".format(protobuf_tag), "22fdaf641b31655d4b2297f9981fa5203b2866f8332d3c6333f6b0107bb320de"],
-        ["rules_proto", "rules_proto-" + rules_proto_tag, "https://github.com/bazelbuild/rules_proto/archive/{}.tar.gz".format(rules_proto_tag), "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd"],
+        ["com_google_protobuf", "protobuf-" + protobuf_tag, "https://github.com/protocolbuffers/protobuf/archive/v{}.tar.gz".format(protobuf_tag), "b2340aa47faf7ef10a0328190319d3f3bee1b24f426d4ce8f4253b6f27ce16db"],
+        ["rules_proto", "rules_proto-" + rules_proto_tag, "https://github.com/bazelbuild/rules_proto/archive/{}.tar.gz".format(rules_proto_tag), "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295"],
     ]
     for dep in rules_deps:
-        maybe(http_archive, name = dep[0], strip_prefix = dep[1], url = dep[2], sha256 = dep[3] if len(dep) == 4 else "")
+        maybe(http_archive, name = dep[0], strip_prefix = dep[1], url = dep[2], sha256 = dep[3] if len(dep) == 4 else "")
diff --git a/scala/workers/zinc/doc/BUILD b/scala/workers/zinc/doc/BUILD
@@ -5,6 +5,7 @@ scala_binary(
     name = "doc",
     srcs = glob(["**/*.scala"]),
     jvm_flags = ["-Djava.security.manager=allow"],
+    main_class = "rules_scala.workers.zinc.doc.DocRunner",
     visibility = ["//visibility:public"],
     deps = [
         "//scala/common/worker",

diff --git a/scala/workers/zinc/repl/BUILD b/scala/workers/zinc/repl/BUILD
@@ -5,6 +5,7 @@ scala_binary(
     name = "repl",
     srcs = glob(["**/*.scala"]),
     visibility = ["//visibility:public"],
+    main_class = "rules_scala.workers.zinc.repl.ReplRunner",
     runtime_deps = [
         "@annex//:org_jline_jline_reader",
     ],