fixes

bazelbuild · Mar 8, 2024 · f006730 · f006730
1 parent eefe794
commit f006730
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 46 deletions.
diff --git a/examples/testing/multi_frameworks_toolchain/BUILD b/examples/testing/multi_frameworks_toolchain/BUILD
@@ -1,25 +1,13 @@
 load("@io_bazel_rules_scala//scala:scala.bzl", "setup_scala_testing_toolchain")
+load(":deps.bzl", "scalatest_classpath")
 
 setup_scala_testing_toolchain(
     name = "testing_toolchain",
     junit_classpath = [
         "@io_bazel_rules_scala_junit_junit",
         "@io_bazel_rules_scala_org_hamcrest_hamcrest_core",
     ],
-    scalatest_classpath = [
-        "@io_bazel_rules_scala_scalactic",
-        "@io_bazel_rules_scala_scalatest",
-        "@io_bazel_rules_scala_scalatest_compatible",
-        "@io_bazel_rules_scala_scalatest_core",
-        "@io_bazel_rules_scala_scalatest_featurespec",
-        "@io_bazel_rules_scala_scalatest_flatspec",
-        "@io_bazel_rules_scala_scalatest_freespec",
-        "@io_bazel_rules_scala_scalatest_funspec",
-        "@io_bazel_rules_scala_scalatest_funsuite",
-        "@io_bazel_rules_scala_scalatest_matchers_core",
-        "@io_bazel_rules_scala_scalatest_mustmatchers",
-        "@io_bazel_rules_scala_scalatest_shouldmatchers",
-    ],
+    scalatest_classpath = scalatest_classpath(),
     specs2_classpath = [
         "@io_bazel_rules_scala_org_specs2_specs2_common",
         "@io_bazel_rules_scala_org_specs2_specs2_core",

diff --git a/examples/testing/multi_frameworks_toolchain/deps.bzl b/examples/testing/multi_frameworks_toolchain/deps.bzl
@@ -0,0 +1,20 @@
+load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
+load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
+
+_SCALATEST_CLASSPATH = [
+    "@io_bazel_rules_scala_scalactic",
+    "@io_bazel_rules_scala_scalatest",
+    "@io_bazel_rules_scala_scalatest_compatible",
+    "@io_bazel_rules_scala_scalatest_core",
+    "@io_bazel_rules_scala_scalatest_featurespec",
+    "@io_bazel_rules_scala_scalatest_flatspec",
+    "@io_bazel_rules_scala_scalatest_freespec",
+    "@io_bazel_rules_scala_scalatest_funspec",
+    "@io_bazel_rules_scala_scalatest_funsuite",
+    "@io_bazel_rules_scala_scalatest_matchers_core",
+    "@io_bazel_rules_scala_scalatest_mustmatchers",
+    "@io_bazel_rules_scala_scalatest_shouldmatchers",
+]
+
+def scalatest_classpath():
+    return [dep + version_suffix(SCALA_VERSION) for dep in _SCALATEST_CLASSPATH]
diff --git a/scala/scalafmt/toolchain/setup_scalafmt_toolchain.bzl b/scala/scalafmt/toolchain/setup_scalafmt_toolchain.bzl
@@ -1,6 +1,6 @@
 load("//scala/scalafmt/toolchain:toolchain.bzl", "scalafmt_toolchain")
 load("//scala:providers.bzl", "declare_deps_provider")
-load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "sanitize_version")
+load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "sanitize_version", "version_suffix")
 load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
 
 _SCALAFMT_DEPS = [
@@ -45,5 +45,4 @@ def setup_scalafmt_toolchains():
         )
 
 def _deps(scala_version):
-    sanitized_scala_version = sanitize_version(scala_version)
-    return [dep + "_" + sanitized_scala_version for dep in _SCALAFMT_DEPS]
+    return [dep + version_suffix(scala_version) for dep in _SCALAFMT_DEPS]
diff --git a/testing/scalatest.bzl b/testing/scalatest.bzl
@@ -1,10 +1,10 @@
 load("//scalatest:scalatest.bzl", _repositories = "scalatest_repositories")
 load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
-load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "sanitize_version")
+load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
 
 def scalatest_repositories():
     _repositories()
 
 def scalatest_toolchain():
     for scala_version in SCALA_VERSIONS:
-        native.register_toolchains("@io_bazel_rules_scala//testing:scalatest_toolchain_" + sanitize_version(scala_version))
+        native.register_toolchains("@io_bazel_rules_scala//testing:scalatest_toolchain" + version_suffix(scala_version))
diff --git a/..._party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/compiler/BUILD b/..._party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/compiler/BUILD
@@ -11,4 +11,5 @@ load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
         deps = ["//scala/private/toolchain_deps:scala_compile_classpath"],
     )
     for version in SCALA_VERSIONS
+    if version.startswith("2")
 ]
diff --git a/third_party/dependency_analyzer/src/test/analyzer_test_scala_2.bzl b/third_party/dependency_analyzer/src/test/analyzer_test_scala_2.bzl
@@ -18,7 +18,7 @@ def analyzer_tests_scala_2(version_suffix):
             "//src/java/io/bazel/rulesscala/io_utils",
             "//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
             "//third_party/dependency_analyzer/src/main:scala_version" + version_suffix,
-            "//third_party/utils/src/test:test_util" + version_suffix,
+            "//third_party/utils/src/test:test_util",
             "@io_bazel_rules_scala_scala_compiler" + version_suffix,
             "@io_bazel_rules_scala_scala_library" + version_suffix,
             "@io_bazel_rules_scala_scala_reflect" + version_suffix,
@@ -49,7 +49,7 @@ def analyzer_tests_scala_2(version_suffix):
         deps = [
             "//src/java/io/bazel/rulesscala/io_utils",
             "//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
-            "//third_party/utils/src/test:test_util" + version_suffix,
+            "//third_party/utils/src/test:test_util",
             "@io_bazel_rules_scala_scala_compiler" + version_suffix,
             "@io_bazel_rules_scala_scala_library" + version_suffix,
             "@io_bazel_rules_scala_scala_reflect" + version_suffix,
@@ -69,7 +69,7 @@ def analyzer_tests_scala_2(version_suffix):
         unused_dependency_checker_mode = "off",
         deps = [
             "//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
-            "//third_party/utils/src/test:test_util" + version_suffix,
+            "//third_party/utils/src/test:test_util",
             "@com_google_guava_guava_21_0_with_file//jar",
             "@io_bazel_rules_scala_scala_compiler" + version_suffix,
             "@io_bazel_rules_scala_scala_library" + version_suffix,
@@ -90,7 +90,7 @@ def analyzer_tests_scala_2(version_suffix):
         unused_dependency_checker_mode = "off",
         deps = [
             "//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
-            "//third_party/utils/src/test:test_util" + version_suffix,
+            "//third_party/utils/src/test:test_util",
             "@io_bazel_rules_scala_scala_compiler" + version_suffix,
             "@io_bazel_rules_scala_scala_library" + version_suffix,
             "@io_bazel_rules_scala_scala_reflect" + version_suffix,

diff --git a/third_party/dependency_analyzer/src/test/analyzer_test_scala_3.bzl b/third_party/dependency_analyzer/src/test/analyzer_test_scala_3.bzl
@@ -20,7 +20,7 @@ def analyzer_tests_scala_3(version_suffix):
         deps = [
             "//scala/private/toolchain_deps:scala_compile_classpath",
             "//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
-            "//third_party/utils/src/test:test_util" + version_suffix,
+            "//third_party/utils/src/test:test_util",
             "@io_bazel_rules_scala_scala_library" + version_suffix,
             "@io_bazel_rules_scala_scala_library_2" + version_suffix,
         ],

diff --git a/third_party/repositories/repositories.bzl b/third_party/repositories/repositories.bzl
@@ -37,7 +37,7 @@ load(
     _scala_maven_import_external = "scala_maven_import_external",
 )
 load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_MAJOR_VERSION", "SCALA_VERSION")
-load("//scala:scala_cross_version.bzl", "extract_major_version", "sanitize_version")
+load("//scala:scala_cross_version.bzl", "extract_major_version", "version_suffix")
 
 artifacts_by_major_scala_version = {
     "2.11": _artifacts_2_11,
@@ -107,15 +107,15 @@ def toolchain_repositories(
 
     default_artifacts = artifacts_by_major_scala_version[major_scala_version]
     artifacts = dict(default_artifacts.items() + overriden_artifacts.items())
-    version_suffix = "_" + sanitize_version(scala_version)
+    suffix = version_suffix(scala_version)
     for id in for_artifact_ids:
         _scala_maven_import_external(
-            name = id + version_suffix,
+            name = id + suffix,
             artifact = artifacts[id]["artifact"],
             artifact_sha256 = artifacts[id]["sha256"],
             licenses = ["notice"],
             server_urls = maven_servers,
-            deps = [dep + version_suffix for dep in artifacts[id].get("deps", [])],
+            deps = [dep + suffix for dep in artifacts[id].get("deps", [])],
             runtime_deps = artifacts[id].get("runtime_deps", []),
             testonly_ = artifacts[id].get("testonly", False),
             fetch_sources = fetch_sources,

diff --git a/third_party/utils/src/test/BUILD b/third_party/utils/src/test/BUILD
@@ -1,23 +1,20 @@
 load("//scala:scala.bzl", "scala_library")
-load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
+load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
 load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
 
 licenses(["notice"])  # 3-clause BSD
 
-[
-    scala_library(
-        name = "test_util" + version_suffix(scala_version),
-        srcs = ([
-            "io/bazel/rulesscala/utils/JavaCompileUtil.scala",
-            "io/bazel/rulesscala/utils/TestUtil.scala",
-        ] if scala_version.startswith("2") else [
-            "io/bazel/rulesscala/utils/Scala3CompilerUtils.scala",
-        ]),
-        visibility = ["//visibility:public"],
-        deps = [
-            "//scala/private/toolchain_deps:scala_compile_classpath",
-            "//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix(scala_version),
-        ],
-    )
-    for scala_version in SCALA_VERSIONS
-]
+scala_library(
+    name = "test_util",
+    srcs = ([
+        "io/bazel/rulesscala/utils/JavaCompileUtil.scala",
+        "io/bazel/rulesscala/utils/TestUtil.scala",
+    ] if SCALA_VERSION.startswith("2") else [
+        "io/bazel/rulesscala/utils/Scala3CompilerUtils.scala",
+    ]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//scala/private/toolchain_deps:scala_compile_classpath",
+        "//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix(SCALA_VERSION),
+    ],
+)