Skip to content

Commit fa23848

Browse files
aszadymateuszkuta256
aszady
and
mateuszkuta256
authored
Download artifacts for all SCALA_VERSIONS (#1574)
Co-authored-by: mkuta <mkuta@virtuslab.com>
1 parent 6b19a31 commit fa23848

File tree

3 files changed

+88
-87
lines changed

3 files changed

+88
-87
lines changed

‎scala/private/macros/scala_repositories.bzl‎

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ load(
77
_default_maven_server_urls = "default_maven_server_urls",
88
)
99
load("//third_party/repositories:repositories.bzl", "repositories")
10-
load(
11-
"@io_bazel_rules_scala_config//:config.bzl",
12-
"SCALA_MAJOR_VERSION",
13-
"SCALA_VERSION",
14-
"SCALA_VERSIONS",
15-
)
10+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
1611

1712
def _dt_patched_compiler_impl(rctx):
1813
# Need to give the file a .zip extension so rctx.extract knows what type of archive it is
@@ -128,37 +123,39 @@ def rules_scala_setup(scala_compiler_srcjar = None):
128123
for scala_version in SCALA_VERSIONS:
129124
dt_patched_compiler_setup(scala_version, scala_compiler_srcjar)
130125

131-
ARTIFACT_IDS = [
132-
"io_bazel_rules_scala_scala_library",
133-
"io_bazel_rules_scala_scala_compiler",
134-
"io_bazel_rules_scala_scala_reflect",
135-
"io_bazel_rules_scala_scala_xml",
136-
"io_bazel_rules_scala_scala_parser_combinators",
137-
"org_scalameta_semanticdb_scalac",
138-
] if SCALA_MAJOR_VERSION.startswith("2") else [
139-
"io_bazel_rules_scala_scala_library",
140-
"io_bazel_rules_scala_scala_compiler",
141-
"io_bazel_rules_scala_scala_interfaces",
142-
"io_bazel_rules_scala_scala_tasty_core",
143-
"io_bazel_rules_scala_scala_asm",
144-
"io_bazel_rules_scala_scala_xml",
145-
"io_bazel_rules_scala_scala_parser_combinators",
146-
"io_bazel_rules_scala_scala_library_2",
147-
]
126+
def _artifact_ids(scala_version):
127+
return [
128+
"io_bazel_rules_scala_scala_library",
129+
"io_bazel_rules_scala_scala_compiler",
130+
"io_bazel_rules_scala_scala_reflect",
131+
"io_bazel_rules_scala_scala_xml",
132+
"io_bazel_rules_scala_scala_parser_combinators",
133+
"org_scalameta_semanticdb_scalac",
134+
] if scala_version.startswith("2") else [
135+
"io_bazel_rules_scala_scala_library",
136+
"io_bazel_rules_scala_scala_compiler",
137+
"io_bazel_rules_scala_scala_interfaces",
138+
"io_bazel_rules_scala_scala_tasty_core",
139+
"io_bazel_rules_scala_scala_asm",
140+
"io_bazel_rules_scala_scala_xml",
141+
"io_bazel_rules_scala_scala_parser_combinators",
142+
"io_bazel_rules_scala_scala_library_2",
143+
]
148144

149145
def rules_scala_toolchain_deps_repositories(
150146
maven_servers = _default_maven_server_urls(),
151147
overriden_artifacts = {},
152148
fetch_sources = False,
153149
validate_scala_version = True):
154-
repositories(
155-
scala_version = SCALA_VERSION,
156-
for_artifact_ids = ARTIFACT_IDS,
157-
maven_servers = maven_servers,
158-
fetch_sources = fetch_sources,
159-
overriden_artifacts = overriden_artifacts,
160-
validate_scala_version = validate_scala_version,
161-
)
150+
for scala_version in SCALA_VERSIONS:
151+
repositories(
152+
scala_version = scala_version,
153+
for_artifact_ids = _artifact_ids(scala_version),
154+
maven_servers = maven_servers,
155+
fetch_sources = fetch_sources,
156+
overriden_artifacts = overriden_artifacts,
157+
validate_scala_version = validate_scala_version,
158+
)
162159

163160
def scala_repositories(
164161
maven_servers = _default_maven_server_urls(),

‎scala/scalafmt/scalafmt_repositories.bzl‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
load(
22
"//scala:scala_cross_version.bzl",
3+
"extract_major_version",
34
_default_maven_server_urls = "default_maven_server_urls",
45
)
56
load("//third_party/repositories:repositories.bzl", "repositories")
6-
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_MAJOR_VERSION", "SCALA_VERSION")
7+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
78

89
def scalafmt_default_config(path = ".scalafmt.conf"):
910
build = []
@@ -14,42 +15,44 @@ def scalafmt_default_config(path = ".scalafmt.conf"):
1415
build.append(")")
1516
native.new_local_repository(name = "scalafmt_default", build_file_content = "\n".join(build), path = "")
1617

18+
_SCALAFMT_DEPS = [
19+
"org_scalameta_common",
20+
"org_scalameta_fastparse",
21+
"org_scalameta_fastparse_utils",
22+
"org_scalameta_parsers",
23+
"org_scalameta_scalafmt_core",
24+
"org_scalameta_scalameta",
25+
"org_scalameta_trees",
26+
"org_typelevel_paiges_core",
27+
"com_typesafe_config",
28+
"org_scala_lang_scalap",
29+
"com_thesamet_scalapb_lenses",
30+
"com_thesamet_scalapb_scalapb_runtime",
31+
"com_lihaoyi_fansi",
32+
"com_lihaoyi_fastparse",
33+
"org_scalameta_fastparse_utils",
34+
"org_scala_lang_modules_scala_collection_compat",
35+
"com_lihaoyi_pprint",
36+
"com_lihaoyi_sourcecode",
37+
"com_google_protobuf_protobuf_java",
38+
"com_geirsson_metaconfig_core",
39+
"com_geirsson_metaconfig_typesafe_config",
40+
]
41+
42+
def _artifact_ids(scala_version):
43+
major_version = extract_major_version(scala_version)
44+
geny = ["com_lihaoyi_geny"] if major_version != "2.11" else []
45+
parallel_collections = ["io_bazel_rules_scala_scala_parallel_collections"] if major_version == "2.13" or major_version.startswith("3") else []
46+
return _SCALAFMT_DEPS + geny + parallel_collections
47+
1748
def scalafmt_repositories(
1849
maven_servers = _default_maven_server_urls(),
1950
overriden_artifacts = {}):
20-
artifact_ids = [
21-
"org_scalameta_common",
22-
"org_scalameta_fastparse",
23-
"org_scalameta_fastparse_utils",
24-
"org_scalameta_parsers",
25-
"org_scalameta_scalafmt_core",
26-
"org_scalameta_scalameta",
27-
"org_scalameta_trees",
28-
"org_typelevel_paiges_core",
29-
"com_typesafe_config",
30-
"org_scala_lang_scalap",
31-
"com_thesamet_scalapb_lenses",
32-
"com_thesamet_scalapb_scalapb_runtime",
33-
"com_lihaoyi_fansi",
34-
"com_lihaoyi_fastparse",
35-
"org_scalameta_fastparse_utils",
36-
"org_scala_lang_modules_scala_collection_compat",
37-
"com_lihaoyi_pprint",
38-
"com_lihaoyi_sourcecode",
39-
"com_google_protobuf_protobuf_java",
40-
"com_geirsson_metaconfig_core",
41-
"com_geirsson_metaconfig_typesafe_config",
42-
]
43-
if SCALA_MAJOR_VERSION != "2.11":
44-
artifact_ids.append("com_lihaoyi_geny")
45-
if SCALA_MAJOR_VERSION == "2.13" or SCALA_MAJOR_VERSION.startswith("3"):
46-
artifact_ids.append("io_bazel_rules_scala_scala_parallel_collections")
47-
48-
repositories(
49-
scala_version = SCALA_VERSION,
50-
for_artifact_ids = artifact_ids,
51-
maven_servers = maven_servers,
52-
fetch_sources = True,
53-
overriden_artifacts = overriden_artifacts,
54-
)
51+
for scala_version in SCALA_VERSIONS:
52+
repositories(
53+
scala_version = scala_version,
54+
for_artifact_ids = _artifact_ids(scala_version),
55+
maven_servers = maven_servers,
56+
overriden_artifacts = overriden_artifacts,
57+
)
5558
native.register_toolchains("@io_bazel_rules_scala//scala/scalafmt:scalafmt_toolchain")

‎scalatest/scalatest.bzl‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,28 @@ 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")
6+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSIONS")
77

88
def scalatest_repositories(
99
maven_servers = _default_maven_server_urls(),
1010
fetch_sources = True):
11-
repositories(
12-
scala_version = SCALA_VERSION,
13-
for_artifact_ids = [
14-
"io_bazel_rules_scala_scalatest",
15-
"io_bazel_rules_scala_scalatest_compatible",
16-
"io_bazel_rules_scala_scalatest_core",
17-
"io_bazel_rules_scala_scalatest_featurespec",
18-
"io_bazel_rules_scala_scalatest_flatspec",
19-
"io_bazel_rules_scala_scalatest_freespec",
20-
"io_bazel_rules_scala_scalatest_funsuite",
21-
"io_bazel_rules_scala_scalatest_funspec",
22-
"io_bazel_rules_scala_scalatest_matchers_core",
23-
"io_bazel_rules_scala_scalatest_shouldmatchers",
24-
"io_bazel_rules_scala_scalatest_mustmatchers",
25-
"io_bazel_rules_scala_scalactic",
26-
],
27-
maven_servers = maven_servers,
28-
fetch_sources = fetch_sources,
29-
)
11+
for scala_version in SCALA_VERSIONS:
12+
repositories(
13+
scala_version = scala_version,
14+
for_artifact_ids = [
15+
"io_bazel_rules_scala_scalatest",
16+
"io_bazel_rules_scala_scalatest_compatible",
17+
"io_bazel_rules_scala_scalatest_core",
18+
"io_bazel_rules_scala_scalatest_featurespec",
19+
"io_bazel_rules_scala_scalatest_flatspec",
20+
"io_bazel_rules_scala_scalatest_freespec",
21+
"io_bazel_rules_scala_scalatest_funsuite",
22+
"io_bazel_rules_scala_scalatest_funspec",
23+
"io_bazel_rules_scala_scalatest_matchers_core",
24+
"io_bazel_rules_scala_scalatest_shouldmatchers",
25+
"io_bazel_rules_scala_scalatest_mustmatchers",
26+
"io_bazel_rules_scala_scalactic",
27+
],
28+
maven_servers = maven_servers,
29+
fetch_sources = fetch_sources,
30+
)

0 commit comments

Comments
 (0)