Skip to content

Commit 6b19a31

Browse files
aszadymateuszkuta256
aszady
and
mateuszkuta256
authored
Use version-aware naming for artifact repositories (#1573)
* Add backward-compatible repo alias for artifacts * Use version-aware naming for artifact repositories Co-authored-by: mkuta <[email protected]> * Migrate rules internally away from alias repos --------- Co-authored-by: mkuta <[email protected]>
1 parent 98689d0 commit 6b19a31

File tree

12 files changed

+81
-34
lines changed

12 files changed

+81
-34
lines changed

‎examples/testing/multi_frameworks_toolchain/BUILD

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
load("@io_bazel_rules_scala//scala:scala.bzl", "setup_scala_testing_toolchain")
2+
load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "version_suffix")
3+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
24

35
setup_scala_testing_toolchain(
46
name = "testing_toolchain",
57
junit_classpath = [
68
"@io_bazel_rules_scala_junit_junit",
79
"@io_bazel_rules_scala_org_hamcrest_hamcrest_core",
810
],
9-
scalatest_classpath = [
11+
scalatest_classpath = [dep + version_suffix(SCALA_VERSION) for dep in [
1012
"@io_bazel_rules_scala_scalactic",
1113
"@io_bazel_rules_scala_scalatest",
1214
"@io_bazel_rules_scala_scalatest_compatible",
@@ -19,7 +21,7 @@ setup_scala_testing_toolchain(
1921
"@io_bazel_rules_scala_scalatest_matchers_core",
2022
"@io_bazel_rules_scala_scalatest_mustmatchers",
2123
"@io_bazel_rules_scala_scalatest_shouldmatchers",
22-
],
24+
]],
2325
specs2_classpath = [
2426
"@io_bazel_rules_scala_org_specs2_specs2_common",
2527
"@io_bazel_rules_scala_org_specs2_specs2_core",

‎scala/private/macros/scala_repositories.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ load("//third_party/repositories:repositories.bzl", "repositories")
1010
load(
1111
"@io_bazel_rules_scala_config//:config.bzl",
1212
"SCALA_MAJOR_VERSION",
13+
"SCALA_VERSION",
1314
"SCALA_VERSIONS",
1415
)
1516

@@ -151,6 +152,7 @@ def rules_scala_toolchain_deps_repositories(
151152
fetch_sources = False,
152153
validate_scala_version = True):
153154
repositories(
155+
scala_version = SCALA_VERSION,
154156
for_artifact_ids = ARTIFACT_IDS,
155157
maven_servers = maven_servers,
156158
fetch_sources = fetch_sources,

‎scala/private/macros/setup_scala_toolchain.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,5 @@ _DEFAULT_DEPS = {
157157

158158
def default_deps(deps_id, scala_version):
159159
versions = _DEFAULT_DEPS[deps_id]
160-
return versions.get("any", []) + versions.get(scala_version[0], [])
160+
deps = versions.get("any", []) + versions.get(scala_version[0], [])
161+
return [dep + version_suffix(scala_version) for dep in deps]

‎scala/scalafmt/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ declare_deps_provider(
4040
name = "scalafmt_classpath_provider",
4141
deps_id = "scalafmt_classpath",
4242
visibility = ["//visibility:public"],
43-
deps = [
43+
deps = [dep + version_suffix(SCALA_VERSION) for dep in [
4444
"@com_geirsson_metaconfig_core",
4545
"@org_scalameta_common",
4646
"@org_scalameta_parsers",
4747
"@org_scalameta_scalafmt_core",
4848
"@org_scalameta_scalameta",
4949
"@org_scalameta_trees",
50-
],
50+
]],
5151
)
5252

5353
scalafmt_toolchain(

‎scala/scalafmt/scalafmt_repositories.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load(
33
_default_maven_server_urls = "default_maven_server_urls",
44
)
55
load("//third_party/repositories:repositories.bzl", "repositories")
6-
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_MAJOR_VERSION")
6+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_MAJOR_VERSION", "SCALA_VERSION")
77

88
def scalafmt_default_config(path = ".scalafmt.conf"):
99
build = []
@@ -46,6 +46,7 @@ def scalafmt_repositories(
4646
artifact_ids.append("io_bazel_rules_scala_scala_parallel_collections")
4747

4848
repositories(
49+
scala_version = SCALA_VERSION,
4950
for_artifact_ids = artifact_ids,
5051
maven_servers = maven_servers,
5152
fetch_sources = True,

‎scalatest/scalatest.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ load(
33
_default_maven_server_urls = "default_maven_server_urls",
44
)
55
load("//third_party/repositories:repositories.bzl", "repositories")
6+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
67

78
def scalatest_repositories(
89
maven_servers = _default_maven_server_urls(),
910
fetch_sources = True):
1011
repositories(
12+
scala_version = SCALA_VERSION,
1113
for_artifact_ids = [
1214
"io_bazel_rules_scala_scalatest",
1315
"io_bazel_rules_scala_scalatest_compatible",

‎test/plugins/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ scala_library(
2121
":gen-scalac-plugin.xml",
2222
],
2323
deps = [
24-
"@io_bazel_rules_scala_scala_compiler",
24+
"//scala/private/toolchain_deps:scala_compile_classpath",
2525
],
2626
)
2727

‎testing/BUILD

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
load("@io_bazel_rules_scala//scala:scala.bzl", "setup_scala_testing_toolchain")
2+
load("//scala:scala_cross_version.bzl", "version_suffix")
3+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
24

35
_SPECS2_DEPS = [
46
"@io_bazel_rules_scala_org_specs2_specs2_common",
@@ -34,15 +36,15 @@ _SCALATEST_DEPS = [
3436
setup_scala_testing_toolchain(
3537
name = "testing_toolchain",
3638
junit_classpath = _JUNIT_DEPS,
37-
scalatest_classpath = _SCALATEST_DEPS,
39+
scalatest_classpath = [dep + version_suffix(SCALA_VERSION) for dep in _SCALATEST_DEPS],
3840
specs2_classpath = _SPECS2_DEPS,
3941
specs2_junit_classpath = _SPECS2_JUNIT_DEPS,
4042
visibility = ["//visibility:public"],
4143
)
4244

4345
setup_scala_testing_toolchain(
4446
name = "scalatest_toolchain",
45-
scalatest_classpath = _SCALATEST_DEPS,
47+
scalatest_classpath = [dep + version_suffix(SCALA_VERSION) for dep in _SCALATEST_DEPS],
4648
visibility = ["//visibility:public"],
4749
)
4850

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
load(":analyzer_test_scala_2.bzl", "analyzer_tests_scala_2")
22
load(":analyzer_test_scala_3.bzl", "analyzer_tests_scala_3")
3-
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_MAJOR_VERSION")
3+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_MAJOR_VERSION", "SCALA_VERSION")
44

55
def tests():
66
if SCALA_MAJOR_VERSION.startswith("2"):
7-
analyzer_tests_scala_2()
7+
analyzer_tests_scala_2(SCALA_VERSION)
88
else:
9-
analyzer_tests_scala_3()
9+
analyzer_tests_scala_3(SCALA_VERSION)

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

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
load("//scala:scala.bzl", "scala_test")
2+
load("//scala:scala_cross_version.bzl", "version_suffix")
23

3-
def analyzer_tests_scala_2():
4+
def analyzer_tests_scala_2(scala_version):
5+
suffix = version_suffix(scala_version)
46
common_jvm_flags = [
57
"-Dplugin.jar.location=$(execpath //third_party/dependency_analyzer/src/main:dependency_analyzer)",
6-
"-Dscala.library.location=$(rootpath @io_bazel_rules_scala_scala_library)",
7-
"-Dscala.reflect.location=$(rootpath @io_bazel_rules_scala_scala_reflect)",
8+
"-Dscala.library.location=$(rootpath @io_bazel_rules_scala_scala_library%s)" % suffix,
9+
"-Dscala.reflect.location=$(rootpath @io_bazel_rules_scala_scala_reflect%s)" % suffix,
810
]
911

1012
scala_test(
@@ -19,9 +21,9 @@ def analyzer_tests_scala_2():
1921
"//third_party/dependency_analyzer/src/main:dependency_analyzer",
2022
"//third_party/dependency_analyzer/src/main:scala_version",
2123
"//third_party/utils/src/test:test_util",
22-
"@io_bazel_rules_scala_scala_compiler",
23-
"@io_bazel_rules_scala_scala_library",
24-
"@io_bazel_rules_scala_scala_reflect",
24+
"@io_bazel_rules_scala_scala_compiler" + suffix,
25+
"@io_bazel_rules_scala_scala_library" + suffix,
26+
"@io_bazel_rules_scala_scala_reflect" + suffix,
2527
],
2628
)
2729

@@ -33,8 +35,8 @@ def analyzer_tests_scala_2():
3335
],
3436
deps = [
3537
"//third_party/dependency_analyzer/src/main:scala_version",
36-
"@io_bazel_rules_scala_scala_library",
37-
"@io_bazel_rules_scala_scala_reflect",
38+
"@io_bazel_rules_scala_scala_library" + suffix,
39+
"@io_bazel_rules_scala_scala_reflect" + suffix,
3840
],
3941
)
4042

@@ -50,9 +52,9 @@ def analyzer_tests_scala_2():
5052
"//src/java/io/bazel/rulesscala/io_utils",
5153
"//third_party/dependency_analyzer/src/main:dependency_analyzer",
5254
"//third_party/utils/src/test:test_util",
53-
"@io_bazel_rules_scala_scala_compiler",
54-
"@io_bazel_rules_scala_scala_library",
55-
"@io_bazel_rules_scala_scala_reflect",
55+
"@io_bazel_rules_scala_scala_compiler" + suffix,
56+
"@io_bazel_rules_scala_scala_library" + suffix,
57+
"@io_bazel_rules_scala_scala_reflect" + suffix,
5658
],
5759
)
5860

@@ -71,9 +73,9 @@ def analyzer_tests_scala_2():
7173
"//third_party/dependency_analyzer/src/main:dependency_analyzer",
7274
"//third_party/utils/src/test:test_util",
7375
"@com_google_guava_guava_21_0_with_file//jar",
74-
"@io_bazel_rules_scala_scala_compiler",
75-
"@io_bazel_rules_scala_scala_library",
76-
"@io_bazel_rules_scala_scala_reflect",
76+
"@io_bazel_rules_scala_scala_compiler" + suffix,
77+
"@io_bazel_rules_scala_scala_library" + suffix,
78+
"@io_bazel_rules_scala_scala_reflect" + suffix,
7779
"@org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file",
7880
],
7981
)
@@ -91,9 +93,9 @@ def analyzer_tests_scala_2():
9193
deps = [
9294
"//third_party/dependency_analyzer/src/main:dependency_analyzer",
9395
"//third_party/utils/src/test:test_util",
94-
"@io_bazel_rules_scala_scala_compiler",
95-
"@io_bazel_rules_scala_scala_library",
96-
"@io_bazel_rules_scala_scala_reflect",
96+
"@io_bazel_rules_scala_scala_compiler" + suffix,
97+
"@io_bazel_rules_scala_scala_library" + suffix,
98+
"@io_bazel_rules_scala_scala_reflect" + suffix,
9799
"@org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file",
98100
],
99101
)

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
2+
load("//scala:scala_cross_version.bzl", "version_suffix")
23

3-
def analyzer_tests_scala_3():
4+
def analyzer_tests_scala_3(scala_version):
5+
suffix = version_suffix(scala_version)
46
common_jvm_flags = [
57
"-Dplugin.jar.location=$(execpath //third_party/dependency_analyzer/src/main:dependency_analyzer)",
6-
"-Dscala.library.location=$(rootpath @io_bazel_rules_scala_scala_library)",
8+
"-Dscala.library.location=$(rootpath @io_bazel_rules_scala_scala_library%s)" % suffix,
79
# Scala 2 standard library is required for compilation.
810
# Without it compilation fails with error:
911
# class dotty.tools.dotc.core.Symbols$NoSymbol$ cannot be cast to class dotty.tools.dotc.core.Symbols$ClassSymbol
10-
"-Dscala.library2.location=$(rootpath @io_bazel_rules_scala_scala_library_2)",
12+
"-Dscala.library2.location=$(rootpath @io_bazel_rules_scala_scala_library_2%s)" % suffix,
1113
]
1214

1315
scala_test(
@@ -21,7 +23,7 @@ def analyzer_tests_scala_3():
2123
"//scala/private/toolchain_deps:scala_compile_classpath",
2224
"//third_party/dependency_analyzer/src/main:dependency_analyzer",
2325
"//third_party/utils/src/test:test_util",
24-
"@io_bazel_rules_scala_scala_library",
25-
"@io_bazel_rules_scala_scala_library_2",
26+
"@io_bazel_rules_scala_scala_library" + suffix,
27+
"@io_bazel_rules_scala_scala_library_2" + suffix,
2628
],
2729
)

‎third_party/repositories/repositories.bzl

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,36 @@ def repositories(
9999
testonly_ = artifacts[id].get("testonly", False),
100100
fetch_sources = fetch_sources,
101101
)
102+
103+
# For backward compatibility: non-suffixed repo pointing to the suffixed one,
104+
# See: https://github.com/bazelbuild/rules_scala/pull/1573
105+
# Hopefully we can deprecate and remove it one day.
106+
if suffix and scala_version == SCALA_VERSION:
107+
_alias_repository(name = id, target = id + suffix)
108+
109+
def _alias_repository_impl(rctx):
110+
""" Builds a repository containing just two aliases to the Scala Maven artifacts in the `target` repository. """
111+
112+
format_kwargs = {
113+
"name": rctx.name,
114+
"target": rctx.attr.target,
115+
}
116+
rctx.file("BUILD", """alias(
117+
name = "{name}",
118+
actual = "@{target}",
119+
visibility = ["//visibility:public"],
120+
)
121+
""".format(**format_kwargs))
122+
rctx.file("jar/BUILD", """alias(
123+
name = "jar",
124+
actual = "@{target}//jar",
125+
visibility = ["//visibility:public"],
126+
)
127+
""".format(**format_kwargs))
128+
129+
_alias_repository = repository_rule(
130+
implementation = _alias_repository_impl,
131+
attrs = {
132+
"target": attr.string(mandatory = True),
133+
},
134+
)

0 commit comments

Comments
 (0)