Skip to content

Commit 6c1f034

Browse files
liucijusliucijus
authored
Update rule dependencies (#1478)
* Update rule dependencies
1 parent 6b5bf4a commit 6c1f034

File tree

11 files changed

+80
-81
lines changed

11 files changed

+80
-81
lines changed

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@ see the [compatibility table](#bazel-compatible-versions).
3838
# WORKSPACE
3939
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4040

41-
skylib_version = "1.0.3"
4241
http_archive(
4342
name = "bazel_skylib",
44-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
45-
type = "tar.gz",
46-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
43+
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
44+
urls = [
45+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
46+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
47+
],
4748
)
4849

4950
# See https://github.com/bazelbuild/rules_scala/releases for up to date version information.

‎WORKSPACE‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@ workspace(name = "io_bazel_rules_scala")
22

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

5-
skylib_version = "1.0.3"
6-
75
http_archive(
86
name = "bazel_skylib",
9-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
10-
type = "tar.gz",
11-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
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+
],
1212
)
1313

14-
_build_tools_release = "3.5.0"
14+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
15+
16+
bazel_skylib_workspace()
17+
18+
_build_tools_release = "5.1.0"
1519

1620
http_archive(
1721
name = "com_github_bazelbuild_buildtools",
18-
sha256 = "a02ba93b96a8151b5d8d3466580f6c1f7e77212c4eb181cba53eb2cae7752a23",
22+
sha256 = "e3bb0dc8b0274ea1aca75f1f8c0c835adbe589708ea89bf698069d0790701ea3",
1923
strip_prefix = "buildtools-%s" % _build_tools_release,
2024
url = "https://github.com/bazelbuild/buildtools/archive/%s.tar.gz" % _build_tools_release,
2125
)
@@ -123,10 +127,10 @@ format_repositories()
123127

124128
http_archive(
125129
name = "io_bazel_rules_go",
126-
sha256 = "d1ffd055969c8f8d431e2d439813e42326961d0942bdf734d2c95dc30c369566",
130+
sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d",
127131
urls = [
128-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.24.5/rules_go-v0.24.5.tar.gz",
129-
"https://github.com/bazelbuild/rules_go/releases/download/v0.24.5/rules_go-v0.24.5.tar.gz",
132+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
133+
"https://github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
130134
],
131135
)
132136

@@ -138,7 +142,7 @@ load(
138142

139143
go_rules_dependencies()
140144

141-
go_register_toolchains()
145+
go_register_toolchains(version = "1.19.5")
142146

143147
# Explicitly pull in a different (newer) version of rules_java for remote jdks
144148
rules_java_extra_version = "5.1.0"
@@ -159,28 +163,18 @@ load("@rules_java//java:repositories.bzl", "remote_jdk8_repos")
159163
# https://github.com/bazelbuild/bazel/issues/11655
160164
remote_jdk8_repos()
161165

162-
bazel_toolchains_version = "4.1.0"
163-
164166
http_archive(
165-
name = "bazel_toolchains",
166-
sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
167-
strip_prefix = "bazel-toolchains-%s" % bazel_toolchains_version,
168-
urls = [
169-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/%s/bazel-toolchains-%s.tar.gz" % (bazel_toolchains_version, bazel_toolchains_version),
170-
"https://github.com/bazelbuild/bazel-toolchains/releases/download/%s/bazel-toolchains-%s.tar.gz" % (bazel_toolchains_version, bazel_toolchains_version),
171-
],
167+
name = "bazelci_rules",
168+
sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
169+
strip_prefix = "bazelci_rules-1.0.0",
170+
url = "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz",
172171
)
173172

174-
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
175-
176-
bazel_skylib_workspace()
177-
178-
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
173+
load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig")
179174

180-
# Creates toolchain configuration for remote execution with BuildKite CI
181-
# for rbe_ubuntu1604
182-
rbe_autoconfig(
183-
name = "buildkite_config",
175+
rbe_preconfig(
176+
name = "rbe_default",
177+
toolchain = "ubuntu2004-bazel-java11",
184178
)
185179

186180
load("//third_party/repositories:repositories.bzl", "repositories")

‎dt_patches/test_dt_patches/WORKSPACE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ workspace(name = "test_dt_patches")
22

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

5-
skylib_version = "1.0.3"
6-
75
http_archive(
86
name = "bazel_skylib",
9-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
10-
type = "tar.gz",
11-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
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+
],
1212
)
1313

1414
local_repository(

‎examples/scala3/WORKSPACE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ workspace(name = "specs2_junit_repositories")
22

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

5-
skylib_version = "1.0.3"
6-
75
http_archive(
86
name = "bazel_skylib",
9-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
10-
type = "tar.gz",
11-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
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+
],
1212
)
1313

1414
local_repository(

‎examples/testing/multi_frameworks_toolchain/WORKSPACE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ workspace(name = "multi_frameworks_toolchain")
22

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

5-
skylib_version = "1.0.3"
6-
75
http_archive(
86
name = "bazel_skylib",
9-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
10-
type = "tar.gz",
11-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
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+
],
1212
)
1313

1414
local_repository(

‎examples/testing/scalatest_repositories/WORKSPACE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ workspace(name = "scalatest_repositories")
22

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

5-
skylib_version = "1.0.3"
6-
75
http_archive(
86
name = "bazel_skylib",
9-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
10-
type = "tar.gz",
11-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
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+
],
1212
)
1313

1414
local_repository(

‎examples/testing/specs2_junit_repositories/WORKSPACE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ workspace(name = "specs2_junit_repositories")
22

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

5-
skylib_version = "1.0.3"
6-
75
http_archive(
86
name = "bazel_skylib",
9-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
10-
type = "tar.gz",
11-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
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+
],
1212
)
1313

1414
local_repository(

‎scala/private/macros/scala_repositories.bzl‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,37 +37,40 @@ def dt_patched_compiler_setup():
3737

3838
def rules_scala_setup():
3939
if not native.existing_rule("bazel_skylib"):
40-
skylib_version = "1.0.3"
4140
http_archive(
4241
name = "bazel_skylib",
43-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
44-
type = "tar.gz",
45-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
42+
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
43+
urls = [
44+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
45+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
46+
],
4647
)
4748

4849
if not native.existing_rule("rules_cc"):
4950
http_archive(
5051
name = "rules_cc",
51-
sha256 = "29daf0159f0cf552fcff60b49d8bcd4f08f08506d2da6e41b07058ec50cfeaec",
52-
strip_prefix = "rules_cc-b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e",
53-
urls = ["https://github.com/bazelbuild/rules_cc/archive/b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e.tar.gz"],
52+
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz"],
53+
sha256 = "3d9e271e2876ba42e114c9b9bc51454e379cbf0ec9ef9d40e2ae4cec61a31b40",
54+
strip_prefix = "rules_cc-0.0.6",
5455
)
5556

5657
if not native.existing_rule("rules_java"):
5758
http_archive(
5859
name = "rules_java",
59-
url = "https://github.com/bazelbuild/rules_java/releases/download/3.7.2/rules_java-3.7.2.tar.gz",
60-
sha256 = "b2fd0bb9327287edd388f80d842d5c1e90abfed2e17ed4fe8cb0e83650e8d918",
60+
urls = [
61+
"https://github.com/bazelbuild/rules_java/releases/download/5.4.1/rules_java-5.4.1.tar.gz",
62+
],
63+
sha256 = "a1f82b730b9c6395d3653032bd7e3a660f9d5ddb1099f427c1e1fe768f92e395",
6164
)
6265

6366
if not native.existing_rule("rules_proto"):
6467
http_archive(
6568
name = "rules_proto",
66-
sha256 = "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
67-
strip_prefix = "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488",
69+
sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
70+
strip_prefix = "rules_proto-5.3.0-21.7",
6871
urls = [
69-
"https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
70-
"https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
72+
"https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
73+
"https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
7174
],
7275
)
7376

‎test_version/WORKSPACE.template‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ workspace(name = "io_bazel_rules_scala_test")
22

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

5-
skylib_version = "1.0.3"
6-
75
http_archive(
86
name = "bazel_skylib",
9-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
10-
type = "tar.gz",
11-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
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+
],
1212
)
1313

1414
http_archive(

‎third_party/test/proto/WORKSPACE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ workspace(name = "proto")
22

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

5-
skylib_version = "1.0.3"
6-
75
http_archive(
86
name = "bazel_skylib",
9-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
10-
type = "tar.gz",
11-
url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
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+
],
1212
)
1313

1414
local_repository(

0 commit comments

Comments
 (0)