refactor: toolchainize language runtimes

.bazelignore

@@ -1,4 +1,5 @@
 # These are fetched as external repositories.
 third_party/abseil-cpp
 third_party/googletest
+third_party/utf8_range
 _build/

BUILD.bazel

@@ -3,7 +3,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_proto_library")
 load("@rules_java//java:defs.bzl", "java_lite_proto_library", "java_proto_library")
 load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_toolchain", "proto_library")
 load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS")
 load(":protobuf.bzl", "internal_objc_proto_library", "internal_php_proto_library", "internal_py_proto_library")
 
@@ -245,6 +245,11 @@ cc_binary(
     deps = ["//src/google/protobuf/compiler:protoc_lib"],
 )
 
+proto_toolchain(
+    name = "protoc_toolchain",
+    proto_compiler = ":protoc"
+)
+
 ################################################################################
 # C++ runtime
 ################################################################################
@@ -329,6 +334,19 @@ alias(
     visibility = ["//visibility:public"],
 )
 
+toolchain(
+    name = "javalite_source_toolchain",
+    toolchain = ":javalite_toolchain",
+    toolchain_type = "@rules_java//java/proto:lite_toolchain_type",
+)
+
+toolchain(
+    name = "java_source_toolchain",
+    toolchain = ":java_toolchain",
+    toolchain_type = "@rules_java//java/proto:toolchain_type",
+)
+
+
 ################################################################################
 # Python support
 ################################################################################
@@ -369,6 +387,19 @@ alias(
     visibility = ["//visibility:public"],
 )
 
+proto_lang_toolchain(
+    name = "python_toolchain",
+    command_line = "--python_out=%s",
+    progress_message = "Generating Python proto_library %{label}",
+    runtime = ":protobuf_python",
+    toolchain_type = "@rules_python//python/proto:toolchain_type",
+    visibility = ["//visibility:public"],
+)
+
+################################################################################
+# CC support
+################################################################################
+
 proto_lang_toolchain(
     name = "cc_toolchain",
     blacklisted_protos = [
@@ -377,6 +408,7 @@ proto_lang_toolchain(
     ],
     command_line = "--cpp_out=$(OUT)",
     runtime = "//src/google/protobuf",
+    toolchain_type = "@rules_cc//cc/proto:toolchain_type",
     visibility = ["//visibility:public"],
 )
 

WORKSPACE

@@ -13,9 +13,20 @@ local_repository(
 )
 
 # Load common dependencies first to ensure we use the correct version
-load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
+load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps", "protobuf_register_toolchains")
 
 protobuf_deps()
+protobuf_register_toolchains()
+
+# Setup rules_java
+load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
+rules_java_dependencies()
+rules_java_toolchains()
+
+# Setup rules_python
+load("@rules_python//python:repositories.bzl", "py_repositories")
+py_repositories()
+
 
 load("@rules_python//python:repositories.bzl", "py_repositories")
 
@@ -220,3 +231,5 @@ crates_repository(
 
 load("@crate_index//:defs.bzl", "crate_repositories")
 crate_repositories()
+
+

bazel/py_proto_library.bzl

@@ -99,7 +99,7 @@ def _py_proto_library_aspect_impl(target, ctx):
             transitive = [proto_info.transitive_descriptor_sets],
         ),
         outputs = srcs,
-        executable = ctx.executable._protoc,
+        executable = ctx.toolchains["@rules_python//python/proto:toolchain_type"].proto.proto_compiler,
         arguments = [
                         "--python_out=" + _get_real_root(ctx, srcs[0]),
                         "--descriptor_set_in=" + ctx.configuration.host_path_separator.join([f.path for f in transitive_sets]),
@@ -113,18 +113,12 @@ def _py_proto_library_aspect_impl(target, ctx):
     ]
 
 _py_proto_library_aspect = aspect(
-    attrs = {
-        "_protoc": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "//:protoc",
-        ),
-    },
     implementation = _py_proto_library_aspect_impl,
     provides = [
         PyInfo,
     ],
     attr_aspects = ["deps"],
+    toolchains = ["@rules_python//python/proto:toolchain_type"]
 )
 
 py_proto_library = rule(

java/osgi/osgi.bzl

@@ -174,7 +174,7 @@ def _osgi_jar_impl(ctx):
         source_jars = source_jars.to_list()
     if len(source_jars) > 1:
         fail("osgi_jar rule doesn't know how to deal with more than one source jar.")
-    source_jar = target_java_output.source_jars[0]
+    source_jar = target_java_output.source_jars.to_list()[0]
 
     output_jar = ctx.outputs.output_jar
 

protobuf_deps.bzl

@@ -69,28 +69,26 @@ def protobuf_deps():
         )
 
     if not native.existing_rule("rules_cc"):
-        _github_archive(
+        http_archive(
             name = "rules_cc",
-            repo = "https://github.com/bazelbuild/rules_cc",
-            commit = "c8c38f8c710cbbf834283e4777916b68261b359c",  # 0.0.9
-            sha256 = "5f862a44bbd032e1b48ed53c9c211ba2a1da60e10c5baa01c97369c249299ecb",
+            urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"],
+            sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",
+            strip_prefix = "rules_cc-0.0.9",
         )
 
     if not native.existing_rule("rules_java"):
         http_archive(
             name = "rules_java",
-            url = "https://github.com/bazelbuild/rules_java/releases/download/6.0.0/rules_java-6.0.0.tar.gz",
-            sha256 = "469b7f3b580b4fcf8112f4d6d0d5a4ce8e1ad5e21fee67d8e8335d5f8b3debab",
+            urls = ["https://github.com/bazelbuild/rules_java/releases/download/7.3.2/rules_java-7.3.2.tar.gz"],
+            sha256 = "3121a00588b1581bd7c1f9b550599629e5adcc11ba9c65f482bbd5cfe47fdf30",
         )
-
+        
     if not native.existing_rule("rules_proto"):
         http_archive(
             name = "rules_proto",
-            sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
-            strip_prefix = "rules_proto-5.3.0-21.7",
-            urls = [
-                "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
-            ],
+            sha256 = "71fdbed00a0709521ad212058c60d13997b922a5d01dbfd997f0d57d689e7b67",
+            strip_prefix = "rules_proto-6.0.0-rc2",
+            url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.0-rc2/rules_proto-6.0.0-rc2.tar.gz",
         )
 
     if not native.existing_rule("rules_python"):
@@ -102,11 +100,11 @@ def protobuf_deps():
         )
 
     if not native.existing_rule("rules_jvm_external"):
-        _github_archive(
+        http_archive(
             name = "rules_jvm_external",
-            repo = "https://github.com/bazelbuild/rules_jvm_external",
-            commit = "906875b0d5eaaf61a8ca2c9c3835bde6f435d011",
-            sha256 = "744bd7436f63af7e9872948773b8b106016dc164acb3960b4963f86754532ee7",
+            strip_prefix = "rules_jvm_external-5.3",
+            sha256 = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac",
+            url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/5.3/rules_jvm_external-5.3.tar.gz",
         )
 
     if not native.existing_rule("rules_pkg"):