diff options
| author | Eugene Kliuchnikov <eustas.ru@gmail.com> | 2020-03-31 14:38:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 14:38:01 +0200 |
| commit | f83aa5169e3c09afa8db84d1180fd1fe8813118a (patch) | |
| tree | 12bf26b065693340e0470a6c56a1dc5a4ebec872 /java | |
| parent | 924b2b2b9dc54005edbcd85a1b872330948cdd9e (diff) | |
| download | brotli-f83aa5169e3c09afa8db84d1180fd1fe8813118a.zip brotli-f83aa5169e3c09afa8db84d1180fd1fe8813118a.tar.gz brotli-f83aa5169e3c09afa8db84d1180fd1fe8813118a.tar.bz2 | |
Update bazel to 2.2 + update config (#798)
Newer bazel does not support `maven_jar` rule anymore...
Diffstat (limited to 'java')
| -rw-r--r-- | java/WORKSPACE | 20 | ||||
| -rw-r--r-- | java/org/brotli/dec/BUILD | 2 | ||||
| -rw-r--r-- | java/org/brotli/wrapper/common/BUILD | 2 | ||||
| -rw-r--r-- | java/org/brotli/wrapper/dec/BUILD | 2 | ||||
| -rw-r--r-- | java/org/brotli/wrapper/enc/BUILD | 2 |
5 files changed, 20 insertions, 8 deletions
diff --git a/java/WORKSPACE b/java/WORKSPACE index 06fbdfe..6f9902a 100644 --- a/java/WORKSPACE +++ b/java/WORKSPACE @@ -5,12 +5,24 @@ local_repository( 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 @@ licenses(["notice"]) # MIT 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 @@ java_library( "//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 @@ java_library( ":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 @@ java_library( "//org/brotli/integration:brotli_jni_test_base", "//org/brotli/integration:bundle_helper", "//org/brotli/wrapper/dec", - "@junit_junit//jar", + "@maven//:junit_junit", ], ) |