From 61e8eda72f8cafcecf8b2aef0ef62dd58bfa953d Mon Sep 17 00:00:00 2001 From: Simon Stewart Date: Thu, 4 Jul 2024 14:02:59 +0100 Subject: [PATCH] Prepare for rules_jvm_external 6.2 (#1174) --- MODULE.bazel | 15 +- WORKSPACE | 2 +- repositories.bzl | 6 +- tests/bazel_run_tests.sh | 6 +- ...ocal_testing_with_pinned_file_install.json | 132 +++++++++++++++++- 5 files changed, 140 insertions(+), 21 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 2fce3cd43..8ca13490e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,21 +1,20 @@ module( name = "rules_jvm_external", - version = "6.1", + version = "6.2", bazel_compatibility = [">=7.0.0"], - compatibility_level = 2, ) bazel_dep( name = "bazel_features", - version = "1.11.0", + version = "1.13.0", ) bazel_dep( name = "bazel_skylib", - version = "1.6.1", + version = "1.7.1", ) bazel_dep( name = "platforms", - version = "0.0.8", + version = "0.0.10", ) bazel_dep( name = "rules_java", @@ -23,7 +22,7 @@ bazel_dep( ) bazel_dep( name = "rules_kotlin", - version = "1.9.0", + version = "1.9.5", ) bazel_dep( name = "rules_android", @@ -31,7 +30,7 @@ bazel_dep( ) bazel_dep( name = "stardoc", - version = "0.5.6", + version = "0.7.0", repo_name = "io_bazel_stardoc", ) @@ -355,7 +354,7 @@ dev_maven.install( artifacts = [ # this is a test jar built for integration # tests in this repo - "com.example:kt:1.0.0", + "com.example:no-docs:1.0.0", ], lock_file = "//tests/custom_maven_install:m2local_testing_with_pinned_file_install.json", repositories = [ diff --git a/WORKSPACE b/WORKSPACE index 942288ec9..039fdf290 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -611,7 +611,7 @@ maven_install( artifacts = [ # this is a test jar built for integration # tests in this repo - "com.example:kt:1.0.0", + "com.example:no-docs:1.0.0", ], maven_install_json = "//tests/custom_maven_install:m2local_testing_with_pinned_file_install.json", repositories = [ diff --git a/repositories.bzl b/repositories.bzl index 1aa33ef6e..2faeaf835 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -17,10 +17,10 @@ def rules_jvm_external_deps( maybe( http_archive, name = "bazel_skylib", - sha256 = "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2", + sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", ], ) diff --git a/tests/bazel_run_tests.sh b/tests/bazel_run_tests.sh index d7ce7ee7e..8dd1b5153 100755 --- a/tests/bazel_run_tests.sh +++ b/tests/bazel_run_tests.sh @@ -118,7 +118,7 @@ function test_unpinned_m2local_testing_found_local_artifact_through_pin_and_buil rm -rf ${jar_dir} mkdir -p ${m2local_dir} # Publish a maven artifact locally - com.example.kt:1.0.0 - bazel run --define maven_repo="file://${m2local_dir}" //tests/integration/kt_jvm_export:test.publish >> "$TEST_LOG" 2>&1 + bazel run --define maven_repo="file://${m2local_dir}" //tests/integration/java_export:without-docs.publish >> "$TEST_LOG" 2>&1 # Force the repo rule to be evaluated again. Without this, the "assuming maven local..." message will not be printed bazel clean --expunge >/dev/null 2>&1 @@ -127,10 +127,10 @@ function test_unpinned_m2local_testing_found_local_artifact_through_pin_and_buil force_bzlmod_lock_file_to_be_regenerated - bazel build @m2local_testing_repin//:com_example_kt >> "$TEST_LOG" 2>&1 + bazel build @m2local_testing_repin//:com_example_no_docs >> "$TEST_LOG" 2>&1 rm -rf ${jar_dir} - expect_log "Assuming maven local for artifact: com.example:kt:1.0.0" + expect_log "Assuming maven local for artifact: com.example:no-docs:1.0.0" expect_log "Successfully pinned resolved artifacts" } diff --git a/tests/custom_maven_install/m2local_testing_with_pinned_file_install.json b/tests/custom_maven_install/m2local_testing_with_pinned_file_install.json index c3445a167..025ea5aae 100644 --- a/tests/custom_maven_install/m2local_testing_with_pinned_file_install.json +++ b/tests/custom_maven_install/m2local_testing_with_pinned_file_install.json @@ -1,20 +1,140 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1548015484, - "__RESOLVED_ARTIFACTS_HASH": 554185868, + "__INPUT_ARTIFACTS_HASH": 679501286, + "__RESOLVED_ARTIFACTS_HASH": -758906072, "artifacts": { - "com.example:kt": { + "com.example:no-docs": { "shasums": { - "jar": "9b91e08175af5e6189f1eedda552c02c0c38c5c9489d1a246609054a5a1fa34d" + "jar": "ab83d2b92bf20138822e8b9f6e8105be4636155c59c28dfe262f847c11b18e72" }, "version": "1.0.0" + }, + "com.google.code.findbugs:jsr305": { + "shasums": { + "jar": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7" + }, + "version": "3.0.2" + }, + "com.google.errorprone:error_prone_annotations": { + "shasums": { + "jar": "721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec" + }, + "version": "2.11.0" + }, + "com.google.guava:failureaccess": { + "shasums": { + "jar": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26" + }, + "version": "1.0.1" + }, + "com.google.guava:guava": { + "shasums": { + "jar": "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" + }, + "version": "31.1-jre" + }, + "com.google.guava:listenablefuture": { + "shasums": { + "jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99" + }, + "version": "9999.0-empty-to-avoid-conflict-with-guava" + }, + "com.google.j2objc:j2objc-annotations": { + "shasums": { + "jar": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b" + }, + "version": "1.3" + }, + "org.checkerframework:checker-qual": { + "shasums": { + "jar": "ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb" + }, + "version": "3.12.0" } }, - "dependencies": {}, + "dependencies": { + "com.example:no-docs": [ + "com.google.guava:guava" + ], + "com.google.guava:guava": [ + "com.google.code.findbugs:jsr305", + "com.google.errorprone:error_prone_annotations", + "com.google.guava:failureaccess", + "com.google.guava:listenablefuture", + "com.google.j2objc:j2objc-annotations", + "org.checkerframework:checker-qual" + ] + }, "m2local": true, "packages": { - "com.example:kt": [ + "com.example:no-docs": [ "com.jvm.external.jvm_export" + ], + "com.google.code.findbugs:jsr305": [ + "javax.annotation", + "javax.annotation.concurrent", + "javax.annotation.meta" + ], + "com.google.errorprone:error_prone_annotations": [ + "com.google.errorprone.annotations", + "com.google.errorprone.annotations.concurrent" + ], + "com.google.guava:failureaccess": [ + "com.google.common.util.concurrent.internal" + ], + "com.google.guava:guava": [ + "com.google.common.annotations", + "com.google.common.base", + "com.google.common.base.internal", + "com.google.common.cache", + "com.google.common.collect", + "com.google.common.escape", + "com.google.common.eventbus", + "com.google.common.graph", + "com.google.common.hash", + "com.google.common.html", + "com.google.common.io", + "com.google.common.math", + "com.google.common.net", + "com.google.common.primitives", + "com.google.common.reflect", + "com.google.common.util.concurrent", + "com.google.common.xml", + "com.google.thirdparty.publicsuffix" + ], + "com.google.j2objc:j2objc-annotations": [ + "com.google.j2objc.annotations" + ], + "org.checkerframework:checker-qual": [ + "org.checkerframework.checker.builder.qual", + "org.checkerframework.checker.calledmethods.qual", + "org.checkerframework.checker.compilermsgs.qual", + "org.checkerframework.checker.fenum.qual", + "org.checkerframework.checker.formatter.qual", + "org.checkerframework.checker.guieffect.qual", + "org.checkerframework.checker.i18n.qual", + "org.checkerframework.checker.i18nformatter.qual", + "org.checkerframework.checker.index.qual", + "org.checkerframework.checker.initialization.qual", + "org.checkerframework.checker.interning.qual", + "org.checkerframework.checker.lock.qual", + "org.checkerframework.checker.nullness.qual", + "org.checkerframework.checker.optional.qual", + "org.checkerframework.checker.propkey.qual", + "org.checkerframework.checker.regex.qual", + "org.checkerframework.checker.signature.qual", + "org.checkerframework.checker.signedness.qual", + "org.checkerframework.checker.tainting.qual", + "org.checkerframework.checker.units.qual", + "org.checkerframework.common.aliasing.qual", + "org.checkerframework.common.initializedfields.qual", + "org.checkerframework.common.reflection.qual", + "org.checkerframework.common.returnsreceiver.qual", + "org.checkerframework.common.subtyping.qual", + "org.checkerframework.common.util.report.qual", + "org.checkerframework.common.value.qual", + "org.checkerframework.dataflow.qual", + "org.checkerframework.framework.qual" ] }, "repositories": {