Skip to content

Commit 6076aa3

Browse files
Merge pull request #36 from comius:java-repositories-4.0.0
PiperOrigin-RevId: 352985565 Change-Id: I670b8d7f5a278a79e394cc23e7521dd66b421aba
2 parents b13e8fc + b4dc9c8 commit 6076aa3

File tree

2 files changed

+10
-86
lines changed

2 files changed

+10
-86
lines changed

java/defs.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
_MIGRATION_TAG = "__JAVA_RULES_MIGRATION_DO_NOT_USE_WILL_BREAK__"
1717

18-
version = "3.7.2"
18+
version = "4.0.0"
1919

2020
def _add_tags(attrs):
2121
if "tags" in attrs and attrs["tags"] != None:

java/repositories.bzl

Lines changed: 9 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -26,108 +26,32 @@
2626
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2727
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
2828

29-
def java_tools_javac9_repos():
30-
maybe(
31-
http_archive,
32-
name = "remote_java_tools_javac9_linux",
33-
sha256 = "0bf678d9815c7212564ecc99b3bd3643450c17657becb12a7bbedcf97ece740d",
34-
urls = [
35-
"https://mirror.bazel.build/bazel_java_tools/releases/javac9/v3.0/java_tools_javac9_linux-v3.0.zip",
36-
],
37-
)
38-
maybe(
39-
http_archive,
40-
name = "remote_java_tools_javac9_windows",
41-
sha256 = "9b7e8de98ed2d64ea20a7512f986028ca6375b0fce7637f8d05d1517e7890867",
42-
urls = [
43-
"https://mirror.bazel.build/bazel_java_tools/releases/javac9/v3.0/java_tools_javac9_windows-v3.0.zip",
44-
],
45-
)
46-
maybe(
47-
http_archive,
48-
name = "remote_java_tools_javac9_macos",
49-
sha256 = "13a94ddf0c421332f0d3be1adbfc833e24a3a3715bab8f1152660f2df81e286a",
50-
urls = [
51-
"https://mirror.bazel.build/bazel_java_tools/releases/javac9/v3.0/java_tools_javac9_darwin-v3.0.zip",
52-
],
53-
)
54-
55-
def java_tools_javac10_repos():
56-
maybe(
57-
http_archive,
58-
name = "remote_java_tools_javac10_linux",
59-
sha256 = "d4fbed2bb22634835e42568c2d26df34fdd7281d9a7061c537f32c9970316e38",
60-
urls = [
61-
"https://mirror.bazel.build/bazel_java_tools/releases/javac10/v5.0/java_tools_javac10_linux-v5.0.zip",
62-
],
63-
)
64-
maybe(
65-
http_archive,
66-
name = "remote_java_tools_javac10_windows",
67-
sha256 = "ee3192ca33c1249ed785c755f84b5a989c22b4a6ca4cb1d7a37dd94104a9999d",
68-
urls = [
69-
"https://mirror.bazel.build/bazel_java_tools/releases/javac10/v5.0/java_tools_javac10_windows-v5.0.zip",
70-
],
71-
)
72-
maybe(
73-
http_archive,
74-
name = "remote_java_tools_javac10_macos",
75-
sha256 = "d9311bdccb5cfcc8783b70b81a50ca72029fb35a19295dd056a7f7050d71033f",
76-
urls = [
77-
"https://mirror.bazel.build/bazel_java_tools/releases/javac10/v5.0/java_tools_javac10_darwin-v5.0.zip",
78-
],
79-
)
80-
8129
def java_tools_javac11_repos():
8230
maybe(
8331
http_archive,
8432
name = "remote_java_tools_linux",
85-
sha256 = "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
33+
sha256 = "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639",
8634
urls = [
87-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip",
88-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip",
35+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip",
36+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip",
8937
],
9038
)
9139
maybe(
9240
http_archive,
9341
name = "remote_java_tools_windows",
94-
sha256 = "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
42+
sha256 = "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59",
9543
urls = [
96-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip",
97-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip",
44+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip",
45+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip",
9846
],
9947
)
10048
maybe(
10149
http_archive,
10250
name = "remote_java_tools_darwin",
103-
sha256 = "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
104-
urls = [
105-
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip",
106-
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip",
107-
],
108-
)
109-
110-
def java_tools_javac12_repos():
111-
maybe(
112-
http_archive,
113-
name = "remote_java_tools_javac12_linux",
114-
sha256 = "fc199be2c7873b0792e00743679fedc1d249fa779c3fe7676111f8d7ced9f2b4",
115-
urls = ["https://mirror.bazel.build/bazel_java_tools/releases/javac12/v2.0/java_tools_javac12_linux-v2.0.zip"],
116-
)
117-
maybe(
118-
http_archive,
119-
name = "remote_java_tools_javac12_windows",
120-
sha256 = "cab191830609838e99c9adc5e9628e8c839305674c5a9ecf1eea4ba0f6c0b0aa",
121-
urls = [
122-
"https://mirror.bazel.build/bazel_java_tools/releases/javac12/v2.0/java_tools_javac12_windows-v2.0.zip",
123-
],
124-
)
125-
maybe(
126-
http_archive,
127-
name = "remote_java_tools_javac12_macos",
128-
sha256 = "d73ff1de1fc2d3ea8403d54099dd2247a2a87390107e7cf81e3a383b0c687341",
51+
sha256 = "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f",
12952
urls = [
130-
"https://mirror.bazel.build/bazel_java_tools/releases/javac12/v2.0/java_tools_javac12_darwin-v2.0.zip",
53+
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip",
54+
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip",
13155
],
13256
)
13357

0 commit comments

Comments
 (0)