Merge branch 'bzlmod-scala-compiler-sources-repo' into bzlmod

Author: mbland

scala/private/macros/scala_repositories.bzl

@@ -25,28 +25,29 @@ dt_patched_compiler = repository_rule(
     implementation = _dt_patched_compiler_impl,
 )
 
-_PACKAGE_VISIBILITY_PUBLIC = """package(
-    default_visibility = [\"//visibility:public\"],
-)
-"""
-
-_COMPILER_SOURCE_ALIAS_FORMAT = """alias(
-    name   = "src{scala_version_suffix}",
-    actual = "@scala_compiler_source{scala_version_suffix}//:src",
+_COMPILER_SOURCE_ALIAS_TEMPLATE = """alias(
+    name = "src",
     visibility = ["//visibility:public"],
+    actual = select({{{compiler_sources}
+    }}),
 )
 """
 
+_COMPILER_SOURCES_ENTRY_TEMPLATE = """
+        "@io_bazel_rules_scala_config//:scala_version{scala_version_suffix}":
+            "@scala_compiler_source{scala_version_suffix}//:src","""
+
 def _compiler_sources_repo_impl(rctx):
-    build_content = [_PACKAGE_VISIBILITY_PUBLIC]
-    build_content.extend([
-        _COMPILER_SOURCE_ALIAS_FORMAT.format(
+    sources = [
+        _COMPILER_SOURCES_ENTRY_TEMPLATE.format(
             scala_version_suffix = version_suffix(scala_version),
         )
         for scala_version in SCALA_VERSIONS
-    ])
-
-    rctx.file("BUILD", content = "\n".join(build_content), executable = False)
+    ]
+    build_content = _COMPILER_SOURCE_ALIAS_TEMPLATE.format(
+        compiler_sources = "".join(sources),
+    )
+    rctx.file("BUILD", content = build_content, executable = False)
 
 compiler_sources_repo = repository_rule(
     implementation = _compiler_sources_repo_impl,
@@ -83,8 +84,7 @@ def dt_patched_compiler_setup(scala_version, scala_compiler_srcjar = None):
             )
 
     build_file_content = "\n".join([
-        _PACKAGE_VISIBILITY_PUBLIC,
-        "",
+        "package(default_visibility = [\"//visibility:public\"])",
         "filegroup(",
         "    name = \"src\",",
         "    srcs=[\"scala/tools/nsc/symtab/SymbolLoaders.scala\"],",

third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/compiler/BUILD

@@ -1,15 +1,8 @@
 load("//scala:scala.bzl", "scala_library_for_plugin_bootstrapping")
-load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
-load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
 
 scala_library_for_plugin_bootstrapping(
     name = "dep_reporting_compiler",
-    srcs = select({
-        "@io_bazel_rules_scala_config//:scala_version" + version_suffix(v): [
-            "@scala_compiler_sources//:src%s" % version_suffix(v),
-        ]
-        for v in SCALA_VERSIONS
-    }),
+    srcs = ["@scala_compiler_sources//:src"],
     scalac_jvm_flags = ["-Xmx128M"],  # fixme - workaround for a failing test
     visibility = ["//visibility:public"],
     deps = ["//scala/private/toolchain_deps:scala_compile_classpath"],