Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

Commit 79a47d9

Browse files
authored
Upgrade third party deps (#243)
1 parent e72f41a commit 79a47d9

File tree

5 files changed

+92
-50
lines changed

5 files changed

+92
-50
lines changed

BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ buildifier(
66

77
buildifier(
88
name = "buildifier_check",
9-
mode = "check"
9+
mode = "check",
1010
)

README.md

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,24 @@ WORKSPACE
5050

5151
```python
5252
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
53-
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
5453

5554
# Load rules scala annex
56-
rules_scala_annex_commit = "ae99fcb08bbddfc24fef00d7b13f6c065e1df8d5"
55+
rules_scala_annex_version = "ae99fcb08bbddfc24fef00d7b13f6c065e1df8d5"
5756
rules_scala_annex_sha256 = "1630fc7ecc7a4ffeabcdef73c7600eab9cf3fd2377db1f69b8ce1927560211ff"
5857
http_archive(
5958
name = "rules_scala_annex",
6059
sha256 = rules_scala_annex_sha256,
61-
strip_prefix = "rules_scala-{}".format(rules_scala_annex_commit),
62-
url = "https://github.com/higherkindness/rules_scala/archive/{}.zip".format(rules_scala_annex_commit),
60+
strip_prefix = "rules_scala-{}".format(rules_scala_annex_version),
61+
url = "https://github.com/higherkindness/rules_scala/archive/{}.zip".format(rules_scala_annex_version),
6362
)
6463

6564
rules_jvm_external_tag = "2.9"
6665
rules_jvm_external_sha256 = "e5b97a31a3e8feed91636f42e19b11c49487b85e5de2f387c999ea14d77c7f45"
6766
http_archive(
6867
name = "rules_jvm_external",
6968
sha256 = rules_jvm_external_sha256,
70-
strip_prefix = "rules_jvm_external-{}".format(rules_jvm_external_version),
71-
url = "https://github.com/bazelbuild/rules_jvm_external/archive/{}.zip".format(rules_jvm_external_version),
69+
strip_prefix = "rules_jvm_external-{}".format(rules_jvm_external_tag),
70+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/{}.zip".format(rules_jvm_external_tag),
7271
)
7372

7473
load("@rules_scala_annex//rules/scala:workspace.bzl", "scala_register_toolchains", "scala_repositories")
@@ -90,17 +89,25 @@ annex_proto_pinned_maven_install()
9089
scala_proto_register_toolchains()
9190

9291
# Load bazel skylib and google protobuf
93-
git_repository(
92+
bazel_skylib_tag = "1.0.2"
93+
bazel_skylib_sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44"
94+
http_archive(
9495
name = "bazel_skylib",
95-
remote = "https://github.com/bazelbuild/bazel-skylib.git",
96-
tag = "0.8.0",
96+
sha256 = bazel_skylib_sha256,
97+
urls = [
98+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{tag}/bazel-skylib-{tag}.tar.gz".format(tag = bazel_skylib_tag),
99+
"https://github.com/bazelbuild/bazel-skylib/releases/download/{tag}/bazel-skylib-{tag}.tar.gz".format(tag = bazel_skylib_tag),
100+
],
97101
)
98102

103+
protobuf_tag = "3.10.1"
104+
protobuf_sha256 = "678d91d8a939a1ef9cb268e1f20c14cd55e40361dc397bb5881e4e1e532679b1"
99105
http_archive(
100106
name = "com_google_protobuf",
101-
sha256 = "0963c6ae20340ce41f225a99cacbcba8422cebe4f82937f3d9fa3f5dd7ae7342",
102-
strip_prefix = "protobuf-9f604ac5043e9ab127b99420e957504f2149adbe",
103-
urls = ["https://github.com/google/protobuf/archive/9f604ac5043e9ab127b99420e957504f2149adbe.zip"],
107+
sha256 = protobuf_sha256,
108+
strip_prefix = "protobuf-{}".format(protobuf_tag),
109+
type = "zip",
110+
url = "https://github.com/protocolbuffers/protobuf/archive/v{}.zip".format(protobuf_tag),
104111
)
105112

106113
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

WORKSPACE

Lines changed: 45 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
workspace(name = "rules_scala_annex")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4-
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
54

6-
http_archive(
7-
name = "io_bazel",
8-
sha256 = "2d86797a5b96163b7f5e9cbb8f09cc919066e7ee0fe1a614b79680ae36a14ef3",
9-
strip_prefix = "bazel-0.27.0",
10-
urls = ["https://github.com/bazelbuild/bazel/archive/0.27.0.zip"],
11-
)
5+
skydoc_tag = "0.3.0"
6+
7+
skydoc_sha256 = "8762a212cff5f81505a1632630edcfe9adce381479a50a03c968bd2fc217972d"
128

139
http_archive(
1410
name = "io_bazel_skydoc",
15-
sha256 = "694602137e5d56cfd35622cf58c047549324a0db1522ee944ad86e74420be9db",
16-
strip_prefix = "skydoc-b8a32e07ee8297c89ca8020af4fa2163a766706f",
17-
urls = ["https://github.com/bazelbuild/skydoc/archive/b8a32e07ee8297c89ca8020af4fa2163a766706f.zip"],
11+
sha256 = skydoc_sha256,
12+
strip_prefix = "skydoc-{}".format(skydoc_tag),
13+
url = "https://github.com/bazelbuild/skydoc/archive/{}.zip".format(skydoc_tag),
1814
)
1915

2016
# com_github_bazelbuild_buildtools
2117

18+
buildtools_tag = "0.29.0"
19+
20+
buildtools_sha256 = "05eb52437fb250c7591dd6cbcfd1f9b5b61d85d6b20f04b041e0830dd1ab39b3"
21+
2222
http_archive(
2323
name = "com_github_bazelbuild_buildtools",
24-
sha256 = "998ccc97f78c4ee959ad7ebb5effed30a6a8afc7891e6be3c2e0355900846c7d",
25-
strip_prefix = "buildtools-19db42aa7a206a52b67bc66477c069ca83d092f4",
26-
urls = ["https://github.com/bazelbuild/buildtools/archive/19db42aa7a206a52b67bc66477c069ca83d092f4.zip"],
24+
sha256 = buildtools_sha256,
25+
strip_prefix = "buildtools-{}".format(buildtools_tag),
26+
url = "https://github.com/bazelbuild/buildtools/archive/{}.zip".format(buildtools_tag),
2727
)
2828

2929
load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
@@ -32,12 +32,16 @@ buildifier_dependencies()
3232

3333
# io_bazel_rules_go
3434

35+
rules_go_tag = "v0.20.2"
36+
37+
rules_go_sha256 = "b9aa86ec08a292b97ec4591cf578e020b35f98e12173bbd4a921f84f583aebd9"
38+
3539
http_archive(
3640
name = "io_bazel_rules_go",
37-
sha256 = "9fb16af4d4836c8222142e54c9efa0bb5fc562ffc893ce2abeac3e25daead144",
41+
sha256 = rules_go_sha256,
3842
urls = [
39-
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.19.0/rules_go-0.19.0.tar.gz",
40-
"https://github.com/bazelbuild/rules_go/releases/download/0.19.0/rules_go-0.19.0.tar.gz",
43+
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/{tag}/rules_go-{tag}.tar.gz".format(tag = rules_go_tag),
44+
"https://github.com/bazelbuild/rules_go/releases/download/{tag}/rules_go-{tag}.tar.gz".format(tag = rules_go_tag),
4145
],
4246
)
4347

@@ -47,17 +51,29 @@ go_rules_dependencies()
4751

4852
go_register_toolchains()
4953

50-
git_repository(
54+
bazel_skylib_tag = "1.0.2"
55+
56+
bazel_skylib_sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44"
57+
58+
http_archive(
5159
name = "bazel_skylib",
52-
remote = "https://github.com/bazelbuild/bazel-skylib.git",
53-
tag = "0.8.0",
60+
sha256 = bazel_skylib_sha256,
61+
urls = [
62+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{tag}/bazel-skylib-{tag}.tar.gz".format(tag = bazel_skylib_tag),
63+
"https://github.com/bazelbuild/bazel-skylib/releases/download/{tag}/bazel-skylib-{tag}.tar.gz".format(tag = bazel_skylib_tag),
64+
],
5465
)
5566

67+
protobuf_tag = "3.10.1"
68+
69+
protobuf_sha256 = "678d91d8a939a1ef9cb268e1f20c14cd55e40361dc397bb5881e4e1e532679b1"
70+
5671
http_archive(
5772
name = "com_google_protobuf",
58-
sha256 = "8eb5ca331ab8ca0da2baea7fc0607d86c46c80845deca57109a5d637ccb93bb4",
59-
strip_prefix = "protobuf-3.9.0",
60-
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.9.0.zip"],
73+
sha256 = protobuf_sha256,
74+
strip_prefix = "protobuf-{}".format(protobuf_tag),
75+
type = "zip",
76+
url = "https://github.com/protocolbuffers/protobuf/archive/v{}.zip".format(protobuf_tag),
6177
)
6278

6379
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
@@ -93,11 +109,15 @@ http_archive(
93109
url = "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u212-b03/OpenJDK8U-jdk_x64_mac_hotspot_8u212b03.tar.gz",
94110
)
95111

112+
rules_jvm_external_tag = "2.9"
113+
114+
rules_jvm_external_sha256 = "e5b97a31a3e8feed91636f42e19b11c49487b85e5de2f387c999ea14d77c7f45"
115+
96116
http_archive(
97117
name = "rules_jvm_external",
98-
sha256 = "e5b97a31a3e8feed91636f42e19b11c49487b85e5de2f387c999ea14d77c7f45",
99-
strip_prefix = "rules_jvm_external-2.9",
100-
url = "https://github.com/bazelbuild/rules_jvm_external/archive/2.9.zip",
118+
sha256 = rules_jvm_external_sha256,
119+
strip_prefix = "rules_jvm_external-{}".format(rules_jvm_external_tag),
120+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/{}.zip".format(rules_jvm_external_tag),
101121
)
102122

103123
load("//rules/scala:workspace.bzl", "scala_register_toolchains", "scala_repositories")

scripts/format.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ else
1717
fi
1818

1919
if [ "$1" != check ]; then
20-
bazel build buildifier
20+
bazel run buildifier
2121
else
22-
bazel build buildifier_check
22+
bazel run buildifier_check
2323
fi

tests/WORKSPACE

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,30 @@ workspace(name = "rules_scala_annex_test")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
44
load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
5-
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
65

7-
git_repository(
6+
bazel_skylib_tag = "1.0.2"
7+
8+
bazel_skylib_sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44"
9+
10+
http_archive(
811
name = "bazel_skylib",
9-
remote = "https://github.com/bazelbuild/bazel-skylib.git",
10-
tag = "0.8.0",
12+
sha256 = bazel_skylib_sha256,
13+
urls = [
14+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{tag}/bazel-skylib-{tag}.tar.gz".format(tag = bazel_skylib_tag),
15+
"https://github.com/bazelbuild/bazel-skylib/releases/download/{tag}/bazel-skylib-{tag}.tar.gz".format(tag = bazel_skylib_tag),
16+
],
1117
)
1218

19+
protobuf_tag = "3.10.1"
20+
21+
protobuf_sha256 = "678d91d8a939a1ef9cb268e1f20c14cd55e40361dc397bb5881e4e1e532679b1"
22+
1323
http_archive(
1424
name = "com_google_protobuf",
15-
sha256 = "8eb5ca331ab8ca0da2baea7fc0607d86c46c80845deca57109a5d637ccb93bb4",
16-
strip_prefix = "protobuf-3.9.0",
17-
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.9.0.zip"],
25+
sha256 = protobuf_sha256,
26+
strip_prefix = "protobuf-{}".format(protobuf_tag),
27+
type = "zip",
28+
url = "https://github.com/protocolbuffers/protobuf/archive/v{}.zip".format(protobuf_tag),
1829
)
1930

2031
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
@@ -55,11 +66,15 @@ local_repository(
5566
path = "../",
5667
)
5768

69+
rules_jvm_external_tag = "2.9"
70+
71+
rules_jvm_external_sha256 = "e5b97a31a3e8feed91636f42e19b11c49487b85e5de2f387c999ea14d77c7f45"
72+
5873
http_archive(
5974
name = "rules_jvm_external",
60-
sha256 = "e5b97a31a3e8feed91636f42e19b11c49487b85e5de2f387c999ea14d77c7f45",
61-
strip_prefix = "rules_jvm_external-2.9",
62-
url = "https://github.com/bazelbuild/rules_jvm_external/archive/2.9.zip",
75+
sha256 = rules_jvm_external_sha256,
76+
strip_prefix = "rules_jvm_external-{}".format(rules_jvm_external_tag),
77+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/{}.zip".format(rules_jvm_external_tag),
6378
)
6479

6580
load(

0 commit comments

Comments
 (0)