WIP: Bzlmod part the one hundred twenty-fourth

Major revamp to extract `*_artifact_ids()` macros, and using them to
pool artifact IDs in `scala_toolchains`. This way, `scala_toolchains`
calls `repositories` with all the IDs at once, avoiding the need to
orchestrate which other macros instantiate which repos. Specifically,
the `scala_proto_instantiated` parameter for `twitter_scrooge` and
`scalafmt_repositories` is now gone.

It can be refactored a bit to be even more compact, but the proof of
concept already works under Bzlmod and `WORKSPACE`.

Also:

- Removed `scala/artifacts.bzl` and `versioned_artifact_repos`, replaced
  by `scala/scala_cross_version.bzl` and `repositories`

- Removed some `bzlmod_enabled` parameters, and repurposed the
  `twitter_scrooge` one to `register_toolchains`

- Added a `twitter_scrooge` tag class to the `deps.bzl` module
  extension, though I'm not sure if it'll ever get used

- Removed `_declare_and_bind` from `twitter_scrooge.bzl`

Author: mbland

MODULE.bazel.lock

@@ -7,27 +7,27 @@ load(
 load("//third_party/repositories:repositories.bzl", "repositories")
 load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
 
+def jmh_artifact_ids():
+    return [
+        "io_bazel_rules_scala_org_openjdk_jmh_jmh_core",
+        "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm",
+        "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection",
+        "io_bazel_rules_scala_org_ow2_asm_asm",
+        "io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple",
+        "io_bazel_rules_scala_org_apache_commons_commons_math3",
+    ]
+
 def jmh_repositories(
         maven_servers = default_maven_server_urls(),
-        overriden_artifacts = {},
-        bzlmod_enabled = False):
+        overriden_artifacts = {}):
     repositories(
         scala_version = SCALA_VERSION,
-        for_artifact_ids = [
-            "io_bazel_rules_scala_org_openjdk_jmh_jmh_core",
-            "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm",
-            "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection",
-            "io_bazel_rules_scala_org_ow2_asm_asm",
-            "io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple",
-            "io_bazel_rules_scala_org_apache_commons_commons_math3",
-        ],
+        for_artifact_ids = jmh_artifact_ids(),
         fetch_sources = False,
         maven_servers = maven_servers,
         overriden_artifacts = overriden_artifacts,
     )
-
-    if not bzlmod_enabled:
-        native.register_toolchains("@io_bazel_rules_scala_toolchains//jmh:all")
+    native.register_toolchains("@io_bazel_rules_scala_toolchains//jmh:all")
 
 def _scala_generate_benchmark(ctx):
     # we use required providers to ensure JavaInfo exists

dt_patches/test_dt_patches/MODULE.bazel.lock

@@ -1,6 +1,7 @@
 load("//scala/private/toolchain_deps:toolchain_deps.bzl", "expose_toolchain_deps")
-load("//scala:artifacts.bzl", "versioned_artifact_repos")
 load("//scala:providers.bzl", "declare_deps_provider", _DepsInfo = "DepsInfo")
+load("//scala:scala_cross_version.bzl", "repositories")
+load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
 
 DEP_PROVIDERS = [
     "jmh_classpath",
@@ -59,7 +60,7 @@ def setup_jmh_toolchain(name):
         name = "jmh_core_provider",
         deps_id = "jmh_core",
         visibility = ["//visibility:public"],
-        deps = versioned_artifact_repos([
+        deps = repositories(SCALA_VERSION, [
             "@io_bazel_rules_scala_org_openjdk_jmh_jmh_core",
         ]),
     )
@@ -68,7 +69,7 @@ def setup_jmh_toolchain(name):
         name = "jmh_classpath_provider",
         deps_id = "jmh_classpath",
         visibility = ["//visibility:public"],
-        deps = versioned_artifact_repos([
+        deps = repositories(SCALA_VERSION, [
             "@io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple",
             "@io_bazel_rules_scala_org_apache_commons_commons_math3",
         ]),
@@ -80,7 +81,7 @@ def setup_jmh_toolchain(name):
         visibility = ["//visibility:public"],
         deps = [
             "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar",
-        ] + versioned_artifact_repos([
+        ] + repositories(SCALA_VERSION, [
             "@io_bazel_rules_scala_org_openjdk_jmh_jmh_core",
             "@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm",
             "@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection",
@@ -91,7 +92,7 @@ def setup_jmh_toolchain(name):
         name = "benchmark_generator_runtime_provider",
         deps_id = "benchmark_generator_runtime",
         visibility = ["//visibility:public"],
-        deps = versioned_artifact_repos([
+        deps = repositories(SCALA_VERSION, [
             "@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm",
         ]),
     )

dt_patches/test_dt_patches_user_srcjar/MODULE.bazel.lock

@@ -5,17 +5,20 @@ load(
 load("//third_party/repositories:repositories.bzl", "repositories")
 load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
 
+def junit_artifact_ids():
+    return [
+        "io_bazel_rules_scala_junit_junit",
+        "io_bazel_rules_scala_org_hamcrest_hamcrest_core",
+    ]
+
 def junit_repositories(
         maven_servers = _default_maven_server_urls(),
         scala_version = SCALA_VERSION,
         overriden_artifacts = {},
         fetch_sources = True):
     repositories(
         scala_version = scala_version,
-        for_artifact_ids = [
-            "io_bazel_rules_scala_junit_junit",
-            "io_bazel_rules_scala_org_hamcrest_hamcrest_core",
-        ],
+        for_artifact_ids = junit_artifact_ids(),
         fetch_sources = fetch_sources,
         maven_servers = maven_servers,
         overriden_artifacts = overriden_artifacts,

examples/crossbuild/MODULE.bazel.lock

@@ -75,6 +75,16 @@ _toolchains = tag_class(
     },
 )
 
+_twitter_scrooge = tag_class(
+    attrs = {
+        "libthrift": attr.string(),
+        "scrooge_core": attr.string(),
+        "scrooge_generator": attr.string(),
+        "util_core": attr.string(),
+        "util_logging": attr.string(),
+    },
+)
+
 def _get_settings(root_module):
     """Compiles the `settings` and `scalafmt` tag values from the root module.
 
@@ -135,12 +145,32 @@ def _get_toolchains(module_ctx):
         result["junit"] = True
     return result
 
+def _get_twitter_scrooge(module_ctx):
+    result = {}
+
+    for mod in module_ctx.modules:
+        if not mod.is_root:
+            continue
+
+        for tag in mod.tags.twitter_scrooge:
+            _add_if_not_empty(result, "libthrift", tag.libthrift)
+            _add_if_not_empty(result, "scrooge_core", tag.scrooge_core)
+            _add_if_not_empty(result, "scrooge_generator", tag.scrooge_generator)
+            _add_if_not_empty(result, "util_core", tag.util_core)
+            _add_if_not_empty(result, "util_logging", tag.util_logging)
+
+    return result
+
 def _scala_deps_impl(module_ctx):
     root_module = get_root_module(module_ctx)
     scala_toolchains(
         load_rules_scala_dependencies = False,  # MODULE.bazel loads these now.
         scala_compiler_srcjars = _get_scala_compiler_srcjars(root_module),
-        **(_get_settings(root_module) | _get_toolchains(module_ctx))
+        **(
+            _get_settings(root_module) |
+            _get_toolchains(module_ctx) |
+            _get_twitter_scrooge(module_ctx)
+        )
     )
 
 scala_deps = module_extension(
@@ -150,5 +180,6 @@ scala_deps = module_extension(
         "scalafmt": _scalafmt,
         "compiler_srcjar": _compiler_srcjar,
         "toolchains": _toolchains,
+        "twitter_scrooge": _twitter_scrooge,
     },
 )

examples/scala3/MODULE.bazel.lock

@@ -17,7 +17,7 @@ _BUILD_TOOLS_RELEASE = "5.1.0"
 
 _settings_defaults = {
     "maven_servers": default_maven_server_urls(),
-    "fetch_sources": True,
+    "fetch_sources": False,
 }
 
 _settings = tag_class(