Bump to Bazel 7.6.0, update scala = False docs

mbland · mbland · commit 4e90449655af · 2025-03-24T18:10:41.000-04:00
The docs are more clear that `scala_toolchains(scala = False)` applies
when using custom JARs for every `setup_scala_toolchain()` argument.
Otherwise `setup_scala_toolchain()` will fall back to the builtin JARs,
and needs `scala = True, validate_scala_version = False`.

Also removes the `scala_register_toolchains()` calls from the
`dt_patches/test_dt_patches*/WORKSPACE` files. This proves that those
calls were harmless before in those repos, but ultimately unnecessary.

`MODULE.bazel` will still register `@rules_scala_toolchains//...:all`.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -54,16 +54,16 @@ tasks:
     - "set PATH=/usr/bin;%PATH%" #Make sure bash uses msys commands over windows commands. (i.e. find).
     - "bash -lc \"pacman --noconfirm --needed -S libxml2\"" #tests require xmllint
     - "bash test_rules_scala.sh"
-  test_coverage_linux_7_5_0:
+  test_coverage_linux_7_6_0:
     name: "./test_coverage"
     platform: ubuntu2004
-    bazel: 7.5.0
+    bazel: 7.6.0
     shell_commands:
       - "./test_coverage.sh"
-  test_coverage_macos_7.5.0:
+  test_coverage_macos_7.6.0:
     name: "./test_coverage"
     platform: macos
-    bazel: 7.5.0
+    bazel: 7.6.0
     shell_commands:
       - "./test_coverage.sh"
   test_reproducibility_linux:
@@ -94,13 +94,13 @@ tasks:
   examples_linux:
     name: "./test_examples"
     platform: ubuntu2004
-    bazel: 7.5.0
+    bazel: 7.6.0
     shell_commands:
       - "./test_examples.sh"
   cross_build_linux:
     name: "./test_cross_build"
     platform: ubuntu2004
-    bazel: 7.5.0
+    bazel: 7.6.0
     shell_commands:
       - "./test_cross_build.sh"
   lint_linux:
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/README.md b/README.md
@@ -804,7 +804,7 @@ same exact call will also work in `MODULE.bazel`.
 
 ### Disabling builtin Scala toolchains when defining custom Scala toolchains
 
-When [defining a 'scala_toolchain()' using custom compiler JARs](
+When [using 'setup_scala_toolchain()' with custom compiler JARs](
 docs/scala_toolchain.md#b-defining-your-own-scala_toolchain), don't use
 `scala_toolchains()` if you don't need any other builtin toolchains.
 
@@ -819,9 +819,9 @@ scala_toolchains(
 ```
 
 This avoids instantiating the default Scala toolchain and compiler JAR
-repositories and a corresponding Scala version check, which may fail when
-defining a custom toolchain. It's equivalent to two ways in which the previous
-API avoided the same default behavior:
+repositories, and disables the corresponding Scala version check, which may
+otherwise fail. This is equivalent to two ways in which the previous API avoided
+the same default behavior:
 
 - Calling `scala_repositories(load_jar_deps = False)` would instantiate only
     other `rules_scala` dependency repos (`rules_java`, `protobuf`, etc.) and
diff --git a/docs/scala_toolchain.md b/docs/scala_toolchain.md
@@ -103,8 +103,9 @@ register_toolchains("//toolchains:my_scala_toolchain")
 
 #### Step 3 (optional)
 
-If you use `scala_toolchains()` to instantiate other builtin toolchains, set
-`scala = False`:
+When using your own JARs for every `setup_scala_toolchain()` argument, while
+using `scala_toolchains()` to instantiate other builtin toolchains, set `scala =
+False`:
 
 ```py
 # WORKSPACE
@@ -115,10 +116,21 @@ scala_toolchains(
 ```
 
 Otherwise, `scala_toolchains()` will try to instantiate a default Scala
-toolchain and its compiler JAR dependency repositories. The build will then fail
-if the configured Scala version doesn't match the `scala_version` value in the
+toolchain and its compiler JAR repositories. The build will then fail if the
+configured Scala version doesn't match the `scala_version` value in the
 corresponding `third_party/repositories/scala_*.bzl` file.
 
+If you don't specify your own jars for every `setup_scala_toolchain()` argument,
+set `validate_scala_version = False` to disable the Scala version check.
+
+```py
+# WORKSPACE
+scala_toolchains(
+    validate_scala_version = False,
+    # ...other toolchain parameters...
+)
+```
+
 ## Configuration options
 
 The following attributes apply to both `scala_toolchain` and
diff --git a/dt_patches/compiler_sources/.bazelversion b/dt_patches/compiler_sources/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/dt_patches/test_dt_patches/.bazelversion b/dt_patches/test_dt_patches/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/dt_patches/test_dt_patches/WORKSPACE b/dt_patches/test_dt_patches/WORKSPACE
@@ -73,17 +73,11 @@ load("@compiler_sources//:extensions.bzl", "import_compiler_source_repos")
 
 import_compiler_source_repos()
 
-load(
-    "@rules_scala//scala:toolchains.bzl",
-    "scala_register_toolchains",
-    "scala_toolchains",
-)
+load("@rules_scala//scala:toolchains.bzl", "scala_toolchains")
 
 scala_toolchains(
     fetch_sources = True,
     validate_scala_version = False,
 )
 
 register_toolchains(":dt_scala_toolchain")
-
-scala_register_toolchains()
diff --git a/dt_patches/test_dt_patches_user_srcjar/.bazelversion b/dt_patches/test_dt_patches_user_srcjar/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE
@@ -149,11 +149,7 @@ srcjars_by_version = {
     },
 }
 
-load(
-    "@rules_scala//scala:toolchains.bzl",
-    "scala_register_toolchains",
-    "scala_toolchains",
-)
+load("@rules_scala//scala:toolchains.bzl", "scala_toolchains")
 
 scala_toolchains(
     fetch_sources = True,
@@ -162,5 +158,3 @@ scala_toolchains(
 )
 
 register_toolchains(":dt_scala_toolchain")
-
-scala_register_toolchains()
diff --git a/examples/crossbuild/.bazelversion b/examples/crossbuild/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/examples/overridden_artifacts/.bazelversion b/examples/overridden_artifacts/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/examples/scala3/.bazelversion b/examples/scala3/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/examples/semanticdb/.bazelversion b/examples/semanticdb/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/examples/testing/multi_frameworks_toolchain/.bazelversion b/examples/testing/multi_frameworks_toolchain/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/examples/testing/scalatest_repositories/.bazelversion b/examples/testing/scalatest_repositories/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/examples/testing/specs2_junit_repositories/.bazelversion b/examples/testing/specs2_junit_repositories/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/test/proto_cross_repo_boundary/repo/.bazelversion b/test/proto_cross_repo_boundary/repo/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/test_cross_build/.bazelversion b/test_cross_build/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/third_party/test/example_external_workspace/.bazelversion b/third_party/test/example_external_workspace/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/third_party/test/new_local_repo/.bazelversion b/third_party/test/new_local_repo/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
diff --git a/third_party/test/proto/.bazelversion b/third_party/test/proto/.bazelversion
@@ -1 +1 @@
-7.5.0
+7.6.0
