diff --git a/MODULE.bazel b/MODULE.bazel index 6480fe7..51bdc39 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "bazel-diff", - version = "7.2.13", + version = "7.2.14", compatibility_level = 0, ) @@ -10,8 +10,9 @@ bazel_dep(name = "rules_java", version = "7.6.5") bazel_dep(name = "rules_kotlin", version = "1.9.1") bazel_dep(name = "rules_jvm_external", version = "6.0") -bazel_diff_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") -bazel_diff_maven.install( +maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") +maven.install( + name = "bazel_diff_maven", artifacts = [ "com.google.code.gson:gson:jar:2.9.0", "com.google.guava:guava:31.1-jre", @@ -27,6 +28,6 @@ bazel_diff_maven.install( lock_file = "//:maven_install.json", ) use_repo( - bazel_diff_maven, - bazel_diff_maven = "maven", + maven, + bazel_diff_maven = "bazel_diff_maven", ) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 7e9cfbd..94d5605 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -127,7 +127,7 @@ "@@rules_jvm_external~//:extensions.bzl%maven": { "general": { "bzlTransitiveDigest": "aME0tyUxYd+PGhICmzT9zEnIgZNf05hZhsfDD5v0JXM=", - "usagesDigest": "9DpRpGlkE5wF48B17Rhh+lgvGgC8Bwo86a4lBTR4UWg=", + "usagesDigest": "+dpflq+TpnHw1wMaSLFQaN4wOlDKqv7WllhW2Ba0Eg0=", "recordedFileInputs": { "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "cafb5d2d8119391eb2b322ce3840d3352ea82d496bdb8cbd4b6779ec4d044dda", "@@//maven_install.json": "8ab3e635bbd52fcff5900e530933fbdc41c45d1d5b2a2aef8af1becf7a7d0784" @@ -668,54 +668,6 @@ "downloaded_file_path": "v1/software/amazon/awssdk/aws-xml-protocol/2.20.128/aws-xml-protocol-2.20.128.jar" } }, - "unpinned_maven": { - "bzlFile": "@@rules_jvm_external~//:coursier.bzl", - "ruleClassName": "coursier_fetch", - "attributes": { - "user_provided_name": "maven", - "repositories": [ - "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" - ], - "artifacts": [ - "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.9.0\", \"packaging\": \"jar\" }", - "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }", - "{ \"group\": \"com.willowtreeapps.assertk\", \"artifact\": \"assertk-jvm\", \"version\": \"0.25\" }", - "{ \"group\": \"info.picocli\", \"artifact\": \"picocli\", \"version\": \"4.6.3\", \"packaging\": \"jar\" }", - "{ \"group\": \"io.insert-koin\", \"artifact\": \"koin-core-jvm\", \"version\": \"3.1.6\" }", - "{ \"group\": \"io.insert-koin\", \"artifact\": \"koin-test-junit4\", \"version\": \"4.0.0\" }", - "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"5.11.2\" }", - "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-pool2\", \"version\": \"2.11.1\" }", - "{ \"group\": \"org.jetbrains.kotlinx\", \"artifact\": \"kotlinx-coroutines-core\", \"version\": \"1.5.2\" }", - "{ \"group\": \"org.mockito.kotlin\", \"artifact\": \"mockito-kotlin\", \"version\": \"5.4.0\" }", - "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }", - "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.8.9\" }", - "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.3.2\" }", - "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }", - "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }", - "{ \"group\": \"com.google.guava\", \"artifact\": \"guava-testlib\", \"version\": \"31.1-jre\" }", - "{ \"group\": \"com.google.truth\", \"artifact\": \"truth\", \"version\": \"1.1.2\" }", - "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }", - "{ \"group\": \"org.mockito\", \"artifact\": \"mockito-core\", \"version\": \"4.3.1\" }" - ], - "fail_on_missing_checksum": true, - "fetch_sources": false, - "fetch_javadoc": false, - "excluded_artifacts": [], - "generate_compat_repositories": false, - "version_conflict_policy": "default", - "override_targets": {}, - "strict_visibility": false, - "strict_visibility_value": [ - "@@//visibility:private" - ], - "maven_install_json": "@@//:maven_install.json", - "resolve_timeout": 600, - "use_starlark_android_rules": false, - "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl", - "duplicate_version_warning": "warn", - "ignore_empty_files": false - } - }, "software_amazon_awssdk_s3_2_20_128": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -1156,6 +1108,44 @@ "downloaded_file_path": "v1/org/jetbrains/annotations/13.0/annotations-13.0.jar" } }, + "bazel_diff_maven": { + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", + "ruleClassName": "pinned_coursier_fetch", + "attributes": { + "user_provided_name": "bazel_diff_maven", + "repositories": [ + "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" + ], + "artifacts": [ + "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.9.0\", \"packaging\": \"jar\" }", + "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }", + "{ \"group\": \"com.willowtreeapps.assertk\", \"artifact\": \"assertk-jvm\", \"version\": \"0.25\" }", + "{ \"group\": \"info.picocli\", \"artifact\": \"picocli\", \"version\": \"4.6.3\", \"packaging\": \"jar\" }", + "{ \"group\": \"io.insert-koin\", \"artifact\": \"koin-core-jvm\", \"version\": \"3.1.6\" }", + "{ \"group\": \"io.insert-koin\", \"artifact\": \"koin-test-junit4\", \"version\": \"4.0.0\" }", + "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"5.11.2\" }", + "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-pool2\", \"version\": \"2.11.1\" }", + "{ \"group\": \"org.jetbrains.kotlinx\", \"artifact\": \"kotlinx-coroutines-core\", \"version\": \"1.5.2\" }", + "{ \"group\": \"org.mockito.kotlin\", \"artifact\": \"mockito-kotlin\", \"version\": \"5.4.0\" }" + ], + "fetch_sources": false, + "fetch_javadoc": false, + "generate_compat_repositories": false, + "maven_install_json": "@@//:maven_install.json", + "override_targets": {}, + "strict_visibility": false, + "strict_visibility_value": [ + "@@//visibility:private" + ], + "additional_netrc_lines": [], + "fail_if_repin_required": false, + "use_starlark_android_rules": false, + "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl", + "duplicate_version_warning": "warn", + "excluded_artifacts": [], + "repin_instructions": "" + } + }, "commons_logging_commons_logging_1_2": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -1167,6 +1157,45 @@ "downloaded_file_path": "v1/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" } }, + "unpinned_bazel_diff_maven": { + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", + "ruleClassName": "coursier_fetch", + "attributes": { + "user_provided_name": "bazel_diff_maven", + "repositories": [ + "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" + ], + "artifacts": [ + "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.9.0\", \"packaging\": \"jar\" }", + "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }", + "{ \"group\": \"com.willowtreeapps.assertk\", \"artifact\": \"assertk-jvm\", \"version\": \"0.25\" }", + "{ \"group\": \"info.picocli\", \"artifact\": \"picocli\", \"version\": \"4.6.3\", \"packaging\": \"jar\" }", + "{ \"group\": \"io.insert-koin\", \"artifact\": \"koin-core-jvm\", \"version\": \"3.1.6\" }", + "{ \"group\": \"io.insert-koin\", \"artifact\": \"koin-test-junit4\", \"version\": \"4.0.0\" }", + "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"5.11.2\" }", + "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-pool2\", \"version\": \"2.11.1\" }", + "{ \"group\": \"org.jetbrains.kotlinx\", \"artifact\": \"kotlinx-coroutines-core\", \"version\": \"1.5.2\" }", + "{ \"group\": \"org.mockito.kotlin\", \"artifact\": \"mockito-kotlin\", \"version\": \"5.4.0\" }" + ], + "fail_on_missing_checksum": true, + "fetch_sources": false, + "fetch_javadoc": false, + "excluded_artifacts": [], + "generate_compat_repositories": false, + "version_conflict_policy": "default", + "override_targets": {}, + "strict_visibility": false, + "strict_visibility_value": [ + "@@//visibility:private" + ], + "maven_install_json": "@@//:maven_install.json", + "resolve_timeout": 600, + "use_starlark_android_rules": false, + "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl", + "duplicate_version_warning": "warn", + "ignore_empty_files": false + } + }, "com_willowtreeapps_opentest4k_opentest4k_jvm_1_2_2": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -1404,23 +1433,13 @@ }, "maven": { "bzlFile": "@@rules_jvm_external~//:coursier.bzl", - "ruleClassName": "pinned_coursier_fetch", + "ruleClassName": "coursier_fetch", "attributes": { "user_provided_name": "maven", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" ], "artifacts": [ - "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.9.0\", \"packaging\": \"jar\" }", - "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }", - "{ \"group\": \"com.willowtreeapps.assertk\", \"artifact\": \"assertk-jvm\", \"version\": \"0.25\" }", - "{ \"group\": \"info.picocli\", \"artifact\": \"picocli\", \"version\": \"4.6.3\", \"packaging\": \"jar\" }", - "{ \"group\": \"io.insert-koin\", \"artifact\": \"koin-core-jvm\", \"version\": \"3.1.6\" }", - "{ \"group\": \"io.insert-koin\", \"artifact\": \"koin-test-junit4\", \"version\": \"4.0.0\" }", - "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"5.11.2\" }", - "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-pool2\", \"version\": \"2.11.1\" }", - "{ \"group\": \"org.jetbrains.kotlinx\", \"artifact\": \"kotlinx-coroutines-core\", \"version\": \"1.5.2\" }", - "{ \"group\": \"org.mockito.kotlin\", \"artifact\": \"mockito-kotlin\", \"version\": \"5.4.0\" }", "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }", "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.8.9\" }", "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.3.2\" }", @@ -1431,22 +1450,22 @@ "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }", "{ \"group\": \"org.mockito\", \"artifact\": \"mockito-core\", \"version\": \"4.3.1\" }" ], + "fail_on_missing_checksum": true, "fetch_sources": false, "fetch_javadoc": false, + "excluded_artifacts": [], "generate_compat_repositories": false, - "maven_install_json": "@@//:maven_install.json", + "version_conflict_policy": "default", "override_targets": {}, "strict_visibility": false, "strict_visibility_value": [ "@@//visibility:private" ], - "additional_netrc_lines": [], - "fail_if_repin_required": false, + "resolve_timeout": 600, "use_starlark_android_rules": false, "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl", "duplicate_version_warning": "warn", - "excluded_artifacts": [], - "repin_instructions": "" + "ignore_empty_files": false } }, "com_google_cloud_google_cloud_core_2_22_0": { diff --git a/WORKSPACE b/WORKSPACE index 233f212..ae7f5bb 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -43,8 +43,8 @@ load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") rules_jvm_external_setup() load("@rules_jvm_external//:defs.bzl", "maven_install") -load("//:artifacts.bzl", "BAZEL_DIFF_MAVEN_ARTIFACTS") load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories") +load("//:artifacts.bzl", "BAZEL_DIFF_MAVEN_ARTIFACTS") kotlin_repositories() @@ -55,7 +55,12 @@ kt_register_toolchains() maven_install( name = "bazel_diff_maven", artifacts = BAZEL_DIFF_MAVEN_ARTIFACTS, + maven_install_json = "//:maven_install.json", repositories = [ "https://repo1.maven.org/maven2/", ], ) + +load("@bazel_diff_maven//:defs.bzl", "pinned_maven_install") + +pinned_maven_install()