Fixing things after rebasing

Author: shs96c

.bazelrc

@@ -13,6 +13,11 @@ build --explicit_java_test_deps
 test --verbose_failures
 test --test_output=errors
 
+# Required to get `protobuf` compiling, which is required for `rules_closure`
+build --incompatible_enable_cc_toolchain_resolution
+build --cxxopt=-std=c++17
+build --host_cxxopt=-std=c++17
+
 # Every JVM creates a temporary performance instrumentation file in
 # /tmp/hsperfdata_$USERNAME/$PID. When we use sandboxing, we use PID
 # namespaces, which means that the PIDs are virtualized and all

MODULE.bazel

@@ -4,18 +4,18 @@ module(
     bazel_compatibility = [">=7.0.0"],
 )
 
-bazel_dep(name = "rules_android", version = "0.6.3")
-bazel_dep(name = "bazel_features", version = "1.19.0")
+bazel_dep(name = "rules_android", version = "0.6.6")
+bazel_dep(name = "bazel_features", version = "1.30.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "package_metadata", version = "0.0.3")
-bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "rules_license", version = "1.0.0")
-bazel_dep(name = "rules_java", version = "7.12.2")
+bazel_dep(name = "rules_java", version = "8.13.0")
 bazel_dep(name = "rules_kotlin", version = "1.9.6")
-bazel_dep(name = "rules_shell", version = "0.3.0")
+bazel_dep(name = "rules_shell", version = "0.4.1")
 
 bazel_dep(name = "aspect_bazel_lib", version = "2.20.0", dev_dependency = True)
-bazel_dep(name = "stardoc", version = "0.7.0", dev_dependency = True, repo_name = "io_bazel_stardoc")
+bazel_dep(name = "stardoc", version = "0.7.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
 
 # Remove this once rules_android has rolled out official Bzlmod support
 remote_android_extensions = use_extension("@bazel_tools//tools/android:android_extensions.bzl", "remote_android_tools_extensions")
@@ -151,7 +151,7 @@ bazel_dep(
     # https://github.com/protocolbuffers/protobuf/commit/a80daa2a2caaaac9ebe9ae6bb1b639c2771c5c55
     # This should be ok because we only use protobuf to pull in the google/protobuf/wrappers.proto
     # for testing.
-    version = "29.3",
+    version = "31.1",
     dev_dependency = True,
 )
 bazel_dep(
@@ -171,11 +171,15 @@ dev_maven = use_extension(
 )
 dev_maven.install(
     artifacts = [
-        "com.google.guava:guava:31.1-jre",
-        "com.google.protobuf:protobuf-java:4.29.4",
+        "com.google.guava:guava:33.5.0-jre",
+        "com.google.protobuf:protobuf-java:4.31.0",
         "org.hamcrest:hamcrest-core:2.1",
         "io.netty:netty-tcnative-boringssl-static:2.0.61.Final",
     ],
+    known_contributing_modules = [
+        "bazel_worker_java",
+        "rules_jvm_external",
+    ],
     lock_file = "@rules_jvm_external//:maven_install.json",
     resolver = "coursier",
 )
@@ -298,7 +302,7 @@ dev_maven.install(
 dev_maven.install(
     name = "java_export_exclusion_testing",
     artifacts = [
-        "com.google.protobuf:protobuf-java:3.23.1",
+        "com.google.protobuf:protobuf-java:4.31.1",
     ],
     lock_file = "//tests/custom_maven_install:java_export_exclusion_testing_install.json",
 )
@@ -340,7 +344,6 @@ dev_maven.install(
     name = "jvm_import_test",
     artifacts = [
         "com.google.code.findbugs:jsr305:3.0.2",
-        "com.android.support:appcompat-v7:28.0.0@aar",
     ],
     repositories = [
         "https://repo1.maven.org/maven2",
@@ -755,6 +758,7 @@ dev_maven.install(
         "com.android.support:appcompat-v7:28.0.0",
     ],
     fetch_sources = False,
+    generate_compat_repositories = True,
     repositories = [
         "https://repo1.maven.org/maven2",
         "https://maven.google.com",

maven_install.json

@@ -1,10 +1,11 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -391199704,
-  "__RESOLVED_ARTIFACTS_HASH": -50577873,
+  "__INPUT_ARTIFACTS_HASH": 1994476565,
+  "__RESOLVED_ARTIFACTS_HASH": -274973469,
   "conflict_resolution": {
-    "com.google.errorprone:error_prone_annotations:2.23.0": "com.google.errorprone:error_prone_annotations:2.24.1",
-    "com.google.guava:guava:31.1-jre": "com.google.guava:guava:33.0.0-android"
+    "com.google.errorprone:error_prone_annotations:2.23.0": "com.google.errorprone:error_prone_annotations:2.41.0",
+    "com.google.guava:guava:33.0.0-jre": "com.google.guava:guava:33.5.0-jre",
+    "com.google.protobuf:protobuf-java:4.27.2": "com.google.protobuf:protobuf-java:4.31.0"
   },
   "artifacts": {
     "com.google.auto.value:auto-value-annotations": {
@@ -27,21 +28,21 @@
     },
     "com.google.errorprone:error_prone_annotations": {
       "shasums": {
-        "jar": "19fe2f7155d20ea093168527999da98108103ee546d1e8b726bc4b27c31a3c30"
+        "jar": "a56e782b5b50811ac204073a355a21d915a2107fce13ec711331ad036f660fcc"
       },
-      "version": "2.24.1"
+      "version": "2.41.0"
     },
     "com.google.guava:failureaccess": {
       "shasums": {
-        "jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064"
+        "jar": "cbfc3906b19b8f55dd7cfd6dfe0aa4532e834250d7f080bd8d211a3e246b59cb"
       },
-      "version": "1.0.2"
+      "version": "1.0.3"
     },
     "com.google.guava:guava": {
       "shasums": {
-        "jar": "640535014a304c50221abad19d6b22a096f13119c7c447a655cc1e009a32208d"
+        "jar": "1e301f0c52ac248b0b14fdc3d12283c77252d4d6f48521d572e7d8c4c2cc4ac7"
       },
-      "version": "33.0.0-android"
+      "version": "33.5.0-jre"
     },
     "com.google.guava:listenablefuture": {
       "shasums": {
@@ -51,15 +52,15 @@
     },
     "com.google.j2objc:j2objc-annotations": {
       "shasums": {
-        "jar": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed"
+        "jar": "84d3a150518485f8140ea99b8a985656749629f6433c92b80c75b36aba3b099b"
       },
-      "version": "2.8"
+      "version": "3.1"
     },
     "com.google.protobuf:protobuf-java": {
       "shasums": {
-        "jar": "b5ae02c6b76780261852cdc2549c1e36a6b4cc9d339ef80a8ef7c599c9775a96"
+        "jar": "68773dccd6cc5835af7a748759cecf5ea20ff083136e3847fbe94572b8e0ed6a"
       },
-      "version": "4.29.4"
+      "version": "4.31.0"
     },
     "com.google.protobuf:protobuf-java-util": {
       "shasums": {
@@ -126,6 +127,12 @@
       },
       "version": "2.1"
     },
+    "org.jspecify:jspecify": {
+      "shasums": {
+        "jar": "1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab"
+      },
+      "version": "1.0.0"
+    },
     "org.mockito:mockito-core": {
       "shasums": {
         "jar": "b1689b06617ea01fd777bfaedbdde512faf083d639a049f79b388d5a4e96d2e5"
@@ -147,12 +154,11 @@
   },
   "dependencies": {
     "com.google.guava:guava": [
-      "com.google.code.findbugs:jsr305",
       "com.google.errorprone:error_prone_annotations",
       "com.google.guava:failureaccess",
       "com.google.guava:listenablefuture",
       "com.google.j2objc:j2objc-annotations",
-      "org.checkerframework:checker-qual"
+      "org.jspecify:jspecify"
     ],
     "com.google.protobuf:protobuf-java-util": [
       "com.google.code.findbugs:jsr305",
@@ -417,6 +423,9 @@
     "org.hamcrest:hamcrest-core": [
       "org.hamcrest"
     ],
+    "org.jspecify:jspecify": [
+      "org.jspecify.annotations"
+    ],
     "org.mockito:mockito-core": [
       "org.mockito",
       "org.mockito.codegen",
@@ -526,6 +535,7 @@
       "org.checkerframework:checker-qual",
       "org.hamcrest:hamcrest",
       "org.hamcrest:hamcrest-core",
+      "org.jspecify:jspecify",
       "org.mockito:mockito-core",
       "org.objenesis:objenesis",
       "org.ow2.asm:asm"

private/extensions/maven.bzl

@@ -348,12 +348,14 @@ def process_gradle_versions_file(parsed, bom_modules):
         # Case 1: Simple string notation: "group:artifact:version"
         if type(value) == "string":
             coords = value
-        # Case 2: Map notation
+            # Case 2: Map notation
+
         elif type(value) == "dict":
             # Case 2a: Map with "module" key
             if "module" in value.keys():
                 coords = value["module"]
-            # Case 2b: Map with "group" and "name" keys
+                # Case 2b: Map with "group" and "name" keys
+
             elif "group" in value.keys() and "name" in value.keys():
                 coords = "%s:%s" % (value["group"], value["name"])
             else:

tests/custom_maven_install/java_export_exclusion_testing_install.json

@@ -1,13 +1,13 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 1917488203,
-  "__RESOLVED_ARTIFACTS_HASH": 1233788803,
+  "__INPUT_ARTIFACTS_HASH": -382709041,
+  "__RESOLVED_ARTIFACTS_HASH": -2016706042,
   "artifacts": {
     "com.google.protobuf:protobuf-java": {
       "shasums": {
-        "jar": "d9fd335a65165c760f53ae718878448627ce742ab6e9102dffe9bc2ea7b136ca"
+        "jar": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae"
       },
-      "version": "3.23.1"
+      "version": "4.31.1"
     }
   },
   "dependencies": {},

tests/custom_maven_install/regression_testing_maven_install.json

@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
   "__INPUT_ARTIFACTS_HASH": 1002959493,
-  "__RESOLVED_ARTIFACTS_HASH": 661646060,
+  "__RESOLVED_ARTIFACTS_HASH": -458720370,
   "artifacts": {
     "com.almworks.sqlite4java:libsqlite4java-linux-amd64:so": {
       "shasums": {

tests/integration/maven_bom/bom-dependencies.golden.xml

@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>33.0.0-android</version>
+                <version>33.5.0-jre</version>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>

tests/integration/maven_bom/transitive-bom-dependencies.golden.xml

@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>33.0.0-android</version>
+                <version>33.5.0-jre</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

tests/integration/override_targets/BUILD

@@ -4,12 +4,20 @@ load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
 load("@rules_android//android:rules.bzl", "aar_import")
 load("@rules_java//java:defs.bzl", "java_library")
 load("//tests/integration:is_bzlmod_enabled.bzl", "is_bzlmod_enabled")
-load(":aar_import_test.bzl", "aar_import_test_suite")
 
 aar_import(
     name = "aar_import_that_consumes_the_downloaded_file_directly",
     # Will produce an error if the downloaded file does not have the `.aar` file extension
     aar = "@com_android_support_appcompat_v7_aar_28_0_0//file:file",
+    deps = [
+        "@starlark_aar_import_test//:com_android_support_animated_vector_drawable",
+        "@starlark_aar_import_test//:com_android_support_support_annotations",
+        "@starlark_aar_import_test//:com_android_support_support_compat",
+        "@starlark_aar_import_test//:com_android_support_support_core_ui",
+        "@starlark_aar_import_test//:com_android_support_support_core_utils",
+        "@starlark_aar_import_test//:com_android_support_support_fragment",
+        "@starlark_aar_import_test//:com_android_support_support_vector_drawable",
+    ],
 )
 
 build_test(

tests/integration/pom_file/pom-with-runtime-dep.golden.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.0.0-android</version>
+            <version>33.5.0-jre</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>