Update workspace

Author: agluszak

WORKSPACE

@@ -6,12 +6,15 @@ load("prereqs.bzl", "rules_android_prereqs")
 
 rules_android_prereqs(dev_mode = True)
 
-load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
-rules_java_dependencies()
-
 load("@bazel_features//:deps.bzl", "bazel_features_deps")
 bazel_features_deps()
 
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
+compatibility_proxy_repo()
+
+load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
+rules_java_dependencies()
+
 # note that the following line is what is minimally required from protobuf for the java rules
 # consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
 load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility

defs.bzl

@@ -57,8 +57,8 @@ def rules_android_workspace():
             # These technically aren't needed, but the protobuf version pulled
             # in by these older deps has compatibility issues with the newer
             # protobuf runtimes.
-            "com.google.protobuf:protobuf-java:4.31.1",
-            "com.google.protobuf:protobuf-java-util:4.31.1",
+            "com.google.protobuf:protobuf-java:4.33.1",
+            "com.google.protobuf:protobuf-java-util:4.33.1",
         ],
         repositories = [
             "https://maven.google.com",
@@ -94,8 +94,8 @@ def rules_android_workspace():
             "jakarta.inject:jakarta.inject-api:2.0.1",
             "junit:junit:4.13.2",
             "com.beust:jcommander:1.82",
-            "com.google.protobuf:protobuf-java:4.31.1",
-            "com.google.protobuf:protobuf-java-util:4.31.1",
+            "com.google.protobuf:protobuf-java:4.33.1",
+            "com.google.protobuf:protobuf-java-util:4.33.1",
             "com.google.code.findbugs:jsr305:3.0.2",
             "androidx.databinding:databinding-compiler:8.7.0",
             "org.ow2.asm:asm:9.6",
@@ -149,8 +149,8 @@ def rules_android_workspace():
             "com.google.code.gson:gson:2.10.1",  # bazel worker api
             "com.google.errorprone:error_prone_annotations:2.23.0",  # bazel worker api
             "com.google.guava:guava:33.0.0-jre",  # bazel worker api
-            "com.google.protobuf:protobuf-java:4.27.2",  # bazel worker api
-            "com.google.protobuf:protobuf-java-util:4.27.2",  # bazel worker api
+            "com.google.protobuf:protobuf-java:4.33.1",  # bazel worker api
+            "com.google.protobuf:protobuf-java-util:4.33.1",  # bazel worker api
             "junit:junit:4.13.2",  # bazel worker api
             "org.mockito:mockito-core:5.4.0",  # bazel worker api
             "com.google.truth:truth:1.4.0",  # bazel worker api
@@ -170,12 +170,8 @@ def rules_android_workspace():
     gazelle_dependencies()
     # gazelle:repository go_repository name=org_golang_x_xerrors importpath=golang.org/x/xerrors
 
-    go_repository(
-        name = "org_golang_google_protobuf",
-        importpath = "google.golang.org/protobuf",
-        sum = "h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=",
-        version = "v1.31.0",
-    )
+    # Note: org_golang_google_protobuf is now set up by go_rules_dependencies()
+    # with proper patches for newer protobuf versions.
 
     go_repository(
         name = "com_github_google_go_cmp",

examples/basicapp/.bazelrc

@@ -13,7 +13,7 @@ common --tool_java_runtime_version=17
 # Workaround for a rules_java + bazel < 8.3.0 issue. It should only be relevant
 # for bazel@HEAD and rolling releases.
 # https://github.com/bazelbuild/bazel/pull/26119
-common --repositories_without_autoloads=bazel_features_version,bazel_features_globals
+common --repositories_without_autoloads=bazel_features_version,bazel_features_globals,cc_compatibility_proxy
 
 # Newer versions of protobuf require downstream transitive projects to set C++ language version flags.
 common:linux --cxxopt=-std=c++17

examples/basicapp/WORKSPACE

@@ -9,13 +9,16 @@ local_repository(
 load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 rules_android_prereqs()
 
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+bazel_features_deps()
+
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
+compatibility_proxy_repo()
+
 ##### rules_java setup for rules_android #####
 load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
 rules_java_dependencies()
 
-load("@bazel_features//:deps.bzl", "bazel_features_deps")
-bazel_features_deps()
-
 # note that the following line is what is minimally required from protobuf for the java rules
 # consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
 load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility

prereqs.bzl

@@ -21,13 +21,21 @@ load("//bzlmod_extensions:com_android_dex.bzl", _com_android_dex_archive = "com_
 def rules_android_prereqs(dev_mode = False):
     """Downloads prerequisite repositories for rules_android."""
 
+    maybe(
+        http_archive,
+        name = "bazel_features",
+        sha256 = "a660027f5a87f13224ab54b8dc6e191693c554f2692fcca46e8e29ee7dabc43b",
+        strip_prefix = "bazel_features-1.30.0",
+        url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.30.0/bazel_features-v1.30.0.tar.gz",
+    )
+
     maybe(
         http_archive,
         name = "rules_java",
         urls = [
-            "https://github.com/bazelbuild/rules_java/releases/download/9.0.3/rules_java-9.0.3.tar.gz",
+            "https://github.com/bazelbuild/rules_java/releases/download/9.2.0/rules_java-9.2.0.tar.gz",
         ],
-        sha256 = "865b3d334bd0f769587737447410d8042d6a95134cc45be5380805fdbacd7152",
+        sha256 = "2f822fbc33b99de5bbeaceada4be2bd3bb5c8da80e2f7462a9d300c8fc312f11",
     )
 
     maybe(
@@ -45,8 +53,8 @@ def rules_android_prereqs(dev_mode = False):
         url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.31.0.tar",
     )
 
-    RULES_JVM_EXTERNAL_TAG = "6.7"
-    RULES_JVM_EXTERNAL_SHA = "a1e351607f04fed296ba33c4977d3fe2a615ed50df7896676b67aac993c53c18"
+    RULES_JVM_EXTERNAL_TAG = "6.9"
+    RULES_JVM_EXTERNAL_SHA = "3c41eae4226a7dfdce7b213bc541557b8475c92da71e2233ec7c306630243a65"
     maybe(
         http_archive,
         name = "rules_jvm_external",
@@ -55,8 +63,8 @@ def rules_android_prereqs(dev_mode = False):
         url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG),
     )
 
-    PROTOBUF_VERSION = "33.0"
-    PROTOBUF_HASH = "cbc536064706b628dcfe507bef386ef3e2214d563657612296f1781aa155ee07"
+    PROTOBUF_VERSION = "33.1"
+    PROTOBUF_HASH = "fda132cb0c86400381c0af1fe98bd0f775cb566cb247cdcc105e344e00acc30e"
     maybe(
         http_archive,
         name = "com_google_protobuf",