Skip to content

Commit f29605b

Browse files
committed
Remove @io_bazel_rules_scala or replace with Label
Removes all remaining internal usages of `@io_bazel_rules_scala` without changing any actual logic. Part of bazel-contrib#1482 and bazel-contrib#1652, this is the last change required before adding Bzlmod compatibility. Updates `WORKSPACE` files to use `@rules_scala` and `scala_register_toolchains()` instead of `@io_bazel_rules_scala` and `register_toolchains("@io_bazel_rules_scala_toolchains//...:all")`. Also adds all the scripts run in CI to `test_all.sh`, plus `dt_patches/dt_patch_test.sh`. Leaves `@io_bazel_rules_scala_config` as is for now, because it's a documented public interface. It can be easily changed and documented in a future commit if desired. Also doesn't change the `io_bazel_rules_scala_` prefix for Maven artifact repos. This could also be done and documented in a future commit if desired. --- This change enables `WORKSPACE` and Bzlmod users to import `rules_scala` as `rules_scala`, instead of requiring `io_bazel_rules_scala` due to internal dependencies. i.e., `WORKSPACE` users can still use `http_archive` to import `rules_scala` as `io_bazel_rules_scala`. Bzlmod users will be able to call `bazel_dep(name = "rules_scala", repo_name = "io_bazel_rules_scala")`. However, `io_bazel_rules_scala` is no longer required by `rules_scala` itself.
1 parent d9e6b1a commit f29605b

File tree

129 files changed

+407
-378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+407
-378
lines changed

WORKSPACE

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
workspace(name = "io_bazel_rules_scala")
1+
workspace(name = "rules_scala")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44
load("//scala:deps.bzl", "rules_scala_dependencies")
@@ -42,11 +42,11 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
4242

4343
rules_proto_toolchains()
4444

45-
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
45+
load("//:scala_config.bzl", "scala_config")
4646

4747
scala_config(enable_compiler_dependency_tracking = True)
4848

49-
load("//scala:toolchains.bzl", "scala_toolchains")
49+
load("//scala:toolchains.bzl", "scala_register_toolchains", "scala_toolchains")
5050

5151
scala_toolchains(
5252
fetch_sources = True,
@@ -60,9 +60,10 @@ scala_toolchains(
6060
register_toolchains(
6161
"//scala:unused_dependency_checker_error_toolchain",
6262
"//test/proto:scalapb_toolchain",
63-
"@io_bazel_rules_scala_toolchains//...:all",
6463
)
6564

65+
scala_register_toolchains()
66+
6667
# needed for the cross repo proto test
6768
local_repository(
6869
name = "proto_cross_repo_boundary",

dt_patches/compiler_sources/extensions.bzl

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
12
load(
2-
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
3+
"@rules_scala//scala:scala_cross_version.bzl",
34
"default_maven_server_urls",
45
)
56
load(
6-
"@io_bazel_rules_scala//scala:scala_maven_import_external.bzl",
7+
"@rules_scala//scala:scala_maven_import_external.bzl",
78
"scala_maven_import_external",
89
)
910
load(
10-
"@io_bazel_rules_scala//third_party/repositories:scala_2_13.bzl",
11+
"@rules_scala//third_party/repositories:scala_2_13.bzl",
1112
_scala_2_version = "scala_version",
1213
)
1314
load(
14-
"@io_bazel_rules_scala//third_party/repositories:scala_3_5.bzl",
15+
"@rules_scala//third_party/repositories:scala_3_5.bzl",
1516
_scala_3_version = "scala_version",
1617
)
17-
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
1818

1919
_IS_SCALA_2 = SCALA_VERSION.startswith("2.")
2020
_IS_SCALA_3 = SCALA_VERSION.startswith("3.")

dt_patches/test_dt_patches/BUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
load("@rules_scala//scala:scala.bzl", "setup_scala_toolchain")
12
load(
2-
"@io_bazel_rules_scala//scala:scala.bzl",
3-
"setup_scala_toolchain",
3+
"@rules_scala//scala:scala_cross_version_select.bzl",
4+
"select_for_scala_version",
45
)
5-
load("@io_bazel_rules_scala//scala:scala_cross_version_select.bzl", "select_for_scala_version")
66

77
SCALA_LIBS = ["@scala_library"] + select_for_scala_version(
88
any_2 = ["@scala_reflect"],

dt_patches/test_dt_patches/WORKSPACE

+11-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ workspace(name = "test_dt_patches")
33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

55
local_repository(
6-
name = "io_bazel_rules_scala",
6+
name = "rules_scala",
77
path = "../..",
88
)
99

10-
load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
10+
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")
1111

1212
rules_scala_dependencies()
1313

@@ -48,7 +48,7 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
4848

4949
rules_proto_toolchains()
5050

51-
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
51+
load("@rules_scala//:scala_config.bzl", "scala_config")
5252

5353
scala_config(enable_compiler_dependency_tracking = True)
5454

@@ -61,14 +61,17 @@ load("@compiler_sources//:extensions.bzl", "import_compiler_source_repos")
6161

6262
import_compiler_source_repos()
6363

64-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
64+
load(
65+
"@rules_scala//scala:toolchains.bzl",
66+
"scala_register_toolchains",
67+
"scala_toolchains",
68+
)
6569

6670
scala_toolchains(
6771
fetch_sources = True,
6872
validate_scala_version = False,
6973
)
7074

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

dt_patches/test_dt_patches/dummy/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
1+
load("@rules_scala//scala:scala.bzl", "scala_library")
22

33
scala_library(
44
name = "dummy",

dt_patches/test_dt_patches_user_srcjar/BUILD

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
load(
2-
"@io_bazel_rules_scala//scala:scala.bzl",
2+
"@rules_scala//scala:scala.bzl",
33
"setup_scala_toolchain",
44
)
5-
load("@io_bazel_rules_scala//scala:scala_cross_version_select.bzl", "select_for_scala_version")
5+
load(
6+
"@rules_scala//scala:scala_cross_version_select.bzl",
7+
"select_for_scala_version",
8+
)
69

710
SCALA_LIBS = ["@scala_library"] + select_for_scala_version(
811
any_2 = ["@scala_reflect"],

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

+11-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ workspace(name = "test_dt_patches")
33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

55
local_repository(
6-
name = "io_bazel_rules_scala",
6+
name = "rules_scala",
77
path = "../..",
88
)
99

10-
load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
10+
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")
1111

1212
rules_scala_dependencies()
1313

@@ -48,7 +48,7 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
4848

4949
rules_proto_toolchains()
5050

51-
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
51+
load("@rules_scala//:scala_config.bzl", "scala_config")
5252

5353
scala_config(enable_compiler_dependency_tracking = True)
5454

@@ -137,15 +137,18 @@ srcjars_by_version = {
137137
},
138138
}
139139

140-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
140+
load(
141+
"@rules_scala//scala:toolchains.bzl",
142+
"scala_register_toolchains",
143+
"scala_toolchains",
144+
)
141145

142146
scala_toolchains(
143147
fetch_sources = True,
144148
scala_compiler_srcjars = srcjars_by_version,
145149
validate_scala_version = False,
146150
)
147151

148-
register_toolchains(
149-
":dt_scala_toolchain",
150-
"@io_bazel_rules_scala_toolchains//...:all",
151-
)
152+
register_toolchains(":dt_scala_toolchain")
153+
154+
scala_register_toolchains()

dt_patches/test_dt_patches_user_srcjar/dummy/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
1+
load("@rules_scala//scala:scala.bzl", "scala_library")
22

33
scala_library(
44
name = "dummy",

examples/crossbuild/1_single/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library", "scala_test")
1+
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library", "scala_test")
22

33
# Here we demonstrate the simplest case,
44
# single binary, test or library for which we set a specific version or use the default one:

examples/crossbuild/2_deps/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
1+
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
22

33
# Here we demonstrate how scala_version is propagated through deps.
44

examples/crossbuild/3_select/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
2-
load("@io_bazel_rules_scala//scala:scala_cross_version_select.bzl", "select_for_scala_version")
1+
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
2+
load("@rules_scala//scala:scala_cross_version_select.bzl", "select_for_scala_version")
33

44
# Here we demonstrate how to provide distinct source files depending on the version requested
55

examples/crossbuild/WORKSPACE

+9-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ workspace(name = "cross_build")
33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

55
local_repository(
6-
name = "io_bazel_rules_scala",
6+
name = "rules_scala",
77
path = "../..",
88
)
99

10-
load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
10+
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")
1111

1212
rules_scala_dependencies()
1313

@@ -48,7 +48,7 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
4848

4949
rules_proto_toolchains()
5050

51-
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
51+
load("@rules_scala//:scala_config.bzl", "scala_config")
5252

5353
scala_config(
5454
scala_version = "3.3.5",
@@ -59,8 +59,12 @@ scala_config(
5959
],
6060
)
6161

62-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
62+
load(
63+
"@rules_scala//scala:toolchains.bzl",
64+
"scala_register_toolchains",
65+
"scala_toolchains",
66+
)
6367

6468
scala_toolchains(scalatest = True)
6569

66-
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
70+
scala_register_toolchains()

examples/scala3/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
1+
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
22

33
scala_library(
44
name = "lib",

examples/scala3/WORKSPACE

+9-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ workspace(name = "specs2_junit_repositories")
33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

55
local_repository(
6-
name = "io_bazel_rules_scala",
6+
name = "rules_scala",
77
path = "../..",
88
)
99

10-
load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
10+
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")
1111

1212
rules_scala_dependencies()
1313

@@ -48,12 +48,16 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
4848

4949
rules_proto_toolchains()
5050

51-
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
51+
load("@rules_scala//:scala_config.bzl", "scala_config")
5252

5353
scala_config(scala_version = "3.6.3")
5454

55-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
55+
load(
56+
"@rules_scala//scala:toolchains.bzl",
57+
"scala_register_toolchains",
58+
"scala_toolchains",
59+
)
5660

5761
scala_toolchains(fetch_sources = True)
5862

59-
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
63+
scala_register_toolchains()

examples/semanticdb/BUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@io_bazel_rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")
2-
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
1+
load("@rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")
2+
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
33

44
scala_toolchain(
55
name = "semanticdb_toolchain_impl",
@@ -11,7 +11,7 @@ scala_toolchain(
1111
toolchain(
1212
name = "semanticdb_toolchain",
1313
toolchain = "semanticdb_toolchain_impl",
14-
toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
14+
toolchain_type = "@rules_scala//scala:toolchain_type",
1515
visibility = ["//visibility:public"],
1616
)
1717

examples/semanticdb/WORKSPACE

+10-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ workspace(name = "specs2_junit_repositories")
33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

55
local_repository(
6-
name = "io_bazel_rules_scala",
6+
name = "rules_scala",
77
path = "../..",
88
)
99

10-
load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
10+
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")
1111

1212
rules_scala_dependencies()
1313

@@ -48,16 +48,21 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
4848

4949
rules_proto_toolchains()
5050

51-
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
51+
load("@rules_scala//:scala_config.bzl", "scala_config")
5252

5353
scala_config(scala_version = "2.13.15")
5454

55-
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
55+
load(
56+
"@rules_scala//scala:toolchains.bzl",
57+
"scala_register_toolchains",
58+
"scala_toolchains",
59+
)
5660

5761
scala_toolchains(fetch_sources = True)
5862

5963
register_toolchains(
6064
#Register and use the custom toolchain that has semanticdb enabled
6165
"//:semanticdb_toolchain",
62-
"@io_bazel_rules_scala_toolchains//...:all",
6366
)
67+
68+
scala_register_toolchains()

examples/semanticdb/aspect.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#This aspect is an example of exposing semanticdb information for each target into a json file.
22
# An IDE could use a json file like this to consume the semanticdb data for each target.
33

4-
load("@io_bazel_rules_scala//scala:semanticdb_provider.bzl", "SemanticdbInfo")
4+
load("@rules_scala//scala:semanticdb_provider.bzl", "SemanticdbInfo")
55

66
def semanticdb_info_aspect_impl(target, ctx):
77
if SemanticdbInfo in target:
@@ -20,5 +20,5 @@ def semanticdb_info_aspect_impl(target, ctx):
2020
semanticdb_info_aspect = aspect(
2121
implementation = semanticdb_info_aspect_impl,
2222
attr_aspects = ["deps"],
23-
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
23+
toolchains = ["@rules_scala//scala:toolchain_type"],
2424
)

examples/testing/multi_frameworks_toolchain/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load(
2-
"@io_bazel_rules_scala//testing:testing.bzl",
2+
"@rules_scala//testing:testing.bzl",
33
"setup_scala_testing_toolchain",
44
)
55

0 commit comments

Comments
 (0)