Skip to content

Commit 184f7a0

Browse files
mblandmbland
committed
Merge branch 'bzlmod-toolchain-scala' into bzlmod-rebuilding
2 parents 20752f2 + 93ff078 commit 184f7a0

File tree

28 files changed

+325
-233
lines changed

28 files changed

+325
-233
lines changed

‎WORKSPACE‎

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

4040
scala_config(enable_compiler_dependency_tracking = True)
4141

42-
load("//scala:scala.bzl", "rules_scala_setup", "rules_scala_toolchain_deps_repositories")
42+
load("//scala:scala.bzl", "scala_toolchains")
4343

44-
rules_scala_setup()
44+
scala_toolchains(fetch_sources = True)
4545

46-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
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+
)
4752

4853
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4954

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

8388
specs2_junit_repositories()
8489

85-
register_toolchains("//testing:testing_toolchain")
86-
8790
load("//scala/scalafmt:scalafmt_repositories.bzl", "scalafmt_default_config", "scalafmt_repositories")
8891

8992
scalafmt_default_config()
@@ -115,12 +118,6 @@ local_repository(
115118
path = "third_party/test/example_external_workspace",
116119
)
117120

118-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_unused_deps_toolchains")
119-
120-
scala_register_unused_deps_toolchains()
121-
122-
register_toolchains("@io_bazel_rules_scala//test/proto:scalapb_toolchain")
123-
124121
load("//scala:scala_maven_import_external.bzl", "java_import_external")
125122

126123
# 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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +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-
)
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
3935
load(
4036
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
4137
"default_maven_server_urls",
@@ -67,14 +63,15 @@ scala_maven_import_external(
6763
server_urls = default_maven_server_urls(),
6864
)
6965

70-
rules_scala_setup()
71-
72-
rules_scala_toolchain_deps_repositories(
66+
scala_toolchains(
7367
fetch_sources = True,
7468
validate_scala_version = False,
7569
)
7670

77-
register_toolchains(":dt_scala_toolchain")
71+
register_toolchains(
72+
":dt_scala_toolchain",
73+
"@io_bazel_rules_scala_toolchains//...:all",
74+
)
7875

7976
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
8077

‎dt_patches/test_dt_patches_user_srcjar/WORKSPACE‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +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-
)
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
3935
load(
4036
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
4137
"default_maven_server_urls",
@@ -122,14 +118,16 @@ srcjars_by_version = {
122118
},
123119
}
124120

125-
rules_scala_setup(scala_compiler_srcjar = srcjars_by_version[SCALA_VERSION])
126-
127-
rules_scala_toolchain_deps_repositories(
121+
scala_toolchains(
128122
fetch_sources = True,
123+
scala_compiler_srcjars = srcjars_by_version,
129124
validate_scala_version = False,
130125
)
131126

132-
register_toolchains(":dt_scala_toolchain")
127+
register_toolchains(
128+
":dt_scala_toolchain",
129+
"@io_bazel_rules_scala_toolchains//...:all",
130+
)
133131

134132
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
135133

@@ -146,7 +144,3 @@ rules_proto_toolchains()
146144
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
147145

148146
protobuf_deps()
149-
150-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
151-
152-
scala_register_toolchains()

‎examples/crossbuild/WORKSPACE‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +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-
)
41+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4642

47-
rules_scala_setup()
43+
scala_toolchains()
4844

49-
rules_scala_toolchain_deps_repositories()
45+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
5046

5147
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
5248

@@ -64,10 +60,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
6460

6561
protobuf_deps()
6662

67-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
68-
69-
scala_register_toolchains()
70-
7163
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
7264

7365
scalatest_repositories()

‎examples/scala3/WORKSPACE‎

Lines changed: 3 additions & 11 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(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-
)
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
3935

40-
rules_scala_setup()
36+
scala_toolchains(fetch_sources = True)
4137

42-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
38+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
4339

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

@@ -56,7 +52,3 @@ rules_proto_toolchains()
5652
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
5753

5854
protobuf_deps()
59-
60-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
61-
62-
scala_register_toolchains()

‎examples/semanticdb/WORKSPACE‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +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-
)
37+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
4238

43-
rules_scala_setup()
39+
scala_toolchains(fetch_sources = True)
4440

45-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
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+
)
4646

4747
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4848

@@ -59,8 +59,3 @@ rules_proto_toolchains()
5959
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
6060

6161
protobuf_deps()
62-
63-
#Register and use the custom toolchain that has semanticdb enabled
64-
register_toolchains(
65-
"//:semanticdb_toolchain",
66-
)

‎examples/testing/multi_frameworks_toolchain/WORKSPACE‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +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-
)
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
3935

40-
rules_scala_setup()
36+
scala_toolchains(fetch_sources = True)
4137

42-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
38+
register_toolchains(
39+
":testing_toolchain",
40+
"@io_bazel_rules_scala_toolchains//...:all",
41+
)
4342

4443
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4544

@@ -57,10 +56,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
5756

5857
protobuf_deps()
5958

60-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
61-
62-
scala_register_toolchains()
63-
6459
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories")
6560
load("@io_bazel_rules_scala//testing:junit.bzl", "junit_repositories")
6661
load("@io_bazel_rules_scala//testing:specs2_junit.bzl", "specs2_junit_repositories")
@@ -70,5 +65,3 @@ scalatest_repositories()
7065
junit_repositories()
7166

7267
specs2_junit_repositories()
73-
74-
register_toolchains(":testing_toolchain")

‎examples/testing/scalatest_repositories/WORKSPACE‎

Lines changed: 3 additions & 11 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-
"rules_scala_setup",
37-
"rules_scala_toolchain_deps_repositories",
38-
)
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
3935

40-
rules_scala_setup()
36+
scala_toolchains(fetch_sources = True)
4137

42-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
38+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
4339

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

@@ -57,10 +53,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
5753

5854
protobuf_deps()
5955

60-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
61-
62-
scala_register_toolchains()
63-
6456
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
6557

6658
scalatest_repositories()

‎examples/testing/specs2_junit_repositories/WORKSPACE‎

Lines changed: 3 additions & 11 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-
"rules_scala_setup",
37-
"rules_scala_toolchain_deps_repositories",
38-
)
34+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
3935

40-
rules_scala_setup()
36+
scala_toolchains(fetch_sources = True)
4137

42-
rules_scala_toolchain_deps_repositories(fetch_sources = True)
38+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
4339

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

@@ -57,10 +53,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
5753

5854
protobuf_deps()
5955

60-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
61-
62-
scala_register_toolchains()
63-
6456
load("@io_bazel_rules_scala//testing:specs2_junit.bzl", "specs2_junit_repositories", "specs2_junit_toolchain")
6557

6658
specs2_junit_repositories()

‎jmh/jmh.bzl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//scala:scala.bzl", "scala_binary", "scala_library")
1+
load("//scala/private:rules/scala_binary.bzl", "scala_binary")
2+
load("//scala/private:rules/scala_library.bzl", "scala_library")
23
load(
34
"//scala:scala_cross_version.bzl",
45
"default_maven_server_urls",

0 commit comments

Comments
 (0)