Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ build --enable_platform_specific_config
build -c opt
# Ensure that paths of files printed by our examples are valid.
build --nozip_undeclared_test_outputs
# Allow build to start before all external deps have been fetched.
common --experimental_merged_skyframe_analysis_execution

# C/C++
# GCC is supported on a best-effort basis.
common --repo_env=CC=clang
build --incompatible_enable_cc_toolchain_resolution
# Required by abseil-cpp.
build --cxxopt=-std=c++14
# Silence protobuf compilation warnings.
build --host_copt=-Wno-unused-function
build --host_copt=-Wno-unknown-warning-option
# Requires a relatively modern clang.
build:ci --features=layering_check
build:macos --apple_crosstool_top=@local_config_apple_cc//:toolchain
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b29649fbdc983cd62a58b9b09ef699867e7c5b69
1f12a4d8f82efa3eac5e1a708833e8ed53e54327
50 changes: 12 additions & 38 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "rules_java",
patch_args = ["-p1"],
patches = [
# https://github.com/bazelbuild/rules_java/pull/114
# Remove unnecessary dependency on a Java runtime for the target platform.
"//third_party:rules_java-use-bootstrap-runtime-toolchain-type.patch",
],
sha256 = "fd1d5538c8e5bbf890e1e31e983139b89710aacd0a5327ddf9afe12090ed9c78",
strip_prefix = "rules_java-ca72739da10036e1d2cf2aaeab78fae87673e43f",
sha256 = "7b0d9ba216c821ee8697dedc0f9d0a705959ace462a3885fe9ba0347ba950111",
urls = [
"https://github.com/bazelbuild/rules_java/archive/ca72739da10036e1d2cf2aaeab78fae87673e43f.tar.gz",
"https://github.com/bazelbuild/rules_java/releases/download/6.5.1/rules_java-6.5.1.tar.gz",
],
)

Expand All @@ -35,10 +28,10 @@ rules_java_toolchains()
http_archive(
name = "com_google_protobuf",
patches = ["//third_party:protobuf-disable-layering_check.patch"],
sha256 = "0930b1a6eb840a2295dfcb13bb5736d1292c3e0d61a90391181399327be7d8f1",
strip_prefix = "protobuf-24.1",
sha256 = "616bb3536ac1fff3fb1a141450fa28b875e985712170ea7f1bfe5e5fc41e2cd8",
strip_prefix = "protobuf-24.4",
# Keep in sync with com_google_protobuf_protobuf_java in repositories.bzl.
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v24.1/protobuf-24.1.tar.gz"],
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v24.4/protobuf-24.4.tar.gz"],
)

http_archive(
Expand Down Expand Up @@ -94,14 +87,9 @@ http_archive(

http_archive(
name = "contrib_rules_jvm",
patch_args = ["-p1"],
patches = [
# https://github.com/bazel-contrib/rules_jvm/pull/194
"//third_party:rules_jvm-fix-junit5-for-early-access-builds.patch",
],
sha256 = "90ecdf08d7e8817b2247eea77826db872db8866da84b3a824f58d6661aca917f",
strip_prefix = "rules_jvm-0.14.0",
url = "https://github.com/bazel-contrib/rules_jvm/releases/download/v0.14.0/rules_jvm-v0.14.0.tar.gz",
sha256 = "4d62589dc6a55e74bbe33930b826d593367fc777449a410604b2ad7c6c625ef7",
strip_prefix = "rules_jvm-0.19.0",
url = "https://github.com/bazel-contrib/rules_jvm/releases/download/v0.19.0/rules_jvm-v0.19.0.tar.gz",
)

http_archive(
Expand Down Expand Up @@ -129,15 +117,15 @@ http_file(
http_file(
name = "jacocoagent",
downloaded_file_path = "jacocoagent.jar",
sha256 = "191734a0b7ef97606e6a09ae584c4acab47eb30fcb4c555d3d440d4e0d71d73d",
urls = ["https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.9/org.jacoco.agent-0.8.9-runtime.jar"],
sha256 = "40d25997de4c625769bf5d1283eb855b87c9caef4ca1fa03b8ef0b752ba4b54a",
urls = ["https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.10/org.jacoco.agent-0.8.10-runtime.jar"],
)

http_file(
name = "jacococli",
downloaded_file_path = "jacococli.jar",
sha256 = "29c7754338512599f742ebfedd095c9c93800fefbce407500eceb16f0ed5a20d",
urls = ["https://repo1.maven.org/maven2/org/jacoco/org.jacoco.cli/0.8.9/org.jacoco.cli-0.8.9-nodeps.jar"],
sha256 = "c821fe4f59dc5c1bb29341a259b6c9e49d6425f200f4ac0e373bf46bbfa54cf2",
urls = ["https://repo1.maven.org/maven2/org/jacoco/org.jacoco.cli/0.8.10/org.jacoco.cli-0.8.10-nodeps.jar"],
)

http_jar(
Expand Down Expand Up @@ -222,20 +210,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

protobuf_deps()

http_file(
name = "jacocoagent",
downloaded_file_path = "jacocoagent.jar",
sha256 = "67de51e9ca1db044f3a3d10613518befb02e8eee1015f2ff6d56cfb9d4506546",
urls = ["https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.8/org.jacoco.agent-0.8.8-runtime.jar"],
)

http_file(
name = "jacococli",
downloaded_file_path = "jacococli.jar",
sha256 = "c449591174982bbc003d1290003fcbc7b939215436922d2f0f25239d110d531a",
urls = ["https://repo1.maven.org/maven2/org/jacoco/org.jacoco.cli/0.8.8/org.jacoco.cli-0.8.8-nodeps.jar"],
)

load("//third_party/android:android_configure.bzl", "android_configure")

android_configure(name = "configure_android_rules")
Expand Down
2 changes: 1 addition & 1 deletion maven_install.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": 68876267,
"__INPUT_ARTIFACTS_HASH": 68877449,
"__RESOLVED_ARTIFACTS_HASH": 1123237997,
"conflict_resolution": {
"junit:junit:4.12": "junit:junit:4.13.2"
Expand Down
82 changes: 31 additions & 51 deletions repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -43,59 +43,39 @@ def jazzer_dependencies(android = False):
maybe(
http_archive,
name = "io_bazel_rules_kotlin",
patch_args = ["-p1"],
patches = [
# https://github.com/bazelbuild/rules_kotlin/pull/1000
# Remove unnecessary dependency on a Java runtime for the target platform.
"//third_party:rules_kotlin-remove-java-runtime-dep.patch",
# https://github.com/bazelbuild/rules_kotlin/pull/1005
# Required for compatibility with recent Bazel 7 pre-releases.
"//third_party:rules_kotlin-remove-java-info-transitive-deps.patch",
],
sha256 = "01293740a16e474669aba5b5a1fe3d368de5832442f164e4fbfc566815a8bc3a",
url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.8/rules_kotlin_release.tgz",
sha256 = "a630cda9fdb4f56cf2dc20a4bf873765c41cf00e9379e8d59cd07b24730f4fde",
url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.8.1/rules_kotlin_release.tgz",
)

maybe(
http_archive,
name = "rules_jvm_external",
patch_args = ["-p1"],
patches = [
# https://github.com/bazelbuild/rules_jvm_external/pull/958
# Allows javadoc targets to reference other javadoc targets.
"//third_party:rules_jvm_external-javadoc-deps.patch",
# https://github.com/bazelbuild/rules_jvm_external/pull/960
# Forwards the toolchains attribute on java_export to all underlying targets and
# evaluates Make variables from deps in pom_file.
"//third_party:rules_jvm_external-toolchains-attribute.patch",
],
sha256 = "aa17db9b810b22e411bf722095be34eeb66c76819b9c3423ad7740f452016aa3",
strip_prefix = "rules_jvm_external-4b073de468eff9741406f475acb04e94bee7c9d0",
url = "https://github.com/bazelbuild/rules_jvm_external/archive/4b073de468eff9741406f475acb04e94bee7c9d0.tar.gz",
sha256 = "5061364ad9c53de3d2072975f6c14768f2982bbf4101442306270554b317772e",
strip_prefix = "rules_jvm_external-f0c92a5aa7a9ea457ec3b89c76c59ff72829d9d7",
url = "https://github.com/bazelbuild/rules_jvm_external/archive/f0c92a5aa7a9ea457ec3b89c76c59ff72829d9d7.tar.gz",
)

maybe(
http_archive,
name = "build_bazel_apple_support",
sha256 = "ce80afe548fd71ef27b48cb48a283ca21256a0900caec3c7ed9416241e000bfe",
strip_prefix = "apple_support-dab92884a6f031e63ac263e5de8a02f13ac42508",
url = "https://github.com/bazelbuild/apple_support/archive/dab92884a6f031e63ac263e5de8a02f13ac42508.tar.gz",
sha256 = "62cb8c6658739d22986bbe4b025fe9f0f42cce91394096dc85d64b120ccde229",
url = "https://github.com/bazelbuild/apple_support/releases/download/1.10.1/apple_support.1.10.1.tar.gz",
)

maybe(
http_archive,
name = "com_google_absl",
sha256 = "5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36",
strip_prefix = "abseil-cpp-20230125.3",
url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz",
sha256 = "987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed",
strip_prefix = "abseil-cpp-20230802.1",
url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.tar.gz",
)

maybe(
http_archive,
name = "com_github_johnynek_bazel_jar_jar",
sha256 = "85260ebdaf86cf0ce6d0d0f0a3268a09f628c815513141a6b99a023116523f96",
strip_prefix = "bazel_jar_jar-78c8c13ff437e8397ffe80c9a4c905376720a339",
url = "https://github.com/bazeltools/bazel_jar_jar/archive/78c8c13ff437e8397ffe80c9a4c905376720a339.tar.gz",
sha256 = "7487df7cf64ef85bdd5ffc6a0aff92c46ff7550a663c41b262d53f9dc90cd53d",
strip_prefix = "bazel_jar_jar-4e7bf26da8bc8c955578fd8c8a2c763757d344df",
url = "https://github.com/bazeltools/bazel_jar_jar/archive/4e7bf26da8bc8c955578fd8c8a2c763757d344df.tar.gz",
)

maybe(
Expand All @@ -111,9 +91,9 @@ def jazzer_dependencies(android = False):
http_archive,
build_file = Label("//third_party:classgraph.BUILD"),
name = "com_github_classgraph_classgraph",
sha256 = "62ba0109800ba55f4ccd9a7ba5f73a050293b90237c25e96132ca40d7f4e438f",
strip_prefix = "classgraph-classgraph-4.8.161",
url = "https://github.com/classgraph/classgraph/archive/refs/tags/classgraph-4.8.161.tar.gz",
sha256 = "83f3c193e90b77487cfc24fb6f73e9624e7478d9be4f94e2b20a29165a1aa906",
strip_prefix = "classgraph-classgraph-4.8.162",
url = "https://github.com/classgraph/classgraph/archive/refs/tags/classgraph-4.8.162.tar.gz",
)

maybe(
Expand All @@ -126,36 +106,36 @@ def jazzer_dependencies(android = False):
maybe(
http_jar,
name = "net_bytebuddy_byte_buddy_agent",
sha256 = "55f19862b870f5d85890ba5386b1b45e9bbc88d5fe1f819abe0c788b4929fa6b",
url = "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.5/byte-buddy-agent-1.14.5.jar",
sha256 = "f7c60fd229df2b0f4e390f50e0582a23ac1d895645df0d487c54dd67a289800b",
url = "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.8/byte-buddy-agent-1.14.8.jar",
)

maybe(
http_jar,
name = "org_ow2_asm_asm",
sha256 = "b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353",
url = "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.jar",
sha256 = "3c6fac2424db3d4a853b669f4e3d1d9c3c552235e19a319673f887083c2303a1",
url = "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6/asm-9.6.jar",
)

maybe(
http_jar,
name = "org_ow2_asm_asm_commons",
sha256 = "72eee9fbafb9de8d9463f20dd584a48ceeb7e5152ad4c987bfbe17dd4811c9ae",
url = "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.jar",
sha256 = "7aefd0d5c0901701c69f7513feda765fb6be33af2ce7aa17c5781fc87657c511",
url = "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6/asm-commons-9.6.jar",
)

maybe(
http_jar,
name = "org_ow2_asm_asm_tree",
sha256 = "3c33a648191079aeaeaeb7c19a49b153952f9e40fe86fbac5205554ddd9acd94",
url = "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.jar",
sha256 = "c43ecf17b539c777e15da7b5b86553b377e2d39a683de6285567d5283888e7ef",
url = "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar",
)

maybe(
http_jar,
name = "com_github_jsqlparser_jsqlparser",
sha256 = "61b02b8520fda987b7bc12878833b223234450e505de83c36e78abe6d69c0184",
url = "https://repo1.maven.org/maven2/com/github/jsqlparser/jsqlparser/4.6/jsqlparser-4.6.jar",
sha256 = "9d25de1d79a669352f0d535daee906c2e35e8162e6894d82ea3f0aad8545655e",
url = "https://repo1.maven.org/maven2/com/github/jsqlparser/jsqlparser/4.7/jsqlparser-4.7.jar",
)

maybe(
Expand All @@ -175,9 +155,9 @@ def jazzer_dependencies(android = False):
maybe(
http_jar,
name = "com_google_protobuf_protobuf_java",
sha256 = "b7eb9203fd2dd6e55b929debf2d079c949e0f9a85f15ec3a298b7534bc7ebd41",
sha256 = "e5655522be1aa5cc1f2f092aa036b0445157f294928eedf1332ac938c7b69686",
# Keep in sync with com_google_protobuf in WORKSPACE.
url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.24.1/protobuf-java-3.24.1.jar",
url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.24.4/protobuf-java-3.24.4.jar",
)

maybe(
Expand All @@ -189,9 +169,9 @@ def jazzer_dependencies(android = False):
Label("//third_party:jacoco-make-probe-inserter-subclassable.patch"),
Label("//third_party:jacoco-ignore-offline-instrumentation.patch"),
],
sha256 = "b6b90469db034dff01a8577d8e91da51bc40f328a988359028652771f20abf1d",
strip_prefix = "jacoco-0.8.9",
url = "https://github.com/jacoco/jacoco/archive/refs/tags/v0.8.9.tar.gz",
sha256 = "5c72dea2d13eef33a4d972d157186fc12d85149bc042186953efe1be50c220ee",
strip_prefix = "jacoco-0.8.10",
url = "https://github.com/jacoco/jacoco/archive/refs/tags/v0.8.10.tar.gz",
)

maybe(
Expand Down
Loading