diff --git a/.bazelversion b/.bazelversion index 150202076..e81e85b81 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.3.0 +7.6.2 diff --git a/.github/workflows/run-all-tests-pr.yml b/.github/workflows/run-all-tests-pr.yml index 5d2398b97..a1f1e8ca5 100644 --- a/.github/workflows/run-all-tests-pr.yml +++ b/.github/workflows/run-all-tests-pr.yml @@ -1,7 +1,6 @@ name: CI PR on: pull_request: - branches: [ main ] merge_group: workflow_dispatch: diff --git a/MODULE.bazel b/MODULE.bazel index d7e93e74b..e1cab50ab 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -6,33 +6,27 @@ module(name = "jazzer") # Kept up-to-date by Renovate ################################################################################ -bazel_dep(name = "abseil-cpp", version = "20230802.1") -bazel_dep(name = "apple_support", version = "1.11.1") +bazel_dep(name = "abseil-cpp", version = "20250814.1") +bazel_dep(name = "apple_support", version = "1.23.1") bazel_dep(name = "bazel_jar_jar", version = "0.1.0") -bazel_dep(name = "bazel_skylib", version = "1.7.1") -bazel_dep(name = "buildifier_prebuilt", version = "6.4.0") -bazel_dep(name = "contrib_rules_jvm", version = "0.24.0") -bazel_dep(name = "googletest", version = "1.14.0.bcr.1") -bazel_dep(name = "platforms", version = "0.0.10") +bazel_dep(name = "bazel_skylib", version = "1.8.2") +bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2") + +# TODO: Starting with version 0.28.0 the JUnit test runner is compiled for Java 11 which breaks our JDK 8 tests. +# https://github.com/bazel-contrib/rules_jvm/pull/307 +bazel_dep(name = "contrib_rules_jvm", version = "0.27.0") +bazel_dep(name = "googletest", version = "1.17.0.bcr.1") +bazel_dep(name = "platforms", version = "1.0.0") bazel_dep(name = "protobuf", version = "32.1") -bazel_dep(name = "rules_android", version = "0.1.1") -bazel_dep(name = "rules_android_ndk", version = "0.1.2") -bazel_dep(name = "rules_foreign_cc", version = "0.11.1") -bazel_dep(name = "rules_java", version = "7.12.2") -bazel_dep(name = "rules_jni", version = "0.9.1") -bazel_dep(name = "rules_jvm_external") - -# TODO: Remove after the next release. -archive_override( - module_name = "rules_jvm_external", - integrity = "sha256-7AerLOLhQ+oIDH2id7OE8WJmbH01MqBWV4CbqJ6Nh68=", - strip_prefix = "rules_jvm_external-a1d4e4f4267c1797b686719aa385e707b732c541", - urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/a1d4e4f4267c1797b686719aa385e707b732c541.tar.gz"], -) - -bazel_dep(name = "rules_kotlin", version = "1.9.6") +bazel_dep(name = "rules_android", version = "0.6.6") +bazel_dep(name = "rules_android_ndk", version = "0.1.3") +bazel_dep(name = "rules_foreign_cc", version = "0.15.1") +bazel_dep(name = "rules_java", version = "8.16.1") +bazel_dep(name = "rules_jni", version = "0.11.1") +bazel_dep(name = "rules_jvm_external", version = "6.8") +bazel_dep(name = "rules_kotlin", version = "2.1.9") bazel_dep(name = "rules_license", version = "1.0.0") -bazel_dep(name = "rules_pkg", version = "0.9.1") +bazel_dep(name = "rules_pkg", version = "1.1.0") bazel_dep(name = "toolchains_llvm", version = "0.10.3") ################################################################################ diff --git a/bazel/kotlin.bzl b/bazel/kotlin.bzl index c76f0fde0..594e70ffe 100644 --- a/bazel/kotlin.bzl +++ b/bazel/kotlin.bzl @@ -14,8 +14,8 @@ # limitations under the License. # -load("@rules_kotlin//kotlin:lint.bzl", "ktlint_fix", "ktlint_test") load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") +load("@rules_kotlin//kotlin:lint.bzl", "ktlint_fix", "ktlint_test") load("//bazel:compat.bzl", "SKIP_ON_WINDOWS") # A kt_jvm_test wrapped in a java_test for Windows compatibility. diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index bdfeb9185..04eac4178 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -1,5 +1,5 @@ -load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") load("@rules_jni//jni:defs.bzl", "java_jni_library") +load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") load("//bazel:compat.bzl", "SKIP_ON_MACOS", "SKIP_ON_WINDOWS") load("//bazel:fuzz_target.bzl", "java_fuzz_target_test") load("//bazel:kotlin.bzl", "ktlint") diff --git a/maven_install.json b/maven_install.json index c24ffd459..c69211c02 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,13 +1,14 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -2001871108, - "__RESOLVED_ARTIFACTS_HASH": -1278053547, + "__INPUT_ARTIFACTS_HASH": 1770049243, + "__RESOLVED_ARTIFACTS_HASH": 1091888085, "conflict_resolution": { "com.google.code.gson:gson:2.8.6": "com.google.code.gson:gson:2.8.9", "com.google.errorprone:error_prone_annotations:2.26.1": "com.google.errorprone:error_prone_annotations:2.41.0", - "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.41.0", "com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.4.3-android", + "com.google.guava:guava:33.0.0-jre": "com.google.guava:guava:33.4.3-android", "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.0.0", + "com.google.protobuf:protobuf-java:4.27.2": "com.google.protobuf:protobuf-java:4.32.0", "net.bytebuddy:byte-buddy-agent:1.14.13": "net.bytebuddy:byte-buddy-agent:1.17.7", "org.ow2.asm:asm-commons:9.8": "org.ow2.asm:asm-commons:9.9", "org.ow2.asm:asm-tree:9.8": "org.ow2.asm:asm-tree:9.9", @@ -122,6 +123,12 @@ }, "version": "4.32.0" }, + "com.google.protobuf:protobuf-java-util": { + "shasums": { + "jar": "a2665294d3e4675482bde593df8283f8c965f0207785e8e9b223f790644f5b08" + }, + "version": "4.27.2" + }, "com.google.truth.extensions:truth-java8-extension": { "shasums": { "jar": "917671963d545be65c8f4e821e8a2794d0f24ffd1d33187a1c022a2e21556d2e" @@ -684,6 +691,14 @@ "org.checkerframework:checker-qual", "org.jspecify:jspecify" ], + "com.google.protobuf:protobuf-java-util": [ + "com.google.code.findbugs:jsr305", + "com.google.code.gson:gson", + "com.google.errorprone:error_prone_annotations", + "com.google.guava:guava", + "com.google.j2objc:j2objc-annotations", + "com.google.protobuf:protobuf-java" + ], "com.google.truth.extensions:truth-java8-extension": [ "com.google.truth:truth" ], @@ -1136,6 +1151,9 @@ "com.google.protobuf", "com.google.protobuf.compiler" ], + "com.google.protobuf:protobuf-java-util": [ + "com.google.protobuf.util" + ], "com.google.truth.extensions:truth-liteproto-extension": [ "com.google.common.truth.extensions.proto" ], @@ -2611,6 +2629,7 @@ "com.google.guava:listenablefuture", "com.google.j2objc:j2objc-annotations", "com.google.protobuf:protobuf-java", + "com.google.protobuf:protobuf-java-util", "com.google.truth.extensions:truth-java8-extension", "com.google.truth.extensions:truth-liteproto-extension", "com.google.truth.extensions:truth-proto-extension", diff --git a/sanitizers/src/test/java/com/example/BUILD.bazel b/sanitizers/src/test/java/com/example/BUILD.bazel index 0cf3fc33f..c3ca00e9c 100644 --- a/sanitizers/src/test/java/com/example/BUILD.bazel +++ b/sanitizers/src/test/java/com/example/BUILD.bazel @@ -1,5 +1,5 @@ -load("//bazel:fuzz_target.bzl", "java_fuzz_target_test") load("//bazel:compat.bzl", "SKIP_ON_MACOS") +load("//bazel:fuzz_target.bzl", "java_fuzz_target_test") java_fuzz_target_test( name = "ObjectInputStreamDeserialization", diff --git a/src/main/java/com/code_intelligence/jazzer/android/BUILD.bazel b/src/main/java/com/code_intelligence/jazzer/android/BUILD.bazel index 0c0cc99c9..0ae142a87 100644 --- a/src/main/java/com/code_intelligence/jazzer/android/BUILD.bazel +++ b/src/main/java/com/code_intelligence/jazzer/android/BUILD.bazel @@ -1,6 +1,6 @@ -load("//bazel:compat.bzl", "ANDROID_ONLY", "SKIP_ON_WINDOWS") load("@bazel_skylib//rules:copy_file.bzl", "copy_file") load("@rules_jni//jni:defs.bzl", "java_jni_library") +load("//bazel:compat.bzl", "ANDROID_ONLY", "SKIP_ON_WINDOWS") java_import( name = "jazzer_bootstrap_android_import", diff --git a/src/main/java/com/code_intelligence/jazzer/mutation/combinator/BUILD.bazel b/src/main/java/com/code_intelligence/jazzer/mutation/combinator/BUILD.bazel index 6120f6620..3077d1dd9 100644 --- a/src/main/java/com/code_intelligence/jazzer/mutation/combinator/BUILD.bazel +++ b/src/main/java/com/code_intelligence/jazzer/mutation/combinator/BUILD.bazel @@ -5,7 +5,7 @@ java_library( deps = [ "//src/main/java/com/code_intelligence/jazzer/mutation/api", "//src/main/java/com/code_intelligence/jazzer/mutation/support", - "@maven//:com_google_errorprone_error_prone_type_annotations", + "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:net_jodah_typetools", ], ) diff --git a/src/main/native/com/code_intelligence/jazzer/android/BUILD.bazel b/src/main/native/com/code_intelligence/jazzer/android/BUILD.bazel index db421a095..dded9038e 100644 --- a/src/main/native/com/code_intelligence/jazzer/android/BUILD.bazel +++ b/src/main/native/com/code_intelligence/jazzer/android/BUILD.bazel @@ -1,6 +1,6 @@ -load("//bazel:compat.bzl", "ANDROID_ONLY") -load("@rules_jni//jni:defs.bzl", "cc_jni_library") load("@bazel_skylib//rules:copy_file.bzl", "copy_file") +load("@rules_jni//jni:defs.bzl", "cc_jni_library") +load("//bazel:compat.bzl", "ANDROID_ONLY") copy_file( name = "jvmti_h_encoded", diff --git a/src/test/java/com/code_intelligence/jazzer/instrumentor/BUILD.bazel b/src/test/java/com/code_intelligence/jazzer/instrumentor/BUILD.bazel index c97b9c872..7d0cf08ac 100644 --- a/src/test/java/com/code_intelligence/jazzer/instrumentor/BUILD.bazel +++ b/src/test/java/com/code_intelligence/jazzer/instrumentor/BUILD.bazel @@ -1,5 +1,5 @@ -load("//bazel:kotlin.bzl", "ktlint", "wrapped_kt_jvm_test") load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library") +load("//bazel:kotlin.bzl", "ktlint", "wrapped_kt_jvm_test") kt_jvm_library( name = "patch_test_utils", diff --git a/third_party/libjpeg_turbo.BUILD b/third_party/libjpeg_turbo.BUILD index a44a04eea..9ad2d8615 100644 --- a/third_party/libjpeg_turbo.BUILD +++ b/third_party/libjpeg_turbo.BUILD @@ -1,6 +1,6 @@ -load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake") load("@bazel_skylib//rules:copy_file.bzl", "copy_file") load("@bazel_skylib//rules:select_file.bzl", "select_file") +load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake") filegroup( name = "all_files",