Skip to content

Commit bd2364a

Browse files
mblandmbland
committed
Replace WORKSPACE calls with scala_toolchains()
Also added `@io_bazel_rules_scala_toolchains//...:all` to `register_toolchains()` calls everywhere, even when not specifically necessary. This proves the mechanism is safe and works with `WORKSPACE` now, and will make future updates to consolidate other toolchains less noisy.
1 parent 75a7d9f commit bd2364a

File tree

13 files changed

+67
-151
lines changed

13 files changed

+67
-151
lines changed

‎WORKSPACE

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,16 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3939

4040
scala_config(enable_compiler_dependency_tracking = True)
4141

42-
load(
43-
"//scala:scala.bzl",
44-
"rules_scala_setup",
45-
"rules_scala_toolchain_deps_repositories",
46-
"scala_toolchains_repo",
47-
)
42+
load("//scala:scala.bzl", "scala_toolchains")
4843

49-
rules_scala_setup()
44+
scala_toolchains(fetch_sources = True)
5045

51-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
52-
53-
scala_toolchains_repo()
46+
register_toolchains(
47+
"//testing:testing_toolchain",
48+
"//scala:unused_dependency_checker_error_toolchain",
49+
"//test/proto:scalapb_toolchain",
50+
"@io_bazel_rules_scala_toolchains//...:all",
51+
)
5452

5553
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
5654

@@ -89,8 +87,6 @@ load("//specs2:specs2_junit.bzl", "specs2_junit_repositories")
8987

9088
specs2_junit_repositories()
9189

92-
register_toolchains("//testing:testing_toolchain")
93-
9490
load("//scala/scalafmt:scalafmt_repositories.bzl", "scalafmt_default_config", "scalafmt_repositories")
9591

9692
scalafmt_default_config()
@@ -122,12 +118,6 @@ local_repository(
122118
path = "third_party/test/example_external_workspace",
123119
)
124120

125-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_unused_deps_toolchains")
126-
127-
scala_register_unused_deps_toolchains()
128-
129-
register_toolchains("@io_bazel_rules_scala//test/proto:scalapb_toolchain")
130-
131121
load("//scala:scala_maven_import_external.bzl", "java_import_external")
132122

133123
# bazel's java_import_external has been altered in rules_scala to be a macro based on jvm_import_external

‎dt_patches/test_dt_patches/WORKSPACE

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

3232
scala_config(enable_compiler_dependency_tracking = True)
3333

34-
load(
35-
"@io_bazel_rules_scala//scala:scala.bzl",
36-
"rules_scala_setup",
37-
"rules_scala_toolchain_deps_repositories",
38-
"scala_toolchains_repo",
39-
)
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4035
load(
4136
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
4237
"default_maven_server_urls",
@@ -68,16 +63,15 @@ scala_maven_import_external(
6863
server_urls = default_maven_server_urls(),
6964
)
7065

71-
rules_scala_setup()
72-
73-
rules_scala_toolchain_deps_repositories(
66+
scala_toolchains(
7467
fetch_sources = True,
7568
validate_scala_version = False,
7669
)
7770

78-
scala_toolchains_repo()
79-
80-
register_toolchains(":dt_scala_toolchain")
71+
register_toolchains(
72+
":dt_scala_toolchain",
73+
"@io_bazel_rules_scala_toolchains//...:all",
74+
)
8175

8276
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
8377

‎dt_patches/test_dt_patches_user_srcjar/WORKSPACE

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

3232
scala_config(enable_compiler_dependency_tracking = True)
3333

34-
load(
35-
"@io_bazel_rules_scala//scala:scala.bzl",
36-
"rules_scala_setup",
37-
"rules_scala_toolchain_deps_repositories",
38-
"scala_toolchains_repo",
39-
)
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4035
load(
4136
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
4237
"default_maven_server_urls",
@@ -123,16 +118,16 @@ srcjars_by_version = {
123118
},
124119
}
125120

126-
rules_scala_setup(scala_compiler_srcjar = srcjars_by_version[SCALA_VERSION])
127-
128-
rules_scala_toolchain_deps_repositories(
121+
scala_toolchains(
129122
fetch_sources = True,
123+
scala_compiler_srcjars = srcjars_by_version,
130124
validate_scala_version = False,
131125
)
132126

133-
scala_toolchains_repo()
134-
135-
register_toolchains(":dt_scala_toolchain")
127+
register_toolchains(
128+
":dt_scala_toolchain",
129+
"@io_bazel_rules_scala_toolchains//...:all",
130+
)
136131

137132
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
138133

@@ -149,7 +144,3 @@ rules_proto_toolchains()
149144
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
150145

151146
protobuf_deps()
152-
153-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
154-
155-
scala_register_toolchains()

‎examples/crossbuild/WORKSPACE

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,11 @@ scala_config(
3838
],
3939
)
4040

41-
load(
42-
"@io_bazel_rules_scala//scala:scala.bzl",
43-
"rules_scala_setup",
44-
"rules_scala_toolchain_deps_repositories",
45-
"scala_toolchains_repo",
46-
)
47-
48-
rules_scala_setup()
41+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4942

50-
rules_scala_toolchain_deps_repositories()
43+
scala_toolchains()
5144

52-
scala_toolchains_repo()
45+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
5346

5447
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
5548

‎examples/scala3/WORKSPACE

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,11 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

3232
scala_config(scala_version = "3.5.2")
3333

34-
load(
35-
"@io_bazel_rules_scala//scala:scala.bzl",
36-
"rules_scala_setup",
37-
"rules_scala_toolchain_deps_repositories",
38-
"scala_toolchains_repo",
39-
)
40-
41-
rules_scala_setup()
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4235

43-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
36+
scala_toolchains(fetch_sources = True)
4437

45-
scala_toolchains_repo()
38+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
4639

4740
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4841

‎examples/semanticdb/WORKSPACE

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,15 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3434

3535
scala_config(scala_version = "2.13.15")
3636

37-
load(
38-
"@io_bazel_rules_scala//scala:scala.bzl",
39-
"rules_scala_setup",
40-
"rules_scala_toolchain_deps_repositories",
41-
"scala_toolchains_repo",
42-
)
43-
44-
rules_scala_setup()
37+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4538

46-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
39+
scala_toolchains(fetch_sources = True)
4740

48-
scala_toolchains_repo()
41+
register_toolchains(
42+
#Register and use the custom toolchain that has semanticdb enabled
43+
"//:semanticdb_toolchain",
44+
"@io_bazel_rules_scala_toolchains//...:all",
45+
)
4946

5047
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
5148

@@ -62,8 +59,3 @@ rules_proto_toolchains()
6259
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
6360

6461
protobuf_deps()
65-
66-
#Register and use the custom toolchain that has semanticdb enabled
67-
register_toolchains(
68-
"//:semanticdb_toolchain",
69-
)

‎examples/testing/multi_frameworks_toolchain/WORKSPACE

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,14 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

3232
scala_config()
3333

34-
load(
35-
"@io_bazel_rules_scala//scala:scala.bzl",
36-
"rules_scala_setup",
37-
"rules_scala_toolchain_deps_repositories",
38-
"scala_toolchains_repo",
39-
)
40-
41-
rules_scala_setup()
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4235

43-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
36+
scala_toolchains(fetch_sources = True)
4437

45-
scala_toolchains_repo()
38+
register_toolchains(
39+
":testing_toolchain",
40+
"@io_bazel_rules_scala_toolchains//...:all",
41+
)
4642

4743
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4844

@@ -73,5 +69,3 @@ scalatest_repositories()
7369
junit_repositories()
7470

7571
specs2_junit_repositories()
76-
77-
register_toolchains(":testing_toolchain")

‎examples/testing/scalatest_repositories/WORKSPACE

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,11 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

3232
scala_config()
3333

34-
load(
35-
"@io_bazel_rules_scala//scala:scala.bzl",
36-
"rules_scala_setup",
37-
"rules_scala_toolchain_deps_repositories",
38-
"scala_toolchains_repo",
39-
)
40-
41-
rules_scala_setup()
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4235

43-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
36+
scala_toolchains(fetch_sources = True)
4437

45-
scala_toolchains_repo()
38+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
4639

4740
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4841

‎examples/testing/specs2_junit_repositories/WORKSPACE

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,11 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

3232
scala_config()
3333

34-
load(
35-
"@io_bazel_rules_scala//scala:scala.bzl",
36-
"rules_scala_setup",
37-
"rules_scala_toolchain_deps_repositories",
38-
"scala_toolchains_repo",
39-
)
40-
41-
rules_scala_setup()
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4235

43-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
36+
scala_toolchains(fetch_sources = True)
4437

45-
scala_toolchains_repo()
38+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
4639

4740
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4841

‎test_cross_build/WORKSPACE

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,11 @@ scala_config(
7272
)
7373

7474
# loads other rules Rules Scala depends on
75-
load(
76-
"@io_bazel_rules_scala//scala:scala.bzl",
77-
"rules_scala_toolchain_deps_repositories",
78-
"scala_toolchains_repo",
79-
)
80-
81-
rules_scala_toolchain_deps_repositories()
82-
83-
scala_toolchains_repo()
75+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
8476

85-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
77+
scala_toolchains()
8678

87-
scala_register_toolchains()
79+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
8880

8981
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
9082

‎test_version/WORKSPACE.template

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,24 @@ scala_config(enable_compiler_dependency_tracking = True)
5959

6060
load("@io_bazel_rules_scala//scala:scala_cross_version.bzl", "extract_major_version")
6161

62+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
63+
64+
scala_toolchains(fetch_sources = True)
65+
66+
register_toolchains()
67+
register_toolchains(
68+
"@io_bazel_rules_scala//scala:unused_dependency_checker_error_toolchain",
69+
"@io_bazel_rules_scala//testing:testing_toolchain",
70+
"@io_bazel_rules_scala_toolchains//...:all",
71+
)
72+
73+
6274
load(
6375
"@io_bazel_rules_scala//scala:scala.bzl",
6476
"scala_repositories",
6577
"scala_toolchains_repo",
6678
)
6779

68-
scala_repositories(fetch_sources = True)
69-
70-
scala_toolchains_repo()
71-
7280
load(":scrooge_repositories.bzl", "scrooge_repositories")
7381
${twitter_scrooge_repositories}
7482
load("@io_bazel_rules_scala//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge")
@@ -89,9 +97,3 @@ specs2_junit_repositories()
8997
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
9098

9199
scalatest_repositories()
92-
93-
register_toolchains("@io_bazel_rules_scala//testing:testing_toolchain")
94-
95-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_unused_deps_toolchains")
96-
97-
scala_register_unused_deps_toolchains()

‎third_party/test/example_external_workspace/WORKSPACE

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,11 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

3232
scala_config()
3333

34-
load(
35-
"@io_bazel_rules_scala//scala:scala.bzl",
36-
"rules_scala_setup",
37-
"rules_scala_toolchain_deps_repositories",
38-
"scala_toolchains_repo",
39-
)
40-
41-
rules_scala_setup()
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4235

43-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
36+
scala_toolchains(fetch_sources = True)
4437

45-
scala_toolchains_repo()
38+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
4639

4740
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4841

‎third_party/test/proto/WORKSPACE

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,11 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

3232
scala_config()
3333

34-
load(
35-
"@io_bazel_rules_scala//scala:scala.bzl",
36-
"scala_repositories",
37-
"scala_toolchains_repo",
38-
)
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
3935

40-
scala_repositories()
36+
scala_toolchains()
4137

42-
scala_toolchains_repo()
38+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
4339

4440
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4541

0 commit comments

Comments
 (0)