summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2019-10-12 23:13:39 +0200
committerDavid Ostrovsky <david@ostrovsky.org>2019-10-13 20:13:37 +0200
commit795763be2b8ce5249269ba40ef6cfb0d080d9529 (patch)
tree537ad02a0389d03095a2d3418f9c4e046720a866
parent39f4f5b20c77e5344fef895baa155d57bd27a32b (diff)
Bazel: Bump java_tools version to 6.0
This upgrade of java_tools is needed to remove Java 7 compatibility mode for java_proto_library rules. This was done in this CL: [1], that is included in java_tools release 6.0. [1] https://github.com/bazelbuild/bazel/pull/9450 Bug: Issue 11102 Change-Id: Ic0043544d238ee5cc2dcaf67ff1db9d8a5397bfa
-rw-r--r--WORKSPACE31
1 files changed, 31 insertions, 0 deletions
diff --git a/WORKSPACE b/WORKSPACE
index 2530dd4f60..58cad335f4 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -72,6 +72,37 @@ load("//lib/codemirror:cm.bzl", "CM_VERSION", "DIFF_MATCH_PATCH_VERSION")
ANTLR_VERS = "3.5.2"
+# TODO(davido): Remove this upgrade, when new Bazel version is released
+# that includes java_tools v6.0. FTR, we are doing this to get this change
+# https://github.com/bazelbuild/bazel/pull/9450, to fix this annoying bug:
+# https://github.com/bazelbuild/bazel/issues/8772.
+http_archive(
+ name = "remote_java_tools_linux",
+ sha256 = "37acb8380b1dd6c31fd27a19bf3da821c9b02ee93c6163fce36f070a806516b5",
+ urls = [
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.0/java_tools_javac11_linux-v6.0.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/javac11-v6.0/java_tools_javac11_linux-v6.0.zip",
+ ],
+)
+
+http_archive(
+ name = "remote_java_tools_windows",
+ sha256 = "384e138ca58842ea563fb7efbe0cb9c5c381bd4de1f6a31f0256823325f81ccc",
+ urls = [
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.0/java_tools_javac11_windows-v6.0.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/javac11-v6.0/java_tools_javac11_windows-v6.0.zip",
+ ],
+)
+
+http_archive(
+ name = "remote_java_tools_darwin",
+ sha256 = "5a9f320c33424262e505151dd5c6903e36678a0f0bbdaae67bcf07f41d8c7cf3",
+ urls = [
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.0/java_tools_javac11_darwin-v6.0.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/javac11-v6.0/java_tools_javac11_darwin-v6.0.zip",
+ ],
+)
+
maven_jar(
name = "java-runtime",
artifact = "org.antlr:antlr-runtime:" + ANTLR_VERS,