Select Scala toolchain by version and add JVM flags to the toolchain

.bazelrc_shared

@@ -1,7 +1,6 @@
 # Java options
 build --java_language_version="21"
 build --java_runtime_version="remotejdk_21"
-build --javacopt="-source 21 -target 21"
 build --tool_java_language_version="21"
 build --tool_java_runtime_version="remotejdk_21"
 
@@ -23,12 +22,16 @@ common --modify_execution_info=CppModuleMap=+supports-path-mapping
 common --color=yes
 common:rules --disk_cache=.bazel_cache
 common:tests --disk_cache=../.bazel_cache
-common:tests --@rules_scala_annex//rules/scala:scala-toolchain=test_zinc_2_13
+
+# Use the prebuilt protobuf toolchain.
+common --incompatible_enable_proto_toolchain_resolution
+common --@protobuf//bazel/flags:prefer_prebuilt_protoc
 
 # These are backwards incompatible options; we should check to see if their values have been flipped
 # when upgrading to new major Bazel version.
 common --incompatible_modify_execution_info_additive
-common --incompatible_auto_exec_groups
+# This is incompatible with the protobuf prebuilt toolchain. Turn it back on when that is fixed.
+#common --incompatible_auto_exec_groups
 common --incompatible_autoload_externally=sh_binary # sh_binary is used by rules_jvm_external
 common --incompatible_config_setting_private_default_visibility
 common --incompatible_disable_native_repo_rules

.bazelversion

@@ -1 +1 @@
-8.2.1
+8.7.0

.gitignore

@@ -22,3 +22,5 @@ target/
 /.vscode/
 /bazel.iml
 *.iml
+
+.claude/**/*.local.*

BUILD

@@ -3,6 +3,7 @@ load(
     "DEFAULT_TOOLCHAIN_CONFIGURATION",
     "default_java_toolchain",
 )
+load("//rules/scala:versions.bzl", "scala_2_13_version", "scala_3_version")
 load("//rules/scalafmt:register_toolchain.bzl", "register_scalafmt_toolchain")
 
 default_java_toolchain(
@@ -17,4 +18,9 @@ default_java_toolchain(
 register_scalafmt_toolchain(
     name = "annex_scalafmt",
     config = ".scalafmt.conf",
+    scala_versions = [
+        scala_2_13_version,
+        scala_3_version,
+        "bootstrap_" + scala_3_version,
+    ],
 )

MODULE.bazel

@@ -1,19 +1,20 @@
 module(name = "rules_scala_annex")
 
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "protobuf", version = "29.3")
-bazel_dep(name = "rules_java", version = "8.11.0")
-bazel_dep(name = "rules_jvm_external", version = "6.5")
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
+bazel_dep(name = "protobuf", version = "35.0")
+bazel_dep(name = "rules_java", version = "9.6.1")
+bazel_dep(name = "rules_jvm_external", version = "6.9")
 
 bazel_dep(name = "buildifier_prebuilt", version = "7.3.1", dev_dependency = True)
 bazel_dep(name = "rules_pkg", version = "1.0.1", dev_dependency = True)
 bazel_dep(name = "stardoc", version = "0.7.2", dev_dependency = True)
 
+bazel_dep(name = "bazel_features", version = "1.42.0")
+
 register_toolchains(
     "//:annex_scalafmt",
     "//:repository_default_toolchain_21_definition",
     "//rules/scala_proto:scalapb_scala_proto_toolchain",
-    "//src/main/scala:annex_bootstrap_2_13",
     "//src/main/scala:annex_bootstrap_3",
     "//src/main/scala:annex_zinc_2_13",
     "//src/main/scala:annex_zinc_3",
@@ -32,6 +33,12 @@ scalapb_version = "0.11.17"
 
 zinc_version = "1.10.8"
 
+scala = use_extension("//:extensions.bzl", "scala")
+scala.defaults(
+    scala_version = scala_2_13_version,
+)
+use_repo(scala, "rules_scala_annex_config")
+
 annex = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 annex.install(
     name = "annex",

annex_install.json

@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
   "__INPUT_ARTIFACTS_HASH": -1426185539,
-  "__RESOLVED_ARTIFACTS_HASH": 696573469,
+  "__RESOLVED_ARTIFACTS_HASH": -10147847,
   "conflict_resolution": {
     "org.scala-sbt:io_2.13:1.10.1": "org.scala-sbt:io_2.13:1.10.4"
   },
@@ -281,8 +281,7 @@
     },
     "com.google.code.findbugs:jsr305": {
       "shasums": {
-        "jar": "905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed",
-        "sources": null
+        "jar": "905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed"
       },
       "version": "1.3.9"
     },
@@ -3220,7 +3219,7 @@
     ]
   },
   "repositories": {
-    "https://repo.maven.apache.org/maven2/": [
+    "https://maven-central.storage-download.googleapis.com/maven2/": [
       "ch.epfl.scala:bloop-backend_2.12",
       "ch.epfl.scala:bloop-backend_2.12:jar:sources",
       "ch.epfl.scala:bloop-config_2.12",
@@ -3547,7 +3546,7 @@
       "org.typelevel:macro-compat_2.12",
       "org.typelevel:macro-compat_2.12:jar:sources"
     ],
-    "https://maven-central.storage-download.googleapis.com/maven2/": [
+    "https://mirror.bazel.build/repo1.maven.org/maven2/": [
       "ch.epfl.scala:bloop-backend_2.12",
       "ch.epfl.scala:bloop-backend_2.12:jar:sources",
       "ch.epfl.scala:bloop-config_2.12",
@@ -3874,7 +3873,7 @@
       "org.typelevel:macro-compat_2.12",
       "org.typelevel:macro-compat_2.12:jar:sources"
     ],
-    "https://mirror.bazel.build/repo1.maven.org/maven2/": [
+    "https://repo.maven.apache.org/maven2/": [
       "ch.epfl.scala:bloop-backend_2.12",
       "ch.epfl.scala:bloop-backend_2.12:jar:sources",
       "ch.epfl.scala:bloop-config_2.12",

annex_proto_install.json

@@ -136,7 +136,7 @@
     ]
   },
   "repositories": {
-    "https://repo.maven.apache.org/maven2/": [
+    "https://maven-central.storage-download.googleapis.com/maven2/": [
       "com.google.protobuf:protobuf-java",
       "com.google.protobuf:protobuf-java:jar:sources",
       "com.thesamet.scalapb:compilerplugin_2.13",
@@ -152,7 +152,7 @@
       "org.scala-lang:scala-library",
       "org.scala-lang:scala-library:jar:sources"
     ],
-    "https://maven-central.storage-download.googleapis.com/maven2/": [
+    "https://mirror.bazel.build/repo1.maven.org/maven2/": [
       "com.google.protobuf:protobuf-java",
       "com.google.protobuf:protobuf-java:jar:sources",
       "com.thesamet.scalapb:compilerplugin_2.13",
@@ -168,7 +168,7 @@
       "org.scala-lang:scala-library",
       "org.scala-lang:scala-library:jar:sources"
     ],
-    "https://mirror.bazel.build/repo1.maven.org/maven2/": [
+    "https://repo.maven.apache.org/maven2/": [
       "com.google.protobuf:protobuf-java",
       "com.google.protobuf:protobuf-java:jar:sources",
       "com.thesamet.scalapb:compilerplugin_2.13",

annex_scalafmt_install.json

@@ -568,7 +568,7 @@
     ]
   },
   "repositories": {
-    "https://repo.maven.apache.org/maven2/": [
+    "https://maven-central.storage-download.googleapis.com/maven2/": [
       "com.lihaoyi:fansi_2.13",
       "com.lihaoyi:fansi_2.13:jar:sources",
       "com.lihaoyi:sourcecode_2.13",
@@ -620,7 +620,7 @@
       "org.typelevel:paiges-core_2.13",
       "org.typelevel:paiges-core_2.13:jar:sources"
     ],
-    "https://maven-central.storage-download.googleapis.com/maven2/": [
+    "https://mirror.bazel.build/repo1.maven.org/maven2/": [
       "com.lihaoyi:fansi_2.13",
       "com.lihaoyi:fansi_2.13:jar:sources",
       "com.lihaoyi:sourcecode_2.13",
@@ -672,7 +672,7 @@
       "org.typelevel:paiges-core_2.13",
       "org.typelevel:paiges-core_2.13:jar:sources"
     ],
-    "https://mirror.bazel.build/repo1.maven.org/maven2/": [
+    "https://repo.maven.apache.org/maven2/": [
       "com.lihaoyi:fansi_2.13",
       "com.lihaoyi:fansi_2.13:jar:sources",
       "com.lihaoyi:sourcecode_2.13",