Update bazel to 2.2 + update config (#798)
Newer bazel does not support `maven_jar` rule anymore...
diff --git a/.travis.yml b/.travis.yml
index 930bd63..47a1383 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -195,8 +195,7 @@
- os: osx
env: BUILD_SYSTEM=bazel
- # Latest image with Java 1.8 (required to install Bazel).
- osx_image: xcode9.3
+ osx_image: xcode11.3
language: java
before_install:
diff --git a/java/WORKSPACE b/java/WORKSPACE
index 06fbdfe..6f9902a 100644
--- a/java/WORKSPACE
+++ b/java/WORKSPACE
@@ -5,12 +5,24 @@
path = "..",
)
-maven_jar(
- name = "junit_junit",
- artifact = "junit:junit:4.12",
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
+
+RULES_JVM_EXTERNAL_TAG = "3.0"
+RULES_JVM_EXTERNAL_SHA = "62133c125bf4109dfd9d2af64830208356ce4ef8b165a6ef15bbff7460b35c3a"
+
+http_archive(
+ name = "rules_jvm_external",
+ strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
+ sha256 = RULES_JVM_EXTERNAL_SHA,
+ url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
)
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+load("@rules_jvm_external//:defs.bzl", "maven_install")
+
+maven_install(
+ artifacts = ["junit:junit:4.12"],
+ repositories = ["https://repo1.maven.org/maven2"],
+)
http_file(
name = "openjdk_jni_h",
diff --git a/java/org/brotli/dec/BUILD b/java/org/brotli/dec/BUILD
index 0cc0cbf..208642e 100644
--- a/java/org/brotli/dec/BUILD
+++ b/java/org/brotli/dec/BUILD
@@ -7,7 +7,7 @@
TEST_DEPS = [
":dec",
- "@junit_junit//jar",
+ "@maven//:junit_junit",
]
java_library(
diff --git a/java/org/brotli/wrapper/common/BUILD b/java/org/brotli/wrapper/common/BUILD
index 7c3480a..afe9bc5 100644
--- a/java/org/brotli/wrapper/common/BUILD
+++ b/java/org/brotli/wrapper/common/BUILD
@@ -30,7 +30,7 @@
"//org/brotli/dec",
"//org/brotli/integration:brotli_jni_test_base",
"//org/brotli/wrapper/dec",
- "@junit_junit//jar",
+ "@maven//:junit_junit",
],
)
diff --git a/java/org/brotli/wrapper/dec/BUILD b/java/org/brotli/wrapper/dec/BUILD
index d1c8f5b..4fd51d0 100644
--- a/java/org/brotli/wrapper/dec/BUILD
+++ b/java/org/brotli/wrapper/dec/BUILD
@@ -24,7 +24,7 @@
":dec",
"//org/brotli/integration:brotli_jni_test_base",
"//org/brotli/integration:bundle_helper",
- "@junit_junit//jar",
+ "@maven//:junit_junit",
],
)
diff --git a/java/org/brotli/wrapper/enc/BUILD b/java/org/brotli/wrapper/enc/BUILD
index 9aea6ba..22154d2 100644
--- a/java/org/brotli/wrapper/enc/BUILD
+++ b/java/org/brotli/wrapper/enc/BUILD
@@ -30,7 +30,7 @@
"//org/brotli/integration:brotli_jni_test_base",
"//org/brotli/integration:bundle_helper",
"//org/brotli/wrapper/dec",
- "@junit_junit//jar",
+ "@maven//:junit_junit",
],
)
diff --git a/scripts/.travis.sh b/scripts/.travis.sh
index 8b7e2b3..b5ad13a 100755
--- a/scripts/.travis.sh
+++ b/scripts/.travis.sh
@@ -6,7 +6,7 @@
"install")
case "${TRAVIS_OS_NAME}" in
"osx")
- brew update
+ brew update >/dev/null
brew install binutils
case "${CC}" in
@@ -17,8 +17,8 @@
case "${BUILD_SYSTEM}" in
"bazel")
+ brew cask install homebrew/cask-versions/adoptopenjdk8
brew install bazel
- brew upgrade python
;;
esac
;;
diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml
index e22a8c6..464da15 100644
--- a/scripts/appveyor.yml
+++ b/scripts/appveyor.yml
@@ -54,7 +54,7 @@
)
)
- IF "%BUILD_SYSTEM%"=="bazel" (
- appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.18.0/bazel-0.18.0-windows-x86_64.exe -FileName bazel.exe
+ appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/2.2.0/bazel-2.2.0-windows-x86_64.exe -FileName bazel.exe
)
before_build:
