Skip to content

Commit 12fe271

Browse files
mateuszkuta256mateuszkuta256
committed
fixes
1 parent 6cd3c47 commit 12fe271

File tree

9 files changed

+51
-46
lines changed

9 files changed

+51
-46
lines changed

‎examples/testing/multi_frameworks_toolchain/BUILD‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
load("@io_bazel_rules_scala//scala:scala.bzl", "setup_scala_testing_toolchain")
2+
load(":deps.bzl", "scalatest_classpath")
23

34
setup_scala_testing_toolchain(
45
name = "testing_toolchain",
56
junit_classpath = [
67
"@io_bazel_rules_scala_junit_junit",
78
"@io_bazel_rules_scala_org_hamcrest_hamcrest_core",
89
],
9-
scalatest_classpath = [
10-
"@io_bazel_rules_scala_scalactic",
11-
"@io_bazel_rules_scala_scalatest",
12-
"@io_bazel_rules_scala_scalatest_compatible",
13-
"@io_bazel_rules_scala_scalatest_core",
14-
"@io_bazel_rules_scala_scalatest_featurespec",
15-
"@io_bazel_rules_scala_scalatest_flatspec",
16-
"@io_bazel_rules_scala_scalatest_freespec",
17-
"@io_bazel_rules_scala_scalatest_funspec",
18-
"@io_bazel_rules_scala_scalatest_funsuite",
19-
"@io_bazel_rules_scala_scalatest_matchers_core",
20-
"@io_bazel_rules_scala_scalatest_mustmatchers",
21-
"@io_bazel_rules_scala_scalatest_shouldmatchers",
22-
],
10+
scalatest_classpath = scalatest_classpath(),
2311
specs2_classpath = [
2412
"@io_bazel_rules_scala_org_specs2_specs2_common",
2513
"@io_bazel_rules_scala_org_specs2_specs2_core",

‎examples/testing/multi_frameworks_toolchain/deps.bzl‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
2+
load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
3+
4+
_SCALATEST_CLASSPATH = [
5+
"@io_bazel_rules_scala_scalactic",
6+
"@io_bazel_rules_scala_scalatest",
7+
"@io_bazel_rules_scala_scalatest_compatible",
8+
"@io_bazel_rules_scala_scalatest_core",
9+
"@io_bazel_rules_scala_scalatest_featurespec",
10+
"@io_bazel_rules_scala_scalatest_flatspec",
11+
"@io_bazel_rules_scala_scalatest_freespec",
12+
"@io_bazel_rules_scala_scalatest_funspec",
13+
"@io_bazel_rules_scala_scalatest_funsuite",
14+
"@io_bazel_rules_scala_scalatest_matchers_core",
15+
"@io_bazel_rules_scala_scalatest_mustmatchers",
16+
"@io_bazel_rules_scala_scalatest_shouldmatchers",
17+
]
18+
19+
def scalatest_classpath():
20+
return [dep + version_suffix(SCALA_VERSION) for dep in _SCALATEST_CLASSPATH]

‎scala/scalafmt/toolchain/setup_scalafmt_toolchain.bzl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("//scala/scalafmt/toolchain:toolchain.bzl", "scalafmt_toolchain")
22
load("//scala:providers.bzl", "declare_deps_provider")
3-
load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "sanitize_version")
3+
load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "sanitize_version", "version_suffix")
44
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
55

66
_SCALAFMT_DEPS = [
@@ -45,5 +45,4 @@ def setup_scalafmt_toolchains():
4545
)
4646

4747
def _deps(scala_version):
48-
sanitized_scala_version = sanitize_version(scala_version)
49-
return [dep + "_" + sanitized_scala_version for dep in _SCALAFMT_DEPS]
48+
return [dep + version_suffix(scala_version) for dep in _SCALAFMT_DEPS]

‎testing/scalatest.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
load("//scalatest:scalatest.bzl", _repositories = "scalatest_repositories")
22
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
3-
load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "sanitize_version")
3+
load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
44

55
def scalatest_repositories():
66
_repositories()
77

88
def scalatest_toolchain():
99
for scala_version in SCALA_VERSIONS:
10-
native.register_toolchains("@io_bazel_rules_scala//testing:scalatest_toolchain_" + sanitize_version(scala_version))
10+
native.register_toolchains("@io_bazel_rules_scala//testing:scalatest_toolchain" + version_suffix(scala_version))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
1111
deps = ["//scala/private/toolchain_deps:scala_compile_classpath"],
1212
)
1313
for version in SCALA_VERSIONS
14+
if version.startswith("2")
1415
]

‎third_party/dependency_analyzer/src/test/analyzer_test_scala_2.bzl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def analyzer_tests_scala_2(version_suffix):
1818
"//src/java/io/bazel/rulesscala/io_utils",
1919
"//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
2020
"//third_party/dependency_analyzer/src/main:scala_version" + version_suffix,
21-
"//third_party/utils/src/test:test_util" + version_suffix,
21+
"//third_party/utils/src/test:test_util",
2222
"@io_bazel_rules_scala_scala_compiler" + version_suffix,
2323
"@io_bazel_rules_scala_scala_library" + version_suffix,
2424
"@io_bazel_rules_scala_scala_reflect" + version_suffix,
@@ -49,7 +49,7 @@ def analyzer_tests_scala_2(version_suffix):
4949
deps = [
5050
"//src/java/io/bazel/rulesscala/io_utils",
5151
"//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
52-
"//third_party/utils/src/test:test_util" + version_suffix,
52+
"//third_party/utils/src/test:test_util",
5353
"@io_bazel_rules_scala_scala_compiler" + version_suffix,
5454
"@io_bazel_rules_scala_scala_library" + version_suffix,
5555
"@io_bazel_rules_scala_scala_reflect" + version_suffix,
@@ -69,7 +69,7 @@ def analyzer_tests_scala_2(version_suffix):
6969
unused_dependency_checker_mode = "off",
7070
deps = [
7171
"//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
72-
"//third_party/utils/src/test:test_util" + version_suffix,
72+
"//third_party/utils/src/test:test_util",
7373
"@com_google_guava_guava_21_0_with_file//jar",
7474
"@io_bazel_rules_scala_scala_compiler" + version_suffix,
7575
"@io_bazel_rules_scala_scala_library" + version_suffix,
@@ -90,7 +90,7 @@ def analyzer_tests_scala_2(version_suffix):
9090
unused_dependency_checker_mode = "off",
9191
deps = [
9292
"//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
93-
"//third_party/utils/src/test:test_util" + version_suffix,
93+
"//third_party/utils/src/test:test_util",
9494
"@io_bazel_rules_scala_scala_compiler" + version_suffix,
9595
"@io_bazel_rules_scala_scala_library" + version_suffix,
9696
"@io_bazel_rules_scala_scala_reflect" + version_suffix,

‎third_party/dependency_analyzer/src/test/analyzer_test_scala_3.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def analyzer_tests_scala_3(version_suffix):
2020
deps = [
2121
"//scala/private/toolchain_deps:scala_compile_classpath",
2222
"//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix,
23-
"//third_party/utils/src/test:test_util" + version_suffix,
23+
"//third_party/utils/src/test:test_util",
2424
"@io_bazel_rules_scala_scala_library" + version_suffix,
2525
"@io_bazel_rules_scala_scala_library_2" + version_suffix,
2626
],

‎third_party/repositories/repositories.bzl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ load(
3737
_scala_maven_import_external = "scala_maven_import_external",
3838
)
3939
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_MAJOR_VERSION", "SCALA_VERSION")
40-
load("//scala:scala_cross_version.bzl", "extract_major_version", "sanitize_version")
40+
load("//scala:scala_cross_version.bzl", "extract_major_version", "version_suffix")
4141

4242
artifacts_by_major_scala_version = {
4343
"2.11": _artifacts_2_11,
@@ -107,15 +107,15 @@ def toolchain_repositories(
107107

108108
default_artifacts = artifacts_by_major_scala_version[major_scala_version]
109109
artifacts = dict(default_artifacts.items() + overriden_artifacts.items())
110-
version_suffix = "_" + sanitize_version(scala_version)
110+
suffix = version_suffix(scala_version)
111111
for id in for_artifact_ids:
112112
_scala_maven_import_external(
113-
name = id + version_suffix,
113+
name = id + suffix,
114114
artifact = artifacts[id]["artifact"],
115115
artifact_sha256 = artifacts[id]["sha256"],
116116
licenses = ["notice"],
117117
server_urls = maven_servers,
118-
deps = [dep + version_suffix for dep in artifacts[id].get("deps", [])],
118+
deps = [dep + suffix for dep in artifacts[id].get("deps", [])],
119119
runtime_deps = artifacts[id].get("runtime_deps", []),
120120
testonly_ = artifacts[id].get("testonly", False),
121121
fetch_sources = fetch_sources,

‎third_party/utils/src/test/BUILD‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
load("//scala:scala.bzl", "scala_library")
2-
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
2+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
33
load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
44

55
licenses(["notice"]) # 3-clause BSD
66

7-
[
8-
scala_library(
9-
name = "test_util" + version_suffix(scala_version),
10-
srcs = ([
11-
"io/bazel/rulesscala/utils/JavaCompileUtil.scala",
12-
"io/bazel/rulesscala/utils/TestUtil.scala",
13-
] if scala_version.startswith("2") else [
14-
"io/bazel/rulesscala/utils/Scala3CompilerUtils.scala",
15-
]),
16-
visibility = ["//visibility:public"],
17-
deps = [
18-
"//scala/private/toolchain_deps:scala_compile_classpath",
19-
"//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix(scala_version),
20-
],
21-
)
22-
for scala_version in SCALA_VERSIONS
23-
]
7+
scala_library(
8+
name = "test_util",
9+
srcs = ([
10+
"io/bazel/rulesscala/utils/JavaCompileUtil.scala",
11+
"io/bazel/rulesscala/utils/TestUtil.scala",
12+
] if SCALA_VERSION.startswith("2") else [
13+
"io/bazel/rulesscala/utils/Scala3CompilerUtils.scala",
14+
]),
15+
visibility = ["//visibility:public"],
16+
deps = [
17+
"//scala/private/toolchain_deps:scala_compile_classpath",
18+
"//third_party/dependency_analyzer/src/main:dependency_analyzer" + version_suffix(SCALA_VERSION),
19+
],
20+
)

0 commit comments

Comments
 (0)