WIP: Bzlmod part the one hundred twenty-second

Fixes up more merge errors from before, removes the `kwargs.pop` pattern
from the previous commit, and updates dt_patches repos for Bzlmod.

Regarding the latter, I extracted the dt_patches/compiler_sources repo
from the other two repos to eliminate the duplication. I also had to
ensure the module extension emitted the same artifact repos for every
Scala version, since `MODULE.bazel` can't use conditional logic. It must
include every repo explicitly.

Author: mbland

MODULE.bazel

@@ -90,6 +90,7 @@ use_repo(
     dev_deps,
     "scala_proto_rules_scalapb_compilerplugin",
     "scala_proto_rules_scalapb_protoc_bridge",
+    "scala_proto_rules_scalapb_protoc_gen",  # For Scala 2.12 and above
     "scalafmt_default",
 )
 

MODULE.bazel.lock

@@ -0,0 +1 @@
+import ../../.bazelrc

dt_patches/compiler_sources/.bazelrc

@@ -0,0 +1 @@
+7.4.0

dt_patches/compiler_sources/.bazelversion

@@ -0,0 +1,16 @@
+"""Bazel module ./test/shell/test_examples.sh tests"""
+
+module(name = "compiler_sources")
+
+bazel_dep(name = "rules_scala", repo_name = "io_bazel_rules_scala")
+local_path_override(
+    module_name = "rules_scala",
+    path = "../..",
+)
+
+scala_config = use_extension(
+    "@io_bazel_rules_scala//scala/extensions:config.bzl",
+    "scala_config",
+)
+use_repo(scala_config, "io_bazel_rules_scala_config")
+

dt_patches/compiler_sources/BUILD

@@ -0,0 +1 @@
+workspace(name = "compiler_sources")

dt_patches/compiler_sources/MODULE.bazel

@@ -0,0 +1,70 @@
+load(
+    "@io_bazel_rules_scala//scala:scala_cross_version.bzl",
+    "default_maven_server_urls",
+)
+load(
+    "@io_bazel_rules_scala//scala:scala_maven_import_external.bzl",
+    "scala_maven_import_external",
+)
+load(
+    "@io_bazel_rules_scala//third_party/repositories:scala_2_13.bzl",
+    _scala_2_version = "scala_version",
+)
+load(
+    "@io_bazel_rules_scala//third_party/repositories:scala_3_5.bzl",
+    _scala_3_version = "scala_version",
+)
+load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
+
+_IS_SCALA_2 = SCALA_VERSION.startswith("2.")
+_IS_SCALA_3 = SCALA_VERSION.startswith("3.")
+
+_SCALA_2_VERSION = SCALA_VERSION if _IS_SCALA_2 else _scala_2_version
+_SCALA_3_VERSION = SCALA_VERSION if _IS_SCALA_3 else _scala_3_version
+
+_SCALA_VERSION_ARTIFACTS = {
+    "scala_compiler": "org.scala-lang:scala3-compiler_3:",
+    "scala_library": "org.scala-lang:scala3-library_3:",
+} if _IS_SCALA_3 else {
+    "scala_compiler": "org.scala-lang:scala-compiler:",
+    "scala_library": "org.scala-lang:scala-library:",
+}
+
+_SCALA_2_ARTIFACTS = {
+    "scala_reflect": "org.scala-lang:scala-reflect:",
+    "scala2_library": "org.scala-lang:scala-library:",
+}
+
+_SCALA_3_ARTIFACTS = {
+    "scala3_interfaces": "org.scala-lang:scala3-interfaces:",
+    "tasty_core": "org.scala-lang:tasty-core_3:",
+}
+
+def versioned_artifacts(scala_version, artifacts):
+    return {k: v + scala_version for k, v in artifacts.items()}
+
+COMPILER_SOURCES_ARTIFACTS = (
+    versioned_artifacts(SCALA_VERSION, _SCALA_VERSION_ARTIFACTS) |
+    versioned_artifacts(_SCALA_2_VERSION, _SCALA_2_ARTIFACTS) |
+    versioned_artifacts(_SCALA_3_VERSION, _SCALA_3_ARTIFACTS) |
+    {
+        "sbt_compiler_interface": "org.scala-sbt:compiler-interface:1.9.6",
+        "scala_asm": "org.scala-lang.modules:scala-asm:9.7.0-scala-2",
+    }
+)
+
+def import_compiler_source_repos():
+    for name, artifact in COMPILER_SOURCES_ARTIFACTS.items():
+        scala_maven_import_external(
+            name = name,
+            artifact = artifact,
+            licenses = ["notice"],
+            server_urls = default_maven_server_urls(),
+        )
+
+def _compiler_source_repos_impl(_ctx):
+    import_compiler_source_repos()
+
+compiler_source_repos = module_extension(
+    implementation = _compiler_source_repos_impl,
+)

dt_patches/compiler_sources/WORKSPACE

@@ -2,14 +2,6 @@
 
 module(name = "scala3_example")
 
-source_repos = use_extension("//:extensions.bzl", "compiler_source_repos")
-use_repo(
-    source_repos,
-    "scala_compiler",
-    "scala_library",
-    "scala_reflect",
-)
-
 bazel_dep(name = "rules_scala", repo_name = "io_bazel_rules_scala")
 local_path_override(
     module_name = "rules_scala",
@@ -25,6 +17,32 @@ scala_config.settings(
 )
 use_repo(scala_config, "io_bazel_rules_scala_config")
 
+bazel_dep(name = "compiler_sources")
+local_path_override(
+    module_name = "compiler_sources",
+    path = "../compiler_sources",
+)
+
+source_repos = use_extension(
+    "@compiler_sources//:extensions.bzl",
+    "compiler_source_repos",
+)
+use_repo(
+    source_repos,
+    # Configured for the current Scala version
+    "scala_compiler",
+    "scala_library",
+    # Scala 2 specific
+    "scala_reflect",
+    # Scala 3 specific
+    "scala3_interfaces",
+    "tasty_core",
+    # Hardcoded versions
+    "sbt_compiler_interface",
+    "scala2_library",
+    "scala_asm",
+)
+
 scala_deps = use_extension(
     "@io_bazel_rules_scala//scala/extensions:deps.bzl",
     "scala_deps",