WIP: Bzlmod part the one hundred twenty-first

Resolves the duplicate repo instantiation errors from the previous merge
commit. They all had to do with repos that twitter_scrooge and scalafmt
have in commmon with scala_proto. Given that, passing the `scala_proto`
boolean parameter of `scala_toolchains` into the `twitter_scrooge` and
`scalafmt_repositories` functions seemed the easiest workaround for now.

I picked up the `**kwargs` + `kwargs.pop()` pattern up from:

- bazel-contrib/rules_python#2289

It seems to be a pattern for passing through hidden, purely internal
parameters, not to be relied upon by any external users.

Author: mbland

MODULE.bazel

@@ -88,8 +88,8 @@ dev_deps.toolchains(
 
 use_repo(
     dev_deps,
-    "scala_proto_rules_protoc_bridge",
-    "scala_proto_rules_scalapb_plugin",
+    "scala_proto_rules_scalapb_compilerplugin",
+    "scala_proto_rules_scalapb_protoc_bridge",
     "scalafmt_default",
 )
 

MODULE.bazel.lock

@@ -27,14 +27,15 @@ UNVERSIONED_ARTIFACTS = {
     "sbt_compiler_interface": "org.scala-sbt:compiler-interface:1.9.6",
 }
 
+IS_SCALA_2 = SCALA_VERSION.startswith("2.")
+
 def import_compiler_source_repos():
     versioned_artifact_templates = (
-        SCALA_2_ARTIFACTS
-        if SCALA_VERSION.startswith("2.")
-        else SCALA_3_ARTIFACTS
-    }
+        SCALA_2_ARTIFACTS if IS_SCALA_2 else SCALA_3_ARTIFACTS
+    )
     versioned_artifacts = {
-        k: v % SCALA_VERSION for k, v in versioned_artifact_templates
+        k: v % SCALA_VERSION
+        for k, v in versioned_artifact_templates
     }
 
     for name, artifact in versioned_artifacts | UNVERSIONED_ARTIFACTS:

dt_patches/test_dt_patches/extensions.bzl

@@ -28,6 +28,8 @@ UNVERSIONED_ARTIFACTS = {
     "sbt_compiler_interface": "org.scala-sbt:compiler-interface:1.9.6",
 }
 
+IS_SCALA_2 = SCALA_VERSION.startswith("2.")
+
 def import_compiler_source_repos():
     http_jar(
         name = "scala_compiler_srcjar",
@@ -42,12 +44,11 @@ def import_compiler_source_repos():
     )
 
     versioned_artifact_templates = (
-        SCALA_2_ARTIFACTS
-        if SCALA_VERSION.startswith("2.")
-        else SCALA_3_ARTIFACTS
-    }
+        SCALA_2_ARTIFACTS if IS_SCALA_2 else SCALA_3_ARTIFACTS
+    )
     versioned_artifacts = {
-        k: v % SCALA_VERSION for k, v in versioned_artifact_templates
+        k: v % SCALA_VERSION
+        for k, v in versioned_artifact_templates
     }
 
     for name, artifact in versioned_artifacts | UNVERSIONED_ARTIFACTS:

dt_patches/test_dt_patches_user_srcjar/extensions.bzl

@@ -141,6 +141,7 @@ def scala_toolchains(
             maven_servers = maven_servers,
             overriden_artifacts = overridden_artifacts,
             bzlmod_enabled = True,
+            _scala_proto_instantiated = scala_proto,
         )
     if jmh:
         jmh_repositories(
@@ -154,6 +155,7 @@ def scala_toolchains(
             maven_servers = maven_servers,
             overriden_artifacts = overridden_artifacts,
             bzlmod_enabled = True,
+            _scala_proto_instantiated = scala_proto,
         )
 
     scala_toolchains_repo(

scala/private/macros/toolchains.bzl

@@ -32,19 +32,22 @@ def scalafmt_default_config(path = ".scalafmt.conf", **kwargs):
 _SCALAFMT_DEPS = [
     "com_geirsson_metaconfig_core",
     "com_geirsson_metaconfig_typesafe_config",
-    "com_google_protobuf_protobuf_java",
     "com_lihaoyi_fansi",
-    "com_lihaoyi_fastparse",
-    "com_lihaoyi_sourcecode",
     "com_typesafe_config",
-    "org_scala_lang_modules_scala_collection_compat",
     "org_scala_lang_scalap",
     "org_scalameta_common",
     "org_scalameta_parsers",
     "org_scalameta_scalafmt_core",
     "org_scalameta_scalameta",
     "org_scalameta_trees",
     "org_typelevel_paiges_core",
+]
+
+_SCALAFMT_PROTO_DEPS = [
+    "com_google_protobuf_protobuf_java",
+    "com_lihaoyi_fastparse",
+    "com_lihaoyi_sourcecode",
+    "org_scala_lang_modules_scala_collection_compat",
     "scala_proto_rules_scalapb_lenses",
     "scala_proto_rules_scalapb_runtime",
 ]
@@ -62,11 +65,13 @@ _SCALAFMT_DEPS_2_12 = [
     "org_scalameta_scalafmt_sysops",
 ]
 
-def scalafmt_artifact_ids(scala_version):
+def scalafmt_artifact_ids(scala_version, scala_proto_instantiated = False):
     major_version = extract_major_version(scala_version)
 
+    proto_deps = [] if scala_proto_instantiated else _SCALAFMT_PROTO_DEPS
+
     if major_version == "2.11":
-        return _SCALAFMT_DEPS + _SCALAFMT_DEPS_2_11
+        return _SCALAFMT_DEPS + _SCALAFMT_DEPS_2_11 + proto_deps
 
     extra_deps = []
 
@@ -75,16 +80,21 @@ def scalafmt_artifact_ids(scala_version):
     else:
         extra_deps.append("io_bazel_rules_scala_scala_parallel_collections")
 
-    return _SCALAFMT_DEPS + _SCALAFMT_DEPS_2_12 + extra_deps
+    return _SCALAFMT_DEPS + _SCALAFMT_DEPS_2_12 + extra_deps + proto_deps
 
 def scalafmt_repositories(
         maven_servers = _default_maven_server_urls(),
         overriden_artifacts = {},
-        bzlmod_enabled = False):
+        bzlmod_enabled = False,
+        **kwargs):
+    scala_proto_instantiated = kwargs.pop("_scala_proto_instantiated", False)
     for scala_version in SCALA_VERSIONS:
         repositories(
             scala_version = scala_version,
-            for_artifact_ids = scalafmt_artifact_ids(scala_version),
+            for_artifact_ids = scalafmt_artifact_ids(
+                scala_version,
+                scala_proto_instantiated,
+            ),
             maven_servers = maven_servers,
             overriden_artifacts = overriden_artifacts,
         )

scala/scalafmt/scalafmt_repositories.bzl

@@ -1,15 +1,4 @@
-load("//scala:providers.bzl", "declare_deps_provider")
-load(
-    "//scala_proto/default:default_deps.bzl",
-    "DEFAULT_SCALAPB_COMPILE_DEPS",
-    "DEFAULT_SCALAPB_GRPC_DEPS",
-    "DEFAULT_SCALAPB_WORKER_DEPS",
-)
 load("//scala_proto/private:toolchain_deps.bzl", "export_scalapb_toolchain_deps")
-load(
-    "//scala_proto/private:toolchain_deps.bzl",
-    "export_scalapb_toolchain_deps",
-)
 
 toolchain_type(
     name = "toolchain_type",

scala_proto/BUILD

@@ -52,7 +52,8 @@ def twitter_scrooge(
         scrooge_generator = None,
         util_core = None,
         util_logging = None,
-        bzlmod_enabled = False):
+        bzlmod_enabled = False,
+        **kwargs):
     _declare_and_bind(
         libthrift,
         "libthrift",
@@ -93,14 +94,18 @@ def twitter_scrooge(
         maven_servers,
     )
 
+    artifact_ids = [
+        "io_bazel_rules_scala_mustache",  # Mustache is needed to generate java from thrift, and is passed further down.
+        "io_bazel_rules_scala_javax_annotation_api",
+        "io_bazel_rules_scala_scopt",
+    ]
+
+    if not kwargs.pop("_scala_proto_instantiated", False):
+        artifact_ids.append("io_bazel_rules_scala_guava")
+
     repositories(
         scala_version = SCALA_VERSION,
-        for_artifact_ids = [
-            "io_bazel_rules_scala_guava",
-            "io_bazel_rules_scala_mustache",  # Mustache is needed to generate java from thrift, and is passed further down.
-            "io_bazel_rules_scala_javax_annotation_api",
-            "io_bazel_rules_scala_scopt",
-        ],
+        for_artifact_ids = artifact_ids,
         maven_servers = maven_servers,
         fetch_sources = False,
         overriden_artifacts = overriden_artifacts,