diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2019-10-29 21:50:32 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2019-10-30 07:24:13 +0100 |
| commit | 52169c6d3c833b37f63926ccf3392d59d9b3757b (patch) | |
| tree | 2072469f82f98b2c4226765bd4ad63bf2fe80ef8 | |
| parent | 448f627f418076b34295aa98422e0af167321161 (diff) | |
| parent | 4c79944d5b8fdd19516b11be89c74f5e6381f963 (diff) | |
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Bump Bazel version to 1.1.0
Change-Id: I4a4716d5d77167f6b524177de48933b16c4c9c5d
| -rw-r--r-- | .bazelversion | 2 | ||||
| -rw-r--r-- | WORKSPACE | 31 |
2 files changed, 1 insertions, 32 deletions
diff --git a/.bazelversion b/.bazelversion index 3eefcb9dd5..9084fa2f71 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -1.0.0 +1.1.0 @@ -72,37 +72,6 @@ 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, |