From 898e25cfb84bb594581376743331aed058017c4e Mon Sep 17 00:00:00 2001 From: odisseus Date: Tue, 28 Feb 2023 03:32:13 +0100 Subject: [PATCH 01/11] Initial Bazel build definition --- .github/workflows/ant.yml | 23 ------------- .gitignore | 4 +++ BUILD.bazel | 10 ++++++ WORKSPACE | 34 +++++++++++++++++++ src/main/java/io/ipfs/api/BUILD.bazel | 11 ++++++ src/main/java/io/ipfs/api/cbor/BUILD.bazel | 8 +++++ .../java/io/ipfs/api/cbor/CborDecoder.java | 3 +- src/main/java/io/ipfs/api/demo/BUILD.bazel | 9 +++++ src/test/BUILD.bazel | 15 ++++++++ src/test/java/io/ipfs/api/BUILD.bazel | 12 +++++++ src/test/test_utils.bzl | 14 ++++++++ 11 files changed, 119 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/ant.yml create mode 100644 BUILD.bazel create mode 100644 WORKSPACE create mode 100644 src/main/java/io/ipfs/api/BUILD.bazel create mode 100644 src/main/java/io/ipfs/api/cbor/BUILD.bazel create mode 100644 src/main/java/io/ipfs/api/demo/BUILD.bazel create mode 100644 src/test/BUILD.bazel create mode 100644 src/test/java/io/ipfs/api/BUILD.bazel create mode 100644 src/test/test_utils.bzl diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml deleted file mode 100644 index ab333ab5..00000000 --- a/.github/workflows/ant.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Java CI - -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 11 - - name: Install and run ipfs - run: ./install-run-ipfs.sh - - name: Build with Ant - run: ant -noinput -buildfile build.xml dist - - name: Run tests - timeout-minutes: 10 - run: ant -noinput -buildfile build.xml test diff --git a/.gitignore b/.gitignore index 4a26892b..7e3b8cc2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ TEST-io.ipfs.api.APITest.* .idea/* api.iml +# Bazel +/bazel-* +/.ijwb/ + diff --git a/BUILD.bazel b/BUILD.bazel new file mode 100644 index 00000000..d4250c80 --- /dev/null +++ b/BUILD.bazel @@ -0,0 +1,10 @@ +java_library ( + name = "maven_deps", + visibility = ["//visibility:public"], + exports = [ + "@maven//:com_github_multiformats_java_multiaddr", + "@maven//:com_github_multiformats_java_multihash", + "@maven//:com_github_multiformats_java_multibase", + "@maven//:com_github_ipld_java_cid", + ], +) \ No newline at end of file diff --git a/WORKSPACE b/WORKSPACE new file mode 100644 index 00000000..924c42c8 --- /dev/null +++ b/WORKSPACE @@ -0,0 +1,34 @@ +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +RULES_JVM_EXTERNAL_TAG = "4.5" +RULES_JVM_EXTERNAL_SHA = "b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6" + +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("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") + +rules_jvm_external_deps() + +load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") + +rules_jvm_external_setup() + +load("@rules_jvm_external//:defs.bzl", "maven_install") + +maven_install( + artifacts = [ + "junit:junit:4.13.2", + "org.hamcrest:hamcrest:2.2", + "com.github.multiformats:java-multiaddr:v1.4.10", + ], + repositories = [ + # Private repositories are supported through HTTP Basic auth + "https://jitpack.io", + "https://repo1.maven.org/maven2", + ], +) \ No newline at end of file diff --git a/src/main/java/io/ipfs/api/BUILD.bazel b/src/main/java/io/ipfs/api/BUILD.bazel new file mode 100644 index 00000000..b67824c5 --- /dev/null +++ b/src/main/java/io/ipfs/api/BUILD.bazel @@ -0,0 +1,11 @@ +java_library ( + name = "core", + visibility = ["//visibility:public"], + srcs = glob(["*.java"]), + deps = [ + "//src/main/java/io/ipfs/api/cbor:cbor", + "//:maven_deps", + ], +) + +#TODO generate a distribution JAR with all the classes and the manifest \ No newline at end of file diff --git a/src/main/java/io/ipfs/api/cbor/BUILD.bazel b/src/main/java/io/ipfs/api/cbor/BUILD.bazel new file mode 100644 index 00000000..3e476e01 --- /dev/null +++ b/src/main/java/io/ipfs/api/cbor/BUILD.bazel @@ -0,0 +1,8 @@ +java_library ( + name = "cbor", + visibility = ["//visibility:public"], + srcs = glob(["*.java"]), + deps = [ + "//:maven_deps", + ], +) \ No newline at end of file diff --git a/src/main/java/io/ipfs/api/cbor/CborDecoder.java b/src/main/java/io/ipfs/api/cbor/CborDecoder.java index 1229ccf6..cc735cb5 100644 --- a/src/main/java/io/ipfs/api/cbor/CborDecoder.java +++ b/src/main/java/io/ipfs/api/cbor/CborDecoder.java @@ -7,6 +7,7 @@ */ import java.io.*; +import java.util.Arrays; import static io.ipfs.api.cbor.CborConstants.*; import static io.ipfs.api.cbor.CborType.*; @@ -30,7 +31,7 @@ public CborDecoder(InputStream is) { } private static void fail(String msg, Object... args) throws IOException { - throw new IOException(msg + args); + throw new IOException(msg + Arrays.toString(args)); } private static String lengthToString(int len) { diff --git a/src/main/java/io/ipfs/api/demo/BUILD.bazel b/src/main/java/io/ipfs/api/demo/BUILD.bazel new file mode 100644 index 00000000..305f17d1 --- /dev/null +++ b/src/main/java/io/ipfs/api/demo/BUILD.bazel @@ -0,0 +1,9 @@ +java_binary ( + name = "demo", + srcs = glob(["*.java"]), + main_class = "io.ipfs.api.demo.UsageMFSFilesAPI", + deps = [ + "//src/main/java/io/ipfs/api:core", + "//:maven_deps", + ], +) \ No newline at end of file diff --git a/src/test/BUILD.bazel b/src/test/BUILD.bazel new file mode 100644 index 00000000..8843a394 --- /dev/null +++ b/src/test/BUILD.bazel @@ -0,0 +1,15 @@ +load(":test_utils.bzl", "junit_test") + +filegroup( + name = "test-resources", + srcs = glob([ + "resources/**", + ]), +) + +junit_test(test_class = "io.ipfs.api.AddTest") +junit_test(test_class = "io.ipfs.api.APITest") +junit_test(test_class = "io.ipfs.api.RecursiveAddTest") +junit_test(test_class = "io.ipfs.api.SimpleAddTest") +junit_test(test_class = "io.ipfs.api.VersionsTest") + diff --git a/src/test/java/io/ipfs/api/BUILD.bazel b/src/test/java/io/ipfs/api/BUILD.bazel new file mode 100644 index 00000000..35551e7e --- /dev/null +++ b/src/test/java/io/ipfs/api/BUILD.bazel @@ -0,0 +1,12 @@ +java_library ( + name = "test-core", + visibility = ["//visibility:public"], + srcs = glob(["*.java"]), + deps = [ + "//src/main/java/io/ipfs/api:core", + "//src/main/java/io/ipfs/api/cbor:cbor", + "//:maven_deps", + "@maven//:junit_junit", + "@maven//:org_hamcrest_hamcrest", + ], +) \ No newline at end of file diff --git a/src/test/test_utils.bzl b/src/test/test_utils.bzl new file mode 100644 index 00000000..156086ab --- /dev/null +++ b/src/test/test_utils.bzl @@ -0,0 +1,14 @@ +def junit_test(test_class): + native.java_test( + name = test_class, + test_class = test_class, + runtime_deps = [ + "//src/test/java/io/ipfs/api:test-core", + ], + data = [ + "//src/test:test-resources", + ], + jvm_flags = [ + "-Djava.security.manager=allow", + ] + ) \ No newline at end of file From c12cdb8c98ac8ce655a53fd6288d5041e718f1d4 Mon Sep 17 00:00:00 2001 From: odisseus Date: Wed, 27 Dec 2023 13:30:07 +0100 Subject: [PATCH 02/11] Temporary change to exclude encoding problems. --- .../test/resources/folder/changeme.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename "src/test/resources/folder/\344\275\240\345\245\275.html" => src/test/resources/folder/changeme.html (100%) diff --git "a/src/test/resources/folder/\344\275\240\345\245\275.html" b/src/test/resources/folder/changeme.html similarity index 100% rename from "src/test/resources/folder/\344\275\240\345\245\275.html" rename to src/test/resources/folder/changeme.html From 793177ae41b19ac0f3b81d5c9dd116f0e5bc25ed Mon Sep 17 00:00:00 2001 From: odisseus Date: Wed, 27 Dec 2023 14:30:30 +0100 Subject: [PATCH 03/11] Set Bazel version to 4.1.0 --- .bazelversion | 1 + 1 file changed, 1 insertion(+) create mode 100644 .bazelversion diff --git a/.bazelversion b/.bazelversion new file mode 100644 index 00000000..ee74734a --- /dev/null +++ b/.bazelversion @@ -0,0 +1 @@ +4.1.0 From 8690035d1597f308a59416c6bfb61086381f62b4 Mon Sep 17 00:00:00 2001 From: odisseus Date: Fri, 5 Jan 2024 17:55:53 +0100 Subject: [PATCH 04/11] linter fix --- src/test/java/io/ipfs/api/APITest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/io/ipfs/api/APITest.java b/src/test/java/io/ipfs/api/APITest.java index adf53935..2e12a52f 100644 --- a/src/test/java/io/ipfs/api/APITest.java +++ b/src/test/java/io/ipfs/api/APITest.java @@ -939,7 +939,7 @@ public void addArgsTest() { } // this api is disabled until deployment over IPFS is enabled - public void updateTest() throws IOException { + private void updateTest() throws IOException { Object check = ipfs.update.check(); Object update = ipfs.update(); } From 67c650922cf64cbc4cea191b8a81d8ae29dbf307 Mon Sep 17 00:00:00 2001 From: odisseus Date: Fri, 5 Jan 2024 17:59:24 +0100 Subject: [PATCH 05/11] failing test --- src/test/java/io/ipfs/api/APITest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/io/ipfs/api/APITest.java b/src/test/java/io/ipfs/api/APITest.java index 2e12a52f..aa4da156 100644 --- a/src/test/java/io/ipfs/api/APITest.java +++ b/src/test/java/io/ipfs/api/APITest.java @@ -938,6 +938,11 @@ public void addArgsTest() { assertEquals("args toQueryString() format", "inline=true&cid-version=1", queryStr); } + @Test + public void failOnPurposeTest() { + assertEquals(1, 2); + } + // this api is disabled until deployment over IPFS is enabled private void updateTest() throws IOException { Object check = ipfs.update.check(); From e7a4ad635b669a66901103dfd31035e03c2a60b4 Mon Sep 17 00:00:00 2001 From: odisseus Date: Tue, 9 Jan 2024 10:25:34 +0100 Subject: [PATCH 06/11] no security manager --- src/test/test_utils.bzl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/test/test_utils.bzl b/src/test/test_utils.bzl index 156086ab..feaa329e 100644 --- a/src/test/test_utils.bzl +++ b/src/test/test_utils.bzl @@ -8,7 +8,4 @@ def junit_test(test_class): data = [ "//src/test:test-resources", ], - jvm_flags = [ - "-Djava.security.manager=allow", - ] - ) \ No newline at end of file + ) From ac65e0879eab327cda157a3ce5af00dc311368c5 Mon Sep 17 00:00:00 2001 From: odisseus Date: Mon, 15 Jan 2024 04:54:13 +0100 Subject: [PATCH 07/11] Defined multiaddr as a source dependency from an external Git repository --- BUILD.bazel | 1 - WORKSPACE | 29 +++++++++++++++++++++- src/main/java/io/ipfs/api/BUILD.bazel | 1 + src/main/java/io/ipfs/api/cbor/BUILD.bazel | 1 + src/main/java/io/ipfs/api/demo/BUILD.bazel | 1 + src/test/java/io/ipfs/api/BUILD.bazel | 1 + 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index d4250c80..c4e14c14 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -2,7 +2,6 @@ java_library ( name = "maven_deps", visibility = ["//visibility:public"], exports = [ - "@maven//:com_github_multiformats_java_multiaddr", "@maven//:com_github_multiformats_java_multihash", "@maven//:com_github_multiformats_java_multibase", "@maven//:com_github_ipld_java_cid", diff --git a/WORKSPACE b/WORKSPACE index 924c42c8..ae11e5a5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -24,11 +24,38 @@ maven_install( artifacts = [ "junit:junit:4.13.2", "org.hamcrest:hamcrest:2.2", - "com.github.multiformats:java-multiaddr:v1.4.10", + "com.github.ipld:java-cid:v1.3.8", ], repositories = [ # Private repositories are supported through HTTP Basic auth "https://jitpack.io", "https://repo1.maven.org/maven2", ], +) + +load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository") + +MULTIADDR_BUILD_FILE = """ +filegroup( + name = "main_srcs", + srcs = glob(["src/main/java/**"]), +) + +java_library( + name = "core", + srcs = [":main_srcs"], + deps = [ + "@maven//:com_github_multiformats_java_multihash", + "@maven//:com_github_multiformats_java_multibase", + "@maven//:com_github_ipld_java_cid", + ], + visibility = ["//visibility:public"], +) +""" + +new_git_repository( + name = "multiaddr", + remote = "https://github.com/multiformats/java-multiaddr.git", + tag = "v1.4.12", + build_file_content = MULTIADDR_BUILD_FILE, ) \ No newline at end of file diff --git a/src/main/java/io/ipfs/api/BUILD.bazel b/src/main/java/io/ipfs/api/BUILD.bazel index b67824c5..98702a83 100644 --- a/src/main/java/io/ipfs/api/BUILD.bazel +++ b/src/main/java/io/ipfs/api/BUILD.bazel @@ -3,6 +3,7 @@ java_library ( visibility = ["//visibility:public"], srcs = glob(["*.java"]), deps = [ + "@multiaddr//:core", "//src/main/java/io/ipfs/api/cbor:cbor", "//:maven_deps", ], diff --git a/src/main/java/io/ipfs/api/cbor/BUILD.bazel b/src/main/java/io/ipfs/api/cbor/BUILD.bazel index 3e476e01..8f8fab3d 100644 --- a/src/main/java/io/ipfs/api/cbor/BUILD.bazel +++ b/src/main/java/io/ipfs/api/cbor/BUILD.bazel @@ -4,5 +4,6 @@ java_library ( srcs = glob(["*.java"]), deps = [ "//:maven_deps", + "@multiaddr//:core", ], ) \ No newline at end of file diff --git a/src/main/java/io/ipfs/api/demo/BUILD.bazel b/src/main/java/io/ipfs/api/demo/BUILD.bazel index 305f17d1..da6eec44 100644 --- a/src/main/java/io/ipfs/api/demo/BUILD.bazel +++ b/src/main/java/io/ipfs/api/demo/BUILD.bazel @@ -5,5 +5,6 @@ java_binary ( deps = [ "//src/main/java/io/ipfs/api:core", "//:maven_deps", + "@multiaddr//:core", ], ) \ No newline at end of file diff --git a/src/test/java/io/ipfs/api/BUILD.bazel b/src/test/java/io/ipfs/api/BUILD.bazel index 35551e7e..3650b12c 100644 --- a/src/test/java/io/ipfs/api/BUILD.bazel +++ b/src/test/java/io/ipfs/api/BUILD.bazel @@ -3,6 +3,7 @@ java_library ( visibility = ["//visibility:public"], srcs = glob(["*.java"]), deps = [ + "@multiaddr//:core", "//src/main/java/io/ipfs/api:core", "//src/main/java/io/ipfs/api/cbor:cbor", "//:maven_deps", From 403c24ae6121378dded9617ea2a54734196ac428 Mon Sep 17 00:00:00 2001 From: odisseus Date: Mon, 15 Jan 2024 08:20:00 +0100 Subject: [PATCH 08/11] Converted multihash, multibase, and cid to source dependencies --- BUILD.bazel | 11 ++-- WORKSPACE | 74 ++++++++++++++++++++-- src/main/java/io/ipfs/api/BUILD.bazel | 4 +- src/main/java/io/ipfs/api/cbor/BUILD.bazel | 3 +- src/main/java/io/ipfs/api/demo/BUILD.bazel | 3 +- src/test/java/io/ipfs/api/BUILD.bazel | 7 +- 6 files changed, 86 insertions(+), 16 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index c4e14c14..cd7a4099 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,9 +1,8 @@ java_library ( - name = "maven_deps", - visibility = ["//visibility:public"], + name = "maven_test_deps", + visibility = ["//src/test/java:__subpackages__"], exports = [ - "@maven//:com_github_multiformats_java_multihash", - "@maven//:com_github_multiformats_java_multibase", - "@maven//:com_github_ipld_java_cid", - ], + "@maven//:junit_junit", + "@maven//:org_hamcrest_hamcrest", + ], ) \ No newline at end of file diff --git a/WORKSPACE b/WORKSPACE index ae11e5a5..080e84e2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -24,7 +24,6 @@ maven_install( artifacts = [ "junit:junit:4.13.2", "org.hamcrest:hamcrest:2.2", - "com.github.ipld:java-cid:v1.3.8", ], repositories = [ # Private repositories are supported through HTTP Basic auth @@ -45,9 +44,9 @@ java_library( name = "core", srcs = [":main_srcs"], deps = [ - "@maven//:com_github_multiformats_java_multihash", - "@maven//:com_github_multiformats_java_multibase", - "@maven//:com_github_ipld_java_cid", + "@multihash//:core", + "@multibase//:core", + "@cid//:core", ], visibility = ["//visibility:public"], ) @@ -58,4 +57,71 @@ new_git_repository( remote = "https://github.com/multiformats/java-multiaddr.git", tag = "v1.4.12", build_file_content = MULTIADDR_BUILD_FILE, +) + +MULTIHASH_BUILD_FILE = """ +filegroup( + name = "main_srcs", + srcs = glob(["src/main/java/**"]), +) + +java_library( + name = "core", + srcs = [":main_srcs"], + deps = [ + "@multibase//:core", + ], + visibility = ["//visibility:public"], +) +""" + +new_git_repository( + name = "multihash", + remote = "https://github.com/multiformats/java-multihash.git", + tag = "v1.3.4", + build_file_content = MULTIHASH_BUILD_FILE, +) + +MULTIBASE_BUILD_FILE = """ +filegroup( + name = "main_srcs", + srcs = glob(["src/main/java/**"]), +) + +java_library( + name = "core", + srcs = [":main_srcs"], + visibility = ["//visibility:public"], +) +""" + +new_git_repository( + name = "multibase", + remote = "https://github.com/multiformats/java-multibase.git", + tag = "v1.1.1", + build_file_content = MULTIBASE_BUILD_FILE, +) + +CID_BUILD_FILE = """ +filegroup( + name = "main_srcs", + srcs = glob(["src/main/java/**"]), +) + +java_library( + name = "core", + srcs = [":main_srcs"], + deps = [ + "@multihash//:core", + "@multibase//:core", + ], + visibility = ["//visibility:public"], +) +""" + +new_git_repository( + name = "cid", + remote = "https://github.com/ipld/java-cid.git", + tag = "v1.3.8", + build_file_content = CID_BUILD_FILE, ) \ No newline at end of file diff --git a/src/main/java/io/ipfs/api/BUILD.bazel b/src/main/java/io/ipfs/api/BUILD.bazel index 98702a83..6f0fcfc5 100644 --- a/src/main/java/io/ipfs/api/BUILD.bazel +++ b/src/main/java/io/ipfs/api/BUILD.bazel @@ -4,8 +4,10 @@ java_library ( srcs = glob(["*.java"]), deps = [ "@multiaddr//:core", + "@multihash//:core", + "@multibase//:core", + "@cid//:core", "//src/main/java/io/ipfs/api/cbor:cbor", - "//:maven_deps", ], ) diff --git a/src/main/java/io/ipfs/api/cbor/BUILD.bazel b/src/main/java/io/ipfs/api/cbor/BUILD.bazel index 8f8fab3d..3c9419a7 100644 --- a/src/main/java/io/ipfs/api/cbor/BUILD.bazel +++ b/src/main/java/io/ipfs/api/cbor/BUILD.bazel @@ -3,7 +3,8 @@ java_library ( visibility = ["//visibility:public"], srcs = glob(["*.java"]), deps = [ - "//:maven_deps", "@multiaddr//:core", + "@multihash//:core", + "@cid//:core", ], ) \ No newline at end of file diff --git a/src/main/java/io/ipfs/api/demo/BUILD.bazel b/src/main/java/io/ipfs/api/demo/BUILD.bazel index da6eec44..f40eccb7 100644 --- a/src/main/java/io/ipfs/api/demo/BUILD.bazel +++ b/src/main/java/io/ipfs/api/demo/BUILD.bazel @@ -4,7 +4,8 @@ java_binary ( main_class = "io.ipfs.api.demo.UsageMFSFilesAPI", deps = [ "//src/main/java/io/ipfs/api:core", - "//:maven_deps", "@multiaddr//:core", + "@multihash//:core", + "@cid//:core", ], ) \ No newline at end of file diff --git a/src/test/java/io/ipfs/api/BUILD.bazel b/src/test/java/io/ipfs/api/BUILD.bazel index 3650b12c..ec158b96 100644 --- a/src/test/java/io/ipfs/api/BUILD.bazel +++ b/src/test/java/io/ipfs/api/BUILD.bazel @@ -4,10 +4,11 @@ java_library ( srcs = glob(["*.java"]), deps = [ "@multiaddr//:core", + "@multihash//:core", + "@multibase//:core", + "@cid//:core", "//src/main/java/io/ipfs/api:core", "//src/main/java/io/ipfs/api/cbor:cbor", - "//:maven_deps", - "@maven//:junit_junit", - "@maven//:org_hamcrest_hamcrest", + "//:maven_test_deps", ], ) \ No newline at end of file From b5be57ad6d2528f60ef951f99d4f444a87c97204 Mon Sep 17 00:00:00 2001 From: odisseus Date: Fri, 19 Jan 2024 11:39:25 +0100 Subject: [PATCH 09/11] bazel bump --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index ee74734a..831446cb 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -4.1.0 +5.1.0 From 4de98315e4b1267110db990493eaad643047e0a2 Mon Sep 17 00:00:00 2001 From: odisseus Date: Mon, 22 Jan 2024 13:01:44 +0100 Subject: [PATCH 10/11] Updated rules_jvm_external to version 6.0 --- WORKSPACE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 080e84e2..e4766e5a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,13 +1,13 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -RULES_JVM_EXTERNAL_TAG = "4.5" -RULES_JVM_EXTERNAL_SHA = "b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6" +RULES_JVM_EXTERNAL_TAG = "6.0" +RULES_JVM_EXTERNAL_SHA = "85fd6bad58ac76cc3a27c8e051e4255ff9ccd8c92ba879670d195622e7c0a9b7" 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, + url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG), ) load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") @@ -124,4 +124,4 @@ new_git_repository( remote = "https://github.com/ipld/java-cid.git", tag = "v1.3.8", build_file_content = CID_BUILD_FILE, -) \ No newline at end of file +) From a9c06da65b398022805febc8d5fcfc9331389939 Mon Sep 17 00:00:00 2001 From: odisseus Date: Mon, 22 Jan 2024 16:24:36 +0100 Subject: [PATCH 11/11] Revert "Updated rules_jvm_external to version 6.0" This reverts commit 4de98315e4b1267110db990493eaad643047e0a2. --- WORKSPACE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e4766e5a..080e84e2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,13 +1,13 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -RULES_JVM_EXTERNAL_TAG = "6.0" -RULES_JVM_EXTERNAL_SHA = "85fd6bad58ac76cc3a27c8e051e4255ff9ccd8c92ba879670d195622e7c0a9b7" +RULES_JVM_EXTERNAL_TAG = "4.5" +RULES_JVM_EXTERNAL_SHA = "b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6" 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/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG), + url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, ) load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") @@ -124,4 +124,4 @@ new_git_repository( remote = "https://github.com/ipld/java-cid.git", tag = "v1.3.8", build_file_content = CID_BUILD_FILE, -) +) \ No newline at end of file