Merge branch 'bzlmod-rebuilding' into bzlmod

Lots of little touch ups. For the next commit, I'll use the new
`scripts/toggle-workspace.sh` to ensure `WORKSPACE` compatibility.

Author: mbland

MODULE.bazel

@@ -6,15 +6,15 @@ module(
     repo_name = "io_bazel_rules_scala",
 )
 
-SCALA_VERSION = "2.13.14"
+SCALA_VERSION = "2.13.15"
 
 SCALA_2_VERSIONS = [
-    "2.12.19",
-    "2.13.14",
+    "2.12.20",
+    "2.13.15",
 ]
 
 SCALA_3_VERSIONS = [
-    "3.3.3",
+    "3.3.4",
 ]
 
 SCALA_VERSIONS = SCALA_2_VERSIONS + SCALA_3_VERSIONS

MODULE.bazel.lock

@@ -88,7 +88,7 @@ scalatest_toolchain()
 ```
 
 This will load the `rules_scala` repository at the commit sha
-`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.19)
+`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.20)
 
 Then in your BUILD file just add the following so the rules will be available:
 ```starlark
@@ -143,13 +143,13 @@ Previous minor versions may work but are supported only on a best effort basis.
 To configure Scala version you must call `scala_config(scala_version = "2.xx.xx")` and configure 
 dependencies by declaring [scala_toolchain](docs/scala_toolchain.md). 
 For a quick start you can use `scala_repositories()` and `scala_register_toolchains()`, which have 
-dependency providers configured for `2.11.12`, `2.12.19` and `2.13.14` versions.
+dependency providers configured for `2.11.12`, `2.12.20` and `2.13.15` versions.
 
 
 ```starlark
 # WORKSPACE
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
-scala_config(scala_version = "2.13.14")
+scala_config(scala_version = "2.13.15")
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
 rules_proto_dependencies()

README.md

@@ -39,18 +39,23 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
 
 scala_config(enable_compiler_dependency_tracking = True)
 
-load(
-    "//scala:scala.bzl",
-    "rules_scala_setup",
-    "rules_scala_toolchain_deps_repositories",
-    "scala_toolchains_repo",
+load("//scala:scala.bzl", "scala_toolchains")
+
+scala_toolchains(
+    fetch_sources = True,
+    jmh = True,
+    scala_proto = True,
+    scalafmt = True,
+    testing = True,
+    twitter_scrooge = True,
 )
 
-rules_scala_setup()
-
-rules_scala_toolchain_deps_repositories(fetch_sources = True)
-
-scala_toolchains_repo()
+register_toolchains(
+    "//testing:testing_toolchain",
+    "//scala:unused_dependency_checker_error_toolchain",
+    "//test/proto:scalapb_toolchain",
+    "@io_bazel_rules_scala_toolchains//...:all",
+)
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
 
@@ -68,37 +73,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
 
-load("//scala:scala_cross_version.bzl", "default_maven_server_urls")
-load("//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge")
-
-twitter_scrooge()
-
-load("//jmh:jmh.bzl", "jmh_repositories")
-
-jmh_repositories()
-
-load("//scala_proto:scala_proto.bzl", "scala_proto_repositories")
-
-scala_proto_repositories()
-
-load("//scalatest:scalatest.bzl", "scalatest_repositories")
-
-scalatest_repositories()
-
-load("//specs2:specs2_junit.bzl", "specs2_junit_repositories")
-
-specs2_junit_repositories()
-
-register_toolchains("//testing:testing_toolchain")
-
-load("//scala/scalafmt:scalafmt_repositories.bzl", "scalafmt_default_config", "scalafmt_repositories")
-
-scalafmt_default_config()
-
-scalafmt_repositories()
-
-MAVEN_SERVER_URLS = default_maven_server_urls()
-
 # needed for the cross repo proto test
 load("//test/proto_cross_repo_boundary:repo.bzl", "proto_cross_repo_boundary_repository")
 
@@ -122,12 +96,6 @@ local_repository(
     path = "third_party/test/example_external_workspace",
 )
 
-load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_unused_deps_toolchains")
-
-scala_register_unused_deps_toolchains()
-
-register_toolchains("@io_bazel_rules_scala//test/proto:scalapb_toolchain")
-
 load("//scala:scala_maven_import_external.bzl", "java_import_external")
 
 # bazel's java_import_external has been altered in rules_scala to be a macro based on jvm_import_external
@@ -191,10 +159,7 @@ rbe_preconfig(
 
 load("//testing/private:repositories.bzl", "testing_repositories")
 
-testing_repositories(
-    fetch_sources = False,
-    maven_servers = MAVEN_SERVER_URLS,
-)
+testing_repositories(fetch_sources = False)
 
 load("//test/toolchains:jdk.bzl", "remote_jdk21_repositories", "remote_jdk21_toolchains")
 

WORKSPACE

@@ -99,6 +99,7 @@ run_test_local test_compiler_patch 2.12.16
 run_test_local test_compiler_patch 2.12.17
 run_test_local test_compiler_patch 2.12.18
 run_test_local test_compiler_patch 2.12.19
+run_test_local test_compiler_patch 2.12.20
 
 run_test_local test_compiler_patch 2.13.0
 run_test_local test_compiler_patch 2.13.1
@@ -113,6 +114,7 @@ run_test_local test_compiler_patch 2.13.10
 run_test_local test_compiler_patch 2.13.11
 run_test_local test_compiler_patch 2.13.12
 run_test_local test_compiler_patch 2.13.14
+run_test_local test_compiler_patch 2.13.15
 
 run_test_local test_compiler_srcjar_error 2.12.11
 run_test_local test_compiler_srcjar_error 2.12.12
@@ -131,7 +133,9 @@ run_test_local test_compiler_srcjar 2.12.16
 run_test_local test_compiler_srcjar_nonhermetic 2.12.17
 run_test_local test_compiler_srcjar_nonhermetic 2.12.18
 run_test_local test_compiler_srcjar_nonhermetic 2.12.19
+run_test_local test_compiler_srcjar_nonhermetic 2.12.20
 
 run_test_local test_compiler_srcjar_nonhermetic 2.13.11
 run_test_local test_compiler_srcjar_nonhermetic 2.13.12
 run_test_local test_compiler_srcjar_nonhermetic 2.13.14
+run_test_local test_compiler_srcjar_nonhermetic 2.13.15