Skip to content

Commit af8f32f

Browse files
committed
chore: update most bazel modules
1 parent 86378b7 commit af8f32f

File tree

10 files changed

+49
-36
lines changed

10 files changed

+49
-36
lines changed

MODULE.bazel

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,27 @@ module(name = "jazzer")
66
# Kept up-to-date by Renovate
77
################################################################################
88

9-
bazel_dep(name = "abseil-cpp", version = "20230802.1")
10-
bazel_dep(name = "apple_support", version = "1.11.1")
9+
bazel_dep(name = "abseil-cpp", version = "20250814.1")
10+
bazel_dep(name = "apple_support", version = "1.23.1")
1111
bazel_dep(name = "bazel_jar_jar", version = "0.1.0")
12-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
13-
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
14-
bazel_dep(name = "contrib_rules_jvm", version = "0.24.0")
15-
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
16-
bazel_dep(name = "platforms", version = "0.0.10")
12+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
13+
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
14+
15+
# TODO: Starting with version 0.28.0 the JUnit test runner is compiled for Java 11 which breaks our JDK 8 tests.
16+
# https://github.com/bazel-contrib/rules_jvm/pull/307
17+
bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
18+
bazel_dep(name = "googletest", version = "1.17.0.bcr.1")
19+
bazel_dep(name = "platforms", version = "1.0.0")
1720
bazel_dep(name = "protobuf", version = "32.1")
18-
bazel_dep(name = "rules_android", version = "0.1.1")
19-
bazel_dep(name = "rules_android_ndk", version = "0.1.2")
20-
bazel_dep(name = "rules_foreign_cc", version = "0.11.1")
21-
bazel_dep(name = "rules_java", version = "7.12.2")
22-
bazel_dep(name = "rules_jni", version = "0.9.1")
23-
bazel_dep(name = "rules_jvm_external")
24-
25-
# TODO: Remove after the next release.
26-
archive_override(
27-
module_name = "rules_jvm_external",
28-
integrity = "sha256-7AerLOLhQ+oIDH2id7OE8WJmbH01MqBWV4CbqJ6Nh68=",
29-
strip_prefix = "rules_jvm_external-a1d4e4f4267c1797b686719aa385e707b732c541",
30-
urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/a1d4e4f4267c1797b686719aa385e707b732c541.tar.gz"],
31-
)
32-
33-
bazel_dep(name = "rules_kotlin", version = "1.9.6")
21+
bazel_dep(name = "rules_android", version = "0.6.6")
22+
bazel_dep(name = "rules_android_ndk", version = "0.1.3")
23+
bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
24+
bazel_dep(name = "rules_java", version = "8.16.1")
25+
bazel_dep(name = "rules_jni", version = "0.11.1")
26+
bazel_dep(name = "rules_jvm_external", version = "6.8")
27+
bazel_dep(name = "rules_kotlin", version = "2.1.9")
3428
bazel_dep(name = "rules_license", version = "1.0.0")
35-
bazel_dep(name = "rules_pkg", version = "0.9.1")
29+
bazel_dep(name = "rules_pkg", version = "1.1.0")
3630
bazel_dep(name = "toolchains_llvm", version = "0.10.3")
3731

3832
################################################################################

bazel/kotlin.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# limitations under the License.
1515
#
1616

17-
load("@rules_kotlin//kotlin:lint.bzl", "ktlint_fix", "ktlint_test")
1817
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test")
18+
load("@rules_kotlin//kotlin:lint.bzl", "ktlint_fix", "ktlint_test")
1919
load("//bazel:compat.bzl", "SKIP_ON_WINDOWS")
2020

2121
# A kt_jvm_test wrapped in a java_test for Windows compatibility.

examples/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
21
load("@rules_jni//jni:defs.bzl", "java_jni_library")
2+
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
33
load("//bazel:compat.bzl", "SKIP_ON_MACOS", "SKIP_ON_WINDOWS")
44
load("//bazel:fuzz_target.bzl", "java_fuzz_target_test")
55
load("//bazel:kotlin.bzl", "ktlint")

maven_install.json

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -2001871108,
4-
"__RESOLVED_ARTIFACTS_HASH": -1278053547,
3+
"__INPUT_ARTIFACTS_HASH": 1770049243,
4+
"__RESOLVED_ARTIFACTS_HASH": 1091888085,
55
"conflict_resolution": {
66
"com.google.code.gson:gson:2.8.6": "com.google.code.gson:gson:2.8.9",
77
"com.google.errorprone:error_prone_annotations:2.26.1": "com.google.errorprone:error_prone_annotations:2.41.0",
8-
"com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.41.0",
98
"com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.4.3-android",
9+
"com.google.guava:guava:33.0.0-jre": "com.google.guava:guava:33.4.3-android",
1010
"com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.0.0",
11+
"com.google.protobuf:protobuf-java:4.27.2": "com.google.protobuf:protobuf-java:4.32.0",
1112
"net.bytebuddy:byte-buddy-agent:1.14.13": "net.bytebuddy:byte-buddy-agent:1.17.7",
1213
"org.ow2.asm:asm-commons:9.8": "org.ow2.asm:asm-commons:9.9",
1314
"org.ow2.asm:asm-tree:9.8": "org.ow2.asm:asm-tree:9.9",
@@ -122,6 +123,12 @@
122123
},
123124
"version": "4.32.0"
124125
},
126+
"com.google.protobuf:protobuf-java-util": {
127+
"shasums": {
128+
"jar": "a2665294d3e4675482bde593df8283f8c965f0207785e8e9b223f790644f5b08"
129+
},
130+
"version": "4.27.2"
131+
},
125132
"com.google.truth.extensions:truth-java8-extension": {
126133
"shasums": {
127134
"jar": "917671963d545be65c8f4e821e8a2794d0f24ffd1d33187a1c022a2e21556d2e"
@@ -684,6 +691,14 @@
684691
"org.checkerframework:checker-qual",
685692
"org.jspecify:jspecify"
686693
],
694+
"com.google.protobuf:protobuf-java-util": [
695+
"com.google.code.findbugs:jsr305",
696+
"com.google.code.gson:gson",
697+
"com.google.errorprone:error_prone_annotations",
698+
"com.google.guava:guava",
699+
"com.google.j2objc:j2objc-annotations",
700+
"com.google.protobuf:protobuf-java"
701+
],
687702
"com.google.truth.extensions:truth-java8-extension": [
688703
"com.google.truth:truth"
689704
],
@@ -1136,6 +1151,9 @@
11361151
"com.google.protobuf",
11371152
"com.google.protobuf.compiler"
11381153
],
1154+
"com.google.protobuf:protobuf-java-util": [
1155+
"com.google.protobuf.util"
1156+
],
11391157
"com.google.truth.extensions:truth-liteproto-extension": [
11401158
"com.google.common.truth.extensions.proto"
11411159
],
@@ -2611,6 +2629,7 @@
26112629
"com.google.guava:listenablefuture",
26122630
"com.google.j2objc:j2objc-annotations",
26132631
"com.google.protobuf:protobuf-java",
2632+
"com.google.protobuf:protobuf-java-util",
26142633
"com.google.truth.extensions:truth-java8-extension",
26152634
"com.google.truth.extensions:truth-liteproto-extension",
26162635
"com.google.truth.extensions:truth-proto-extension",

sanitizers/src/test/java/com/example/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//bazel:fuzz_target.bzl", "java_fuzz_target_test")
21
load("//bazel:compat.bzl", "SKIP_ON_MACOS")
2+
load("//bazel:fuzz_target.bzl", "java_fuzz_target_test")
33

44
java_fuzz_target_test(
55
name = "ObjectInputStreamDeserialization",

src/main/java/com/code_intelligence/jazzer/android/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
load("//bazel:compat.bzl", "ANDROID_ONLY", "SKIP_ON_WINDOWS")
21
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
32
load("@rules_jni//jni:defs.bzl", "java_jni_library")
3+
load("//bazel:compat.bzl", "ANDROID_ONLY", "SKIP_ON_WINDOWS")
44

55
java_import(
66
name = "jazzer_bootstrap_android_import",

src/main/java/com/code_intelligence/jazzer/mutation/combinator/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ java_library(
55
deps = [
66
"//src/main/java/com/code_intelligence/jazzer/mutation/api",
77
"//src/main/java/com/code_intelligence/jazzer/mutation/support",
8-
"@maven//:com_google_errorprone_error_prone_type_annotations",
8+
"@maven//:com_google_errorprone_error_prone_annotations",
99
"@maven//:net_jodah_typetools",
1010
],
1111
)

src/main/native/com/code_intelligence/jazzer/android/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
load("//bazel:compat.bzl", "ANDROID_ONLY")
2-
load("@rules_jni//jni:defs.bzl", "cc_jni_library")
31
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
2+
load("@rules_jni//jni:defs.bzl", "cc_jni_library")
3+
load("//bazel:compat.bzl", "ANDROID_ONLY")
44

55
copy_file(
66
name = "jvmti_h_encoded",

src/test/java/com/code_intelligence/jazzer/instrumentor/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//bazel:kotlin.bzl", "ktlint", "wrapped_kt_jvm_test")
21
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
2+
load("//bazel:kotlin.bzl", "ktlint", "wrapped_kt_jvm_test")
33

44
kt_jvm_library(
55
name = "patch_test_utils",

third_party/libjpeg_turbo.BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
21
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
32
load("@bazel_skylib//rules:select_file.bzl", "select_file")
3+
load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
44

55
filegroup(
66
name = "all_files",

0 commit comments

Comments
 (0)