Skip to content

Commit 4fab8f9

Browse files
committed
Add new rules_java preamble to all WORKSPACE files
It's not just `rules_java` in the new preamble, but that's what's precipitating the change. This preamble also works under Bazel 8, per my investigation in bazel-contrib#1652.
1 parent 0e6fc6f commit 4fab8f9

File tree

10 files changed

+310
-289
lines changed

10 files changed

+310
-289
lines changed

dt_patches/test_dt_patches/WORKSPACE

+35-30
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,51 @@ workspace(name = "test_dt_patches")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

5-
http_archive(
6-
name = "bazel_skylib",
7-
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
8-
urls = [
9-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
10-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
11-
],
5+
local_repository(
6+
name = "io_bazel_rules_scala",
7+
path = "../..",
128
)
139

10+
load("@io_bazel_rules_scala//scala:deps.bzl", "load_rules_dependencies")
11+
12+
load_rules_dependencies()
13+
14+
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
15+
16+
rules_java_dependencies()
17+
18+
rules_java_toolchains()
19+
20+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
21+
22+
bazel_skylib_workspace()
23+
1424
http_archive(
1525
name = "rules_python",
16-
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17-
strip_prefix = "rules_python-0.36.0",
18-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
26+
sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34",
27+
strip_prefix = "rules_python-0.38.0",
28+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz",
1929
)
2030

2131
load("@rules_python//python:repositories.bzl", "py_repositories")
2232

2333
py_repositories()
2434

25-
local_repository(
26-
name = "io_bazel_rules_scala",
27-
path = "../..",
28-
)
35+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
36+
37+
protobuf_deps()
38+
39+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
40+
41+
rules_proto_dependencies()
42+
43+
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
44+
45+
rules_proto_setup()
46+
47+
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
48+
49+
rules_proto_toolchains()
2950

3051
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3152

@@ -109,19 +130,3 @@ register_toolchains(
109130
":dt_scala_toolchain",
110131
"@io_bazel_rules_scala_toolchains//...:all",
111132
)
112-
113-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
114-
115-
rules_proto_dependencies()
116-
117-
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
118-
119-
rules_proto_setup()
120-
121-
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
122-
123-
rules_proto_toolchains()
124-
125-
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
126-
127-
protobuf_deps()

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

+35-30
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,51 @@ workspace(name = "test_dt_patches")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar")
44

5-
http_archive(
6-
name = "bazel_skylib",
7-
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
8-
urls = [
9-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
10-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
11-
],
5+
local_repository(
6+
name = "io_bazel_rules_scala",
7+
path = "../..",
128
)
139

10+
load("@io_bazel_rules_scala//scala:deps.bzl", "load_rules_dependencies")
11+
12+
load_rules_dependencies()
13+
14+
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
15+
16+
rules_java_dependencies()
17+
18+
rules_java_toolchains()
19+
20+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
21+
22+
bazel_skylib_workspace()
23+
1424
http_archive(
1525
name = "rules_python",
16-
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17-
strip_prefix = "rules_python-0.36.0",
18-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
26+
sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34",
27+
strip_prefix = "rules_python-0.38.0",
28+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz",
1929
)
2030

2131
load("@rules_python//python:repositories.bzl", "py_repositories")
2232

2333
py_repositories()
2434

25-
local_repository(
26-
name = "io_bazel_rules_scala",
27-
path = "../..",
28-
)
35+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
36+
37+
protobuf_deps()
38+
39+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
40+
41+
rules_proto_dependencies()
42+
43+
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
44+
45+
rules_proto_setup()
46+
47+
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
48+
49+
rules_proto_toolchains()
2950

3051
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3152

@@ -188,19 +209,3 @@ register_toolchains(
188209
":dt_scala_toolchain",
189210
"@io_bazel_rules_scala_toolchains//...:all",
190211
)
191-
192-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
193-
194-
rules_proto_dependencies()
195-
196-
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
197-
198-
rules_proto_setup()
199-
200-
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
201-
202-
rules_proto_toolchains()
203-
204-
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
205-
206-
protobuf_deps()

examples/crossbuild/WORKSPACE

+35-30
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,51 @@ workspace(name = "cross_build")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

5-
http_archive(
6-
name = "bazel_skylib",
7-
sha256 = "d00f1389ee20b60018e92644e0948e16e350a7707219e7a390fb0a99b6ec9262",
8-
urls = [
9-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.0/bazel-skylib-1.7.0.tar.gz",
10-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.0/bazel-skylib-1.7.0.tar.gz",
11-
],
5+
local_repository(
6+
name = "io_bazel_rules_scala",
7+
path = "../..",
128
)
139

10+
load("@io_bazel_rules_scala//scala:deps.bzl", "load_rules_dependencies")
11+
12+
load_rules_dependencies()
13+
14+
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
15+
16+
rules_java_dependencies()
17+
18+
rules_java_toolchains()
19+
20+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
21+
22+
bazel_skylib_workspace()
23+
1424
http_archive(
1525
name = "rules_python",
16-
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17-
strip_prefix = "rules_python-0.36.0",
18-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
26+
sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34",
27+
strip_prefix = "rules_python-0.38.0",
28+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz",
1929
)
2030

2131
load("@rules_python//python:repositories.bzl", "py_repositories")
2232

2333
py_repositories()
2434

25-
local_repository(
26-
name = "io_bazel_rules_scala",
27-
path = "../..",
28-
)
35+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
36+
37+
protobuf_deps()
38+
39+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
40+
41+
rules_proto_dependencies()
42+
43+
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
44+
45+
rules_proto_setup()
46+
47+
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
48+
49+
rules_proto_toolchains()
2950

3051
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3152

@@ -44,22 +65,6 @@ scala_toolchains()
4465

4566
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
4667

47-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
48-
49-
rules_proto_dependencies()
50-
51-
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
52-
53-
rules_proto_setup()
54-
55-
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
56-
57-
rules_proto_toolchains()
58-
59-
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
60-
61-
protobuf_deps()
62-
6368
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
6469

6570
scalatest_repositories()

examples/scala3/WORKSPACE

+30-25
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,39 @@ workspace(name = "specs2_junit_repositories")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

5-
http_archive(
6-
name = "bazel_skylib",
7-
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
8-
urls = [
9-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
10-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
11-
],
5+
local_repository(
6+
name = "io_bazel_rules_scala",
7+
path = "../..",
128
)
139

10+
load("@io_bazel_rules_scala//scala:deps.bzl", "load_rules_dependencies")
11+
12+
load_rules_dependencies()
13+
14+
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
15+
16+
rules_java_dependencies()
17+
18+
rules_java_toolchains()
19+
20+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
21+
22+
bazel_skylib_workspace()
23+
1424
http_archive(
1525
name = "rules_python",
16-
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
17-
strip_prefix = "rules_python-0.36.0",
18-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
26+
sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34",
27+
strip_prefix = "rules_python-0.38.0",
28+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz",
1929
)
2030

2131
load("@rules_python//python:repositories.bzl", "py_repositories")
2232

2333
py_repositories()
2434

25-
local_repository(
26-
name = "io_bazel_rules_scala",
27-
path = "../..",
28-
)
29-
30-
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
31-
32-
scala_config(scala_version = "3.5.2")
33-
34-
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
35-
36-
scala_toolchains(fetch_sources = True)
35+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
3736

38-
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
37+
protobuf_deps()
3938

4039
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
4140

@@ -49,6 +48,12 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
4948

5049
rules_proto_toolchains()
5150

52-
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
51+
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
5352

54-
protobuf_deps()
53+
scala_config(scala_version = "3.5.2")
54+
55+
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
56+
57+
scala_toolchains(fetch_sources = True)
58+
59+
register_toolchains("@io_bazel_rules_scala_toolchains//...:all")

0 commit comments

Comments
 (0)