diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index ef9042299..927228e14 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -2,13 +2,12 @@ matrix: bazel: [ - 7.4.1, - 8.2.1, + 7.7.1, + 8.5.0, last_green, ] platform: [ - ubuntu2004, - macos, + ubuntu2404, macos_arm64, # windows # TODO: Windows unit tests don't work yet. ] @@ -96,15 +95,20 @@ rules_bzlmod: &rules_bzlmod <<: *rules resource_rules_bzlmod: &resource_rules_bzlmod name: "Resource Rules Bzlmod" + build_targets: + - "//test/rules/resources/..." + test_targets: + - "//test/rules/resources/..." build_flags: <<: *rules_flags ? "--enable_bzlmod" ? "--enable_workspace=false" + ? "--//rules/flags:manifest_merge_order=legacy" test_flags: <<: *rules_flags ? "--enable_bzlmod" ? "--enable_workspace=false" - <<: *resource_rules + ? "--//rules/flags:manifest_merge_order=legacy" tasks: tools: @@ -115,20 +119,20 @@ tasks: platform: ${{ platform }} bazel: ${{ bazel }} <<: *rules - # TODO(#397): Resource tests need some more debugging. - ## resource_rules: - ## platform: ${{ platform }} - ## bazel: ${{ bazel }} - ## <<: *resource_rules + resource_rules: + # Resource tests have macOS compatibility issues, run only on Linux + platform: ubuntu2404 + bazel: ${{ bazel }} + <<: *resource_rules tools_bzlmod: platform: ${{ platform }} bazel: ${{ bazel }} <<: *tools_bzlmod - # TODO(#397): Resource tests need some more debugging. - ## resource_rules_bzlmod: - ## platform: ${{ platform }} - ## bazel: ${{ bazel }} - ## <<: *resource_rules_bzlmod + resource_rules_bzlmod: + # Resource tests have macOS compatibility issues, run only on Linux + platform: ubuntu2404 + bazel: ${{ bazel }} + <<: *resource_rules_bzlmod rules_bzlmod: platform: ${{ platform }} bazel: ${{ bazel }} @@ -140,7 +144,7 @@ tasks: <<: *rules_coverage macos_a_l_t_coverage: name: "Macos android_local_test coverage" - platform: macos + platform: macos_arm64 bazel: ${{ bazel }} <<: *rules_coverage # TODO: Make windows ALT coverage work diff --git a/.bazelrc b/.bazelrc index 10a6915ee..faa25c257 100644 --- a/.bazelrc +++ b/.bazelrc @@ -6,7 +6,7 @@ common --tool_java_runtime_version=17 # Workaround for a rules_java + bazel < 8.3.0 issue. It should only be relevant # for bazel@HEAD and rolling releases. # https://github.com/bazelbuild/bazel/pull/26119 -common --repositories_without_autoloads=bazel_features_version,bazel_features_globals +common --repositories_without_autoloads=bazel_features_version,bazel_features_globals,cc_compatibility_proxy # Newer versions of protobuf require downstream transitive projects to set C++ language version flags. common:linux --cxxopt=-std=c++17 diff --git a/.bazelversion b/.bazelversion index ba7f754d0..af813d8c4 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.4.0 +9.0.0rc3 diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index fd2cf91ed..ee5b3f034 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -1,8 +1,8 @@ bcr_test_module: module_path: examples/basicapp matrix: - platform: ["ubuntu2004", "macos", "windows"] - bazel: ["7.4.1", "8.0.0", "rolling"] + platform: ["ubuntu2404", "macos", "windows"] + bazel: ["7.7.1", "8.4.2", "rolling"] tasks: run_test_module: name: "Verify build targets with bzlmod" diff --git a/.gitignore b/.gitignore index 9825d54a8..33c1160b7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ bazel-* .aswb *.swp MODULE.bazel.lock +.claude diff --git a/BUILD b/BUILD index 4c9dcbc28..5cd188c26 100644 --- a/BUILD +++ b/BUILD @@ -76,17 +76,12 @@ alias( actual = "@androidsdk//:d8_jar_import", ) -alias( - name = "androidsdk_dx_jar_import", - actual = "@androidsdk//:dx_jar_import", -) - alias( name = "androidsdk_files", actual = "@androidsdk//:files", ) alias( - name = "androidsdk_has_android_sdk", - actual = "@androidsdk//:has_android_sdk", + name = "androidsdk_has_androidsdk", + actual = "@androidsdk//:has_androidsdk", ) diff --git a/MODULE.bazel b/MODULE.bazel index 19a49858f..26c03f52d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -4,20 +4,20 @@ module( compatibility_level = 1, ) -bazel_dep(name = "platforms", version = "0.0.5") +bazel_dep(name = "platforms", version = "1.0.0") bazel_dep(name = "rules_license", version = "1.0.0") -bazel_dep(name = "rules_java", version = "8.13.0") -bazel_dep(name = "rules_cc", version = "0.1.1") -bazel_dep(name = "rules_shell", version = "0.1.2") +bazel_dep(name = "rules_java", version = "9.3.0") +bazel_dep(name = "rules_cc", version = "0.2.14") +bazel_dep(name = "rules_shell", version = "0.6.1") -bazel_dep(name = "stardoc", version = "0.7.2", dev_dependency = True) +bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True) rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains") use_repo(rules_java_toolchains, "remote_java_tools") -bazel_dep(name = "protobuf", version = "31.1", repo_name = "com_google_protobuf") -bazel_dep(name = "rules_jvm_external", version = "6.6") -bazel_dep(name = "bazel_skylib", version = "1.0.3") +bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf") +bazel_dep(name = "rules_jvm_external", version = "6.9") +bazel_dep(name = "bazel_skylib", version = "1.8.1") bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric") register_toolchains("//toolchains/android:all") @@ -25,11 +25,11 @@ register_toolchains("//toolchains/android:all") register_toolchains("//toolchains/android_sdk:all") # go-related dependency setup -bazel_dep(name = "rules_go", version = "0.51.0-rc2", repo_name = "io_bazel_rules_go") -bazel_dep(name = "gazelle", version = "0.40.0", repo_name = "bazel_gazelle") +bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go") +bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle") bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl") -bazel_dep(name = "bazel_worker_api", version = "0.0.4") -bazel_dep(name = "bazel_worker_java", version = "0.0.4") +bazel_dep(name = "bazel_worker_api", version = "0.0.8") +bazel_dep(name = "bazel_worker_java", version = "0.0.8") go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") go_sdk.download(version = "1.22.4") @@ -46,7 +46,7 @@ use_repo( ) # python-related dependency setup -bazel_dep(name = "rules_python", version = "0.37.1", repo_name = "rules_python") +bazel_dep(name = "rules_python", version = "1.6.0", repo_name = "rules_python") python = use_extension("@rules_python//python/extensions:python.bzl", "python") python.toolchain( @@ -55,10 +55,9 @@ python.toolchain( ) # proto-related dependency setup -bazel_dep(name = "rules_proto", version = "6.0.2", repo_name = "rules_proto") +bazel_dep(name = "rules_proto", version = "7.1.0", repo_name = "rules_proto") maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") - # Maven for android_ide_common need to be separated into their own separate maven_install for now # due to compatibility issues with newer versions. maven.install( @@ -79,8 +78,8 @@ maven.install( # These technically aren't needed, but the protobuf version pulled # in by these older deps has compatibility issues with the newer # protobuf runtimes. - "com.google.protobuf:protobuf-java:4.31.1", - "com.google.protobuf:protobuf-java-util:4.31.1", + "com.google.protobuf:protobuf-java:4.33.1", + "com.google.protobuf:protobuf-java-util:4.33.1", ], repositories = [ "https://maven.google.com", @@ -89,6 +88,7 @@ maven.install( use_starlark_android_rules = True, ) use_repo(maven, "android_ide_common_30_1_3") + maven.install( name = "rules_android_maven", aar_import_bzl_label = "@rules_android//rules:rules.bzl", @@ -117,8 +117,8 @@ maven.install( "jakarta.inject:jakarta.inject-api:2.0.1", "junit:junit:4.13.2", "com.beust:jcommander:1.82", - "com.google.protobuf:protobuf-java:4.31.1", - "com.google.protobuf:protobuf-java-util:4.31.1", + "com.google.protobuf:protobuf-java:4.33.1", + "com.google.protobuf:protobuf-java-util:4.33.1", "com.google.code.findbugs:jsr305:3.0.2", "androidx.databinding:databinding-compiler:8.7.0", "org.ow2.asm:asm:9.6", @@ -157,10 +157,9 @@ maven.install( ], # To generate, run: # REPIN=1 bazelisk run --enable_bzlmod @rules_android_maven//:pin - # lock_file = "//:rules_android_maven_install.json", + lock_file = "//:rules_android_maven_install.json", use_starlark_android_rules = True, ) - use_repo( maven, "rules_android_maven", @@ -177,7 +176,7 @@ bazel_dep( ) bazel_dep( name = "cgrindel_bazel_starlib", - version = "0.17.0", + version = "0.18.0", dev_dependency = True, ) @@ -187,7 +186,7 @@ bazel_binaries = use_extension( dev_dependency = True, ) bazel_binaries.download(version = "last_green") -use_repo(bazel_binaries, "bazel_binaries") +use_repo(bazel_binaries, "bazel_binaries", "bazel_binaries_bazelisk", "build_bazel_bazel_last_green") # extension for apksignerextensions apksig_extension = use_extension("//bzlmod_extensions:apksig.bzl", "apksig_extension") diff --git a/WORKSPACE b/WORKSPACE index 099ac3367..c5a3ae913 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -6,12 +6,15 @@ load("prereqs.bzl", "rules_android_prereqs") rules_android_prereqs(dev_mode = True) -load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") -rules_java_dependencies() - load("@bazel_features//:deps.bzl", "bazel_features_deps") bazel_features_deps() +load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") +compatibility_proxy_repo() + +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") +rules_java_dependencies() + # note that the following line is what is minimally required from protobuf for the java rules # consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility diff --git a/defs.bzl b/defs.bzl index 6d9fff799..395540471 100644 --- a/defs.bzl +++ b/defs.bzl @@ -57,8 +57,8 @@ def rules_android_workspace(): # These technically aren't needed, but the protobuf version pulled # in by these older deps has compatibility issues with the newer # protobuf runtimes. - "com.google.protobuf:protobuf-java:4.31.1", - "com.google.protobuf:protobuf-java-util:4.31.1", + "com.google.protobuf:protobuf-java:4.33.1", + "com.google.protobuf:protobuf-java-util:4.33.1", ], repositories = [ "https://maven.google.com", @@ -94,8 +94,8 @@ def rules_android_workspace(): "jakarta.inject:jakarta.inject-api:2.0.1", "junit:junit:4.13.2", "com.beust:jcommander:1.82", - "com.google.protobuf:protobuf-java:4.31.1", - "com.google.protobuf:protobuf-java-util:4.31.1", + "com.google.protobuf:protobuf-java:4.33.1", + "com.google.protobuf:protobuf-java-util:4.33.1", "com.google.code.findbugs:jsr305:3.0.2", "androidx.databinding:databinding-compiler:8.7.0", "org.ow2.asm:asm:9.6", @@ -141,16 +141,17 @@ def rules_android_workspace(): ) maven_install( - # Specifically named since the worker API lib needs `@maven` to exist. + # Specifically named since the worker API lib needs `@bazel_worker_maven` to exist + # in WORKSPACE mode. # All lines in the artifacts list must be tagged "bazel worker api" for # the presubmit maven artifact consistency checker to pass. - name = "maven", + name = "bazel_worker_maven", artifacts = [ # bazel worker api "com.google.code.gson:gson:2.10.1", # bazel worker api "com.google.errorprone:error_prone_annotations:2.23.0", # bazel worker api "com.google.guava:guava:33.0.0-jre", # bazel worker api - "com.google.protobuf:protobuf-java:4.27.2", # bazel worker api - "com.google.protobuf:protobuf-java-util:4.27.2", # bazel worker api + "com.google.protobuf:protobuf-java:4.33.1", # bazel worker api + "com.google.protobuf:protobuf-java-util:4.33.1", # bazel worker api "junit:junit:4.13.2", # bazel worker api "org.mockito:mockito-core:5.4.0", # bazel worker api "com.google.truth:truth:1.4.0", # bazel worker api @@ -170,12 +171,8 @@ def rules_android_workspace(): gazelle_dependencies() # gazelle:repository go_repository name=org_golang_x_xerrors importpath=golang.org/x/xerrors - go_repository( - name = "org_golang_google_protobuf", - importpath = "google.golang.org/protobuf", - sum = "h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=", - version = "v1.31.0", - ) + # Note: org_golang_google_protobuf is now set up by go_rules_dependencies() + # with proper patches for newer protobuf versions. go_repository( name = "com_github_google_go_cmp", diff --git a/examples/basicapp/.bazelrc b/examples/basicapp/.bazelrc index 54df4b997..08999d781 100644 --- a/examples/basicapp/.bazelrc +++ b/examples/basicapp/.bazelrc @@ -13,7 +13,7 @@ common --tool_java_runtime_version=17 # Workaround for a rules_java + bazel < 8.3.0 issue. It should only be relevant # for bazel@HEAD and rolling releases. # https://github.com/bazelbuild/bazel/pull/26119 -common --repositories_without_autoloads=bazel_features_version,bazel_features_globals +common --repositories_without_autoloads=bazel_features_version,bazel_features_globals,cc_compatibility_proxy # Newer versions of protobuf require downstream transitive projects to set C++ language version flags. common:linux --cxxopt=-std=c++17 diff --git a/examples/basicapp/MODULE.bazel b/examples/basicapp/MODULE.bazel index 997e5292b..7a213eb92 100644 --- a/examples/basicapp/MODULE.bazel +++ b/examples/basicapp/MODULE.bazel @@ -2,8 +2,9 @@ module( name = "basicapp", ) -bazel_dep(name = "rules_java", version = "8.12.0") -bazel_dep(name = "bazel_skylib", version = "1.3.0") +bazel_dep(name = "rules_java", version = "9.0.3") +bazel_dep(name = "bazel_skylib", version = "1.8.1") +bazel_dep(name = "rules_jvm_external", version = "6.7") bazel_dep( name = "rules_android", diff --git a/examples/basicapp/WORKSPACE b/examples/basicapp/WORKSPACE index 4e9b9c549..3f4d9342f 100644 --- a/examples/basicapp/WORKSPACE +++ b/examples/basicapp/WORKSPACE @@ -9,13 +9,16 @@ local_repository( load("@rules_android//:prereqs.bzl", "rules_android_prereqs") rules_android_prereqs() +load("@bazel_features//:deps.bzl", "bazel_features_deps") +bazel_features_deps() + +load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") +compatibility_proxy_repo() + ##### rules_java setup for rules_android ##### load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() -load("@bazel_features//:deps.bzl", "bazel_features_deps") -bazel_features_deps() - # note that the following line is what is minimally required from protobuf for the java rules # consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility diff --git a/prereqs.bzl b/prereqs.bzl index ca22a430b..8decb3a09 100644 --- a/prereqs.bzl +++ b/prereqs.bzl @@ -21,21 +21,29 @@ load("//bzlmod_extensions:com_android_dex.bzl", _com_android_dex_archive = "com_ def rules_android_prereqs(dev_mode = False): """Downloads prerequisite repositories for rules_android.""" + maybe( + http_archive, + name = "bazel_features", + sha256 = "a660027f5a87f13224ab54b8dc6e191693c554f2692fcca46e8e29ee7dabc43b", + strip_prefix = "bazel_features-1.30.0", + url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.30.0/bazel_features-v1.30.0.tar.gz", + ) + maybe( http_archive, name = "rules_java", urls = [ - "https://github.com/bazelbuild/rules_java/releases/download/8.13.0/rules_java-8.13.0.tar.gz", + "https://github.com/bazelbuild/rules_java/releases/download/9.2.0/rules_java-9.2.0.tar.gz", ], - sha256 = "b6c6d92ca9dbb77de31fb6c6a794d20427072663ce41c2b047902ffcc123e3ef", + sha256 = "2f822fbc33b99de5bbeaceada4be2bd3bb5c8da80e2f7462a9d300c8fc312f11", ) maybe( http_archive, name = "rules_cc", - urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz"], - sha256 = "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42", - strip_prefix = "rules_cc-0.1.1", + urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.2.14/rules_cc-0.2.14.tar.gz"], + sha256 = "a2fdfde2ab9b2176bd6a33afca14458039023edb1dd2e73e6823810809df4027", + strip_prefix = "rules_cc-0.2.14", ) maybe( @@ -45,8 +53,8 @@ def rules_android_prereqs(dev_mode = False): url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.31.0.tar", ) - RULES_JVM_EXTERNAL_TAG = "6.6" - RULES_JVM_EXTERNAL_SHA = "3afe5195069bd379373528899c03a3072f568d33bd96fe037bd43b1f590535e7" + RULES_JVM_EXTERNAL_TAG = "6.9" + RULES_JVM_EXTERNAL_SHA = "3c41eae4226a7dfdce7b213bc541557b8475c92da71e2233ec7c306630243a65" maybe( http_archive, name = "rules_jvm_external", @@ -55,8 +63,8 @@ def rules_android_prereqs(dev_mode = False): url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG), ) - PROTOBUF_VERSION = "31.1" - PROTOBUF_HASH = "12bfd76d27b9ac3d65c00966901609e020481b9474ef75c7ff4601ac06fa0b82" + PROTOBUF_VERSION = "33.1" + PROTOBUF_HASH = "fda132cb0c86400381c0af1fe98bd0f775cb566cb247cdcc105e344e00acc30e" maybe( http_archive, name = "com_google_protobuf", @@ -77,29 +85,29 @@ def rules_android_prereqs(dev_mode = False): http_archive( name = "bazel_skylib", - sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", + sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac", urls = [ - "https://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.8.1/bazel-skylib-1.8.1.tar.gz", ], ) maybe( http_archive, name = "io_bazel_rules_go", - sha256 = "1101d7e81a6e7f9cee94dd947bed705144bf339257fbec1d73d620df87e58885", + sha256 = "68af54cb97fbdee5e5e8fe8d210d15a518f9d62abfd71620c3eaff3b26a5ff86", urls = [ - "https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.51.0-rc2/rules_go-v0.51.0-rc2.zip", - "https://github.com/bazel-contrib/rules_go/releases/download/v0.51.0-rc2/rules_go-v0.51.0-rc2.zip", + "https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip", + "https://github.com/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip", ], ) maybe( http_archive, name = "bazel_gazelle", - sha256 = "a80893292ae1d78eaeedd50d1cab98f242a17e3d5741b1b9fb58b5fd9d2d57bc", + sha256 = "675114d8b433d0a9f54d81171833be96ebc4113115664b791e6f204d58e93446", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.40.0/bazel-gazelle-v0.40.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.40.0/bazel-gazelle-v0.40.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.47.0/bazel-gazelle-v0.47.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.47.0/bazel-gazelle-v0.47.0.tar.gz", ], ) @@ -133,21 +141,21 @@ def rules_android_prereqs(dev_mode = False): maybe( http_archive, name = "rules_proto", - sha256 = "0e5c64a2599a6e26c6a03d6162242d231ecc0de219534c38cb4402171def21e8", - strip_prefix = "rules_proto-7.0.2", - url = "https://github.com/bazelbuild/rules_proto/releases/download/7.0.2/rules_proto-7.0.2.tar.gz", + sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4", + strip_prefix = "rules_proto-7.1.0", + url = "https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz", ) maybe( http_archive, name = "rules_python", - sha256 = "690e0141724abb568267e003c7b6d9a54925df40c275a870a4d934161dc9dd53", - strip_prefix = "rules_python-0.40.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.40.0/rules_python-0.40.0.tar.gz", + sha256 = "fa7dd2c6b7d63b3585028dd8a90a6cf9db83c33b250959c2ee7b583a6c130e12", + strip_prefix = "rules_python-1.6.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.6.0/rules_python-1.6.0.tar.gz", ) - BAZEL_WORKER_API_VERSION = "0.0.4" - BAZEL_WORKER_API_HASH = "79b30bcdab8cb0dce1523b28ff798067419715f5540a8a446bbccf393e5eb79c" + BAZEL_WORKER_API_VERSION = "0.0.8" + BAZEL_WORKER_API_HASH = "a58c8c1e53aec7d66498168b0525bfd87add4d3cfd18e3ed03d5bed929dd68fc" maybe( http_archive, name = "bazel_worker_api", @@ -171,19 +179,19 @@ def rules_android_prereqs(dev_mode = False): http_archive, name = "rules_shell", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_shell/releases/download/v0.3.0/rules_shell-v0.3.0.tar.gz", - "https://github.com/bazelbuild/rules_shell/releases/download/v0.3.0/rules_shell-v0.3.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_shell/releases/download/v0.6.1/rules_shell-v0.6.1.tar.gz", + "https://github.com/bazelbuild/rules_shell/releases/download/v0.6.1/rules_shell-v0.6.1.tar.gz", ], - sha256 = "d8cd4a3a91fc1dc68d4c7d6b655f09def109f7186437e3f50a9b60ab436a0c53", - strip_prefix = "rules_shell-0.3.0", + sha256 = "e6b87c89bd0b27039e3af2c5da01147452f240f75d505f5b6880874f31036307", + strip_prefix = "rules_shell-0.6.1", ) maybe( http_archive, name = "rules_cc", - urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.16/rules_cc-0.0.16.tar.gz"], - sha256 = "bbf1ae2f83305b7053b11e4467d317a7ba3517a12cef608543c1b1c5bf48a4df", - strip_prefix = "rules_cc-0.0.16", + urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.2.14/rules_cc-0.2.14.tar.gz"], + sha256 = "a2fdfde2ab9b2176bd6a33afca14458039023edb1dd2e73e6823810809df4027", + strip_prefix = "rules_cc-0.2.14", ) maybe( @@ -198,9 +206,9 @@ def rules_android_prereqs(dev_mode = False): maybe( http_archive, name = "bazel_skylib", - sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", + sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac", urls = [ - "https://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.8.1/bazel-skylib-1.8.1.tar.gz", ], ) @@ -220,8 +228,8 @@ def rules_android_prereqs(dev_mode = False): maybe( http_archive, name = "cgrindel_bazel_starlib", - sha256 = "a8d25340956b429b56302d3fd702bb3df8b3a67db248dd32b3084891ad497964", + sha256 = "dfa423dbf5aac0a5217d3780b295abd3ea1c633d5f9198712b23f0f14f2e8d92", urls = [ - "https://github.com/cgrindel/bazel-starlib/releases/download/v0.17.0/bazel-starlib.v0.17.0.tar.gz", + "https://github.com/cgrindel/bazel-starlib/releases/download/v0.18.0/bazel-starlib.v0.18.0.tar.gz", ], ) diff --git a/py_support/requirements.in b/py_support/requirements.in new file mode 100644 index 000000000..6a4f5c409 --- /dev/null +++ b/py_support/requirements.in @@ -0,0 +1,2 @@ +# Python dependencies for rules_android development tools +# This file is intentionally empty as no additional pip dependencies are required. diff --git a/py_support/requirements_lock.txt b/py_support/requirements_lock.txt new file mode 100644 index 000000000..30448b9af --- /dev/null +++ b/py_support/requirements_lock.txt @@ -0,0 +1,6 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# bazel run //py_support:requirements.update +# diff --git a/rules/BUILD b/rules/BUILD index 502bc94b3..5f35bea31 100644 --- a/rules/BUILD +++ b/rules/BUILD @@ -56,6 +56,7 @@ bzl_library( "//rules/flags:bzl", "@bazel_skylib//lib:paths", "@rules_java//java/common", + "@rules_java//java/private:android_support", ], ) @@ -127,6 +128,16 @@ bzl_library( ], ) +bzl_library( + name = "utils_bzl", + srcs = ["utils.bzl"], + visibility = ["//:__subpackages__"], + deps = [ + ":visibility_bzl", + "//providers:providers_bzl", + ], +) + bzl_library( name = "visibility_bzl", srcs = ["visibility.bzl"], diff --git a/rules/android_sdk_repository/empty.template.bzl b/rules/android_sdk_repository/empty.template.bzl index 493abb64f..272e66690 100644 --- a/rules/android_sdk_repository/empty.template.bzl +++ b/rules/android_sdk_repository/empty.template.bzl @@ -74,11 +74,6 @@ filegroup( srcs = [":error_message"], ) -filegroup( - name = "dx_jar_import", - srcs = [":error_message"], -) - genrule( name = "invalid_android_sdk_repository_error", outs = [ diff --git a/rules/resources.bzl b/rules/resources.bzl index a0b40ed6e..516153415 100644 --- a/rules/resources.bzl +++ b/rules/resources.bzl @@ -376,7 +376,8 @@ OUT_DIR=$(mktemp -d) CUR_PWD=$(pwd) if zipinfo -t "$1"; then - ORDERED_LIST=`(unzip -l "$1" | sed -e '1,3d' | head -n -2 | tr -s " " | cut -d " " -f5)` + # Use awk instead of 'head -n -2' for macOS compatibility (BSD head doesn't support negative counts) + ORDERED_LIST=`(unzip -l "$1" | sed -e '1,3d' | awk '{lines[NR]=$0} END{for(i=1;i<=NR-2;i++) print lines[i]}' | tr -s " " | cut -d " " -f5)` unzip -q "$1" -d "$IN_DIR" @@ -385,7 +386,8 @@ if zipinfo -t "$1"; then for FILE in $ORDERED_LIST; do cd "$IN_DIR" if [ -f "$FILE" ]; then - sed -i 's/Databinding\\-processed\\-resources/databinding\\-processed\\-resources/g' "$FILE" + # Use sed with backup extension for macOS compatibility, then remove backup + sed -i.bak 's/Databinding\\-processed\\-resources/databinding\\-processed\\-resources/g' "$FILE" && rm -f "$FILE.bak" NEW_NAME=`echo "$FILE" | sed 's/Databinding\\-processed\\-resources/databinding\\-processed\\-resources/g' | sed 's#'"$IN_DIR"'/##g'` mkdir -p `dirname "$OUT_DIR/$NEW_NAME"` && touch "$OUT_DIR/$NEW_NAME" cp -p "$FILE" "$OUT_DIR/$NEW_NAME" diff --git a/rules_android_maven_install.json b/rules_android_maven_install.json index 2e1b0f296..f72db6b4c 100644 --- a/rules_android_maven_install.json +++ b/rules_android_maven_install.json @@ -1,16 +1,25 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1783850866, - "__RESOLVED_ARTIFACTS_HASH": 758228202, + "__INPUT_ARTIFACTS_HASH": -1876333943, + "__RESOLVED_ARTIFACTS_HASH": -1646878489, "conflict_resolution": { - "com.google.protobuf:protobuf-java-util:3.9.2": "com.google.protobuf:protobuf-java-util:3.19.3" + "com.android.tools.build:aapt2-proto:8.6.1-11315950": "com.android.tools.build:aapt2-proto:8.11.0-alpha10-12782657", + "com.android:zipflinger:8.7.0": "com.android:zipflinger:8.11.0-alpha10", + "com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2", + "com.google.guava:guava:32.1.2-jre": "com.google.guava:guava:33.3.1-jre", + "com.google.testparameterinjector:test-parameter-injector:1.16": "com.google.testparameterinjector:test-parameter-injector:1.18", + "org.bouncycastle:bcprov-jdk18on:1.77": "org.bouncycastle:bcprov-jdk18on:1.79", + "org.ow2.asm:asm-commons:9.6": "org.ow2.asm:asm-commons:9.7.1", + "org.ow2.asm:asm-tree:9.6": "org.ow2.asm:asm-tree:9.7.1", + "org.ow2.asm:asm-util:9.6": "org.ow2.asm:asm-util:9.7.1", + "org.ow2.asm:asm:9.6": "org.ow2.asm:asm:9.7.1" }, "artifacts": { "androidx.annotation:annotation": { "shasums": { - "jar": "97dc45afefe3a1e421da42b8b6e9f90491477c45fc6178203e3a5e8a05ee8553" + "jar": "b11676837cad011a5285d6074418649107ef25eba17131517e9557ef8c9984ed" }, - "version": "1.3.0" + "version": "1.7.0-beta01" }, "androidx.annotation:annotation-experimental:aar": { "shasums": { @@ -18,6 +27,12 @@ }, "version": "1.1.0" }, + "androidx.annotation:annotation-jvm": { + "shasums": { + "jar": "e36b8e4b8393a4adc74e3d4ab22ad5a36396f0cea2e40b5734eae14937dfd224" + }, + "version": "1.7.0-beta01" + }, "androidx.concurrent:concurrent-futures": { "shasums": { "jar": "0ce067c514a0d1049d1bebdf709e344ed3266fe9744275682937cdcb13334e9e" @@ -28,13 +43,19 @@ "shasums": { "jar": "66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" + }, + "androidx.databinding:databinding-compiler": { + "shasums": { + "jar": "ec92b3db7362b04929b4415542e7b1791cac76b03465f36d7de61fdbcc6e22ca" + }, + "version": "8.7.0" }, "androidx.databinding:databinding-compiler-common": { "shasums": { - "jar": "b89d68cdc28bd70d7041a780228f9c788b8693bd638d4bc8f591128c7885d304" + "jar": "f4ccc0eafca4a47be5bf910209b986ac0921b6b5b52caa1bf4aa52900d244edd" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "androidx.lifecycle:lifecycle-common": { "shasums": { @@ -68,9 +89,9 @@ }, "androidx.test.espresso:espresso-idling-resource:aar": { "shasums": { - "jar": "84fb8e2f5eda937771bee28582f5d2cfa61b0e9438d02041ca61b81e3dac3c87" + "jar": "bc63a8780f1c707724e389f530cb2e1a6847da97f6a8114604c002aba2fd86ca" }, - "version": "3.5.1" + "version": "3.6.1" }, "androidx.test.ext:junit:aar": { "shasums": { @@ -98,9 +119,9 @@ }, "androidx.test:monitor:aar": { "shasums": { - "jar": "a78d9b7db40ad49e1e944cccf28b8f9b729e2e0200587aa88b0472b5ec004ee0" + "jar": "868cc120d10d024b886fa157e1e1eaee0e6a8e5d55e7f765ef41d8fc0fea775b" }, - "version": "1.7.0-alpha01" + "version": "1.7.2" }, "androidx.tracing:tracing:aar": { "shasums": { @@ -118,31 +139,55 @@ "shasums": { "jar": "794113709dab21b06c262b3795e73cb708fbacae61715f34361e1af6237a1870" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" + }, + "com.android.tools.adblib:adblib": { + "shasums": { + "jar": "e135e7707bf51f21be1ed58e149f814ec17b36bbfda5bad067c3eae9e54aaa1f" + }, + "version": "8.11.0-alpha10" + }, + "com.android.tools.adblib:adblib-tools": { + "shasums": { + "jar": "96e5eb477c9885e63ed18a5b1e6fd7bcdf71d4248b4aef08a9ce5689a1ee697d" + }, + "version": "8.11.0-alpha10" }, "com.android.tools.analytics-library:crash": { "shasums": { - "jar": "d5be79bfa90311d39dd767516539afa122f9d40bc1e4bd8fc76e07b8151379f3" + "jar": "cca97ac29a1329bd310a3e832b6e57f46227e501aa529c00a63df217c5d7df41" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.analytics-library:protos": { "shasums": { - "jar": "28024d2d414db7be4cd175868288fd8a9ca01de3526caa34c4d07497510035c2" + "jar": "fe08d0175ddf6ee17463aa047a44024b07626b41676e693b2091cb4e227fa598" }, - "version": "31.2.0-alpha15" + "version": "31.11.0-alpha10" }, "com.android.tools.analytics-library:shared": { "shasums": { - "jar": "7bd455bda29e1528cda4153332b708ed2d0066dce68f60a51be11f529fabdd77" + "jar": "306355bafa0727ab1bffcab94ba4b607f8ce7b953c9ba20d58d72b325c1a8ce7" }, - "version": "31.2.0-alpha15" + "version": "31.11.0-alpha10" }, "com.android.tools.analytics-library:tracker": { "shasums": { - "jar": "d49b8cd42f041f9a68863110a3e92d1fd892273f458a72474f5d3bbe16646910" + "jar": "e1f954973a4733f76027a5f96fa45472dc3cc22d27b1dc93f3fe6a46a75681be" + }, + "version": "31.7.0" + }, + "com.android.tools.apkdeployer:apkdeployer": { + "shasums": { + "jar": "a2f46e74e51fbc53291c77e7148ebc2fe7765510fad7f2b575a4314712f9e147" }, - "version": "31.2.0-alpha15" + "version": "8.11.0-alpha10" + }, + "com.android.tools.apkparser:binary-resources": { + "shasums": { + "jar": "fb5bd78c9ba5124602358455045b53270ebf215ff80d42a59af9c5a2f21a906f" + }, + "version": "31.11.0-alpha10" }, "com.android.tools.build.jetifier:jetifier-core": { "shasums": { @@ -158,75 +203,75 @@ }, "com.android.tools.build:aapt2-proto": { "shasums": { - "jar": "fd5dbba33bf0ea245dd9f98499632d0cde74d0f61952f213eba94a41a9d1759a" + "jar": "8efcf192c2e54a1c1388b5f648280aa05773fc43e8e5d2a94051bc2380e107df" }, - "version": "8.2.0-alpha15-10154469" + "version": "8.11.0-alpha10-12782657" }, "com.android.tools.build:aaptcompiler": { "shasums": { - "jar": "79d170fcded61ae5ec5543038a2a81764ba94f6d405616a386aca4c5750b9626" + "jar": "ea4a886009444435f7a19fcaede1eaf180e8d85145f7c52a4ba87cbc356c563a" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "com.android.tools.build:apksig": { "shasums": { - "jar": "468ee1852fa12461c6629608fe47be70e50f60be7c4744bb7f62ca48e85c0a6c" + "jar": "c070ed1394629d74641aa0906f60b2ffa1ee77e6366a1f93437f59717b1aeb89" }, - "version": "8.3.0-alpha18" + "version": "8.7.0" }, "com.android.tools.build:apkzlib": { "shasums": { "jar": "1c1a67d6f4f186427ac166ebaa0dd867f595d5144fc925252b05ffb9d1a156b7" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "com.android.tools.build:builder": { "shasums": { - "jar": "d3c737fe6c23182b5ce95e9c90ec1b14d8374642dd3c0cce8b9d7986d1dc8506" + "jar": "89b5beb3396a8b4529bccc653b321a9cd968e25245be3b1c320189759abb6edf" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "com.android.tools.build:builder-model": { "shasums": { - "jar": "e73525c88b1cd5b3f850d3c3720e189e0c05c50a9708c8f6b92b9e3851ca2c3d" + "jar": "a96dc78cf39b4e569de90e8150b5efa66642d25908caf2890c603cc647a16c78" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "com.android.tools.build:builder-test-api": { "shasums": { - "jar": "2c61d0490356050f2789765a17f168e284ce99f878992328aad57d7b9f498317" + "jar": "c32506113d10a5196b5e3f869802722c8f228c123086c04852f866cdf78c050d" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "com.android.tools.build:bundletool": { "shasums": { - "jar": "a998cadd8a291098c708b0c215c2325c9cf545c67fda6fe7e4b268ebf8cd6157" + "jar": "80e02a1bc7063bed3d310c670f70f6de453d06c589ecb6dc05e0ac45fc9b2e50" }, - "version": "1.15.5" + "version": "1.18.2" }, "com.android.tools.build:gradle": { "shasums": { - "jar": "2ac41b12abd4fd0811323e95b26304a192f4a4d41298d433e40a53f6ca5c4de0" + "jar": "1f56b870c409b61e79883aa4027a22c48cafc0cacd004f4def3f2dea1882faa5" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "com.android.tools.build:gradle-api": { "shasums": { - "jar": "75aff4be8085f49f7be4f6a393a2c308b3b91074b04fe128edc478ee34c6a7b4" + "jar": "09e441732c94c811b9f685d840edee4a986ee7b322e10abb6f0abdfd6c7c3382" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "com.android.tools.build:gradle-settings-api": { "shasums": { - "jar": "13dbd5a223fd2c7646f815fc30a45bc2ee119602a151fa31e5d3036ec0a0fab3" + "jar": "7ddfc77332dee3585243152238ff00ac47b1707a419c0f1448453a0498fb6836" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "com.android.tools.build:manifest-merger": { "shasums": { - "jar": "153011ecc7c9c3d9fe03b24ea9198722aba844c87bc39b2611f4de2a76539302" + "jar": "ab92276434e5a61e86c590e7b19f2de161778fa275fc08a8eec84081e2703bb3" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.build:transform-api": { "shasums": { @@ -236,153 +281,189 @@ }, "com.android.tools.ddms:ddmlib": { "shasums": { - "jar": "9abe5c8da13e6433570ce531991b621c6a2544289a5a71a4f951fedc6be0eae2" + "jar": "839957f961100713ea0eed628a8684cc39aa479631c36249793e6df7e0cd63d8" }, - "version": "31.2.0-alpha15" + "version": "31.11.0-alpha10" }, "com.android.tools.layoutlib:layoutlib-api": { "shasums": { - "jar": "2b136521ad932f1a9c700a251a9ff5b6ebd4640423da68ce43ba4c7f7602c225" + "jar": "d06bc650247632a4a4e6596b87312019f45e900267c5476c47a5bfa6e3fd3132" }, - "version": "31.2.0-alpha15" + "version": "31.11.0-alpha10" }, "com.android.tools.lint:lint-model": { "shasums": { - "jar": "3c96acb35de3194359f8fd4d8b5ed129da3588f32a1f010d54496f8db93253c1" + "jar": "9f4c087a199174521d1bc7b8ff05ff1484f770f4518b7fd9f6dae6c261882dbd" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.lint:lint-typedef-remover": { "shasums": { "jar": "5b4f485215ca4d86ef2319fc398b5f2251e62f5446bc5fd0e00653648ddde318" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.utp:android-device-provider-ddmlib-proto": { "shasums": { - "jar": "1a288dfd22f5baa036bffdfdd3ac7504664b94c86dbf6be36630e5587c22e8fe" + "jar": "da9f3f3dae26544c90668549584765d5854a87c425d2cfe577cd34d3600ea097" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.utp:android-device-provider-gradle-proto": { "shasums": { - "jar": "10f9b620a8403fd6a9c9e9c635c63a7975337b1deb5c375b79a6960eb5af88d4" + "jar": "ad2342bb1d6f95563400a322493ea1c229cb93df3944f1261b7399f718494049" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" + }, + "com.android.tools.utp:android-device-provider-profile-proto": { + "shasums": { + "jar": "10d100ced5d083714c1c68bbbb10bb375e8546f92ab0e4219c0e4a5ff298115e" + }, + "version": "31.7.0" }, "com.android.tools.utp:android-test-plugin-host-additional-test-output-proto": { "shasums": { - "jar": "08d12e55fa91ab83dd1b757cdbca3d746809b0a50268f75cf52194f46a2c6673" + "jar": "38450694de6328c2c4cba696f9c04ecdd5ce6952355f68c3a22f9541d1d6546f" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.utp:android-test-plugin-host-apk-installer-proto": { "shasums": { - "jar": "abd2aac816a81e2af7705f3edff3de22bcd806212a1d158f432a39b06ae544e4" + "jar": "543eb6c8d72b2ed7451f8e939d5d80890566f14bc26b7df9c8347506b258d7ae" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.utp:android-test-plugin-host-coverage-proto": { "shasums": { - "jar": "9ebc9c6279a32a453c90cf6b732b3a3f88a80498e746400850f2c66ea7933580" + "jar": "efb4d7014aaa7355246a07c2e437a2231fb252540ff1bce6872c88dc8da89d12" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.utp:android-test-plugin-host-emulator-control-proto": { "shasums": { - "jar": "435438bc84016ec5d28c34c9d017b01365f37949168cffc81126d43757c53ca4" + "jar": "aedec5ec4627d898cccdf42d8038db20eba4495753c53d1b0b378734491caf5f" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.utp:android-test-plugin-host-logcat-proto": { "shasums": { - "jar": "d31ca97afbfcd71a54749d265da11a424b122cf1cfbedbff2cb3d7362c579d3b" + "jar": "9129024bd8e38353bca3eb26dfd8e3628e058d57d6e9d8451ffc35f016751e63" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.utp:android-test-plugin-host-retention-proto": { "shasums": { - "jar": "4d1c3faaff5a38b29426f082e8e8c3f8b85a902086b90d18f706754ad93de04d" + "jar": "3db8ed38ef49b694caea466ae22e3b36cedc9557b3589d0e07c0cdd83294591c" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools.utp:android-test-plugin-result-listener-gradle-proto": { "shasums": { - "jar": "b1e49ff23fa357f8702aef1632b04405224a3846f4fe76654c76ef9bd7b5a601" + "jar": "cbdf71bca60e14c30e7b2cf4b90f0f0a3e8c138f7cadd874b0d9c0ae082e0274" }, - "version": "31.2.0-alpha15" + "version": "31.7.0" }, "com.android.tools:annotations": { "shasums": { - "jar": "ee3bfd9cdb5012bdb61520f8654a785577e9bb337e5939c5c6149a446684ee16" + "jar": "3b4bb9620c17d19e5bd91ac1988080553573b4c3b739fdd92416f42f2daf3e78" }, - "version": "31.2.0-alpha15" + "version": "31.11.0-alpha10" }, "com.android.tools:common": { "shasums": { - "jar": "07908408e25f78dd13bfd59f01c3222713f73017ca81dacb662923f03e703f29" + "jar": "f93c8450118d7c9db3962d316794321dda3a890d10726a6b6a45d0899a05b8bc" }, - "version": "31.2.0-alpha15" + "version": "31.11.0-alpha10" + }, + "com.android.tools:desugar_jdk_libs_configuration": { + "shasums": { + "jar": "7bc9051b3a1ec19806311dcb6aa9b9ba7ef9c22caa6f4810da55bde285fb7770" + }, + "version": "2.1.5" }, "com.android.tools:desugar_jdk_libs_configuration_minimal": { "shasums": { - "jar": "3cdda0056c3039ab9c0aef7f19c10298f6a56407476b59b03055c42a222b71b7" + "jar": "09704d34fd1ef3937b504d53a0083fa5e0bb0f275c4241a0b6c2da56ac6f8a05" }, - "version": "2.0.4" + "version": "2.1.5" }, "com.android.tools:desugar_jdk_libs_configuration_nio": { "shasums": { - "jar": "32d68079c34ec46695eb7af4e4daf20e67f21392e4ae501d0fd3c7fe3406c893" + "jar": "7db51661cd07d1fd5cf12769a75ba201910624bb3801c09363dd3cb28e31c51b" }, - "version": "2.0.4" + "version": "2.1.5" }, "com.android.tools:desugar_jdk_libs_minimal": { "shasums": { - "jar": "3bf4004c745f4c3740eea4c5729766b27746236f095c0fc52870e861183cbb9c" + "jar": "d8044befae095781b9a80bf1faa92edc30382d75d437476784c1bf991598a976" }, - "version": "2.0.4" + "version": "2.1.5" }, "com.android.tools:desugar_jdk_libs_nio": { "shasums": { - "jar": "3bf4004c745f4c3740eea4c5729766b27746236f095c0fc52870e861183cbb9c" + "jar": "d8044befae095781b9a80bf1faa92edc30382d75d437476784c1bf991598a976" }, - "version": "2.0.4" + "version": "2.1.5" }, "com.android.tools:dvlib": { "shasums": { - "jar": "0cb57c126ed95657ae1e0974af092b401a52b76d5683f7ccbe1f8f21af06794e" + "jar": "e3cf3fdc947788dee8d5baa76cb72a66571174bc4741edf0e3bab97a7ca90e1b" + }, + "version": "31.11.0-alpha10" + }, + "com.android.tools:r8": { + "shasums": { + "jar": "204b2fc2b0f4e888dc0ef748b58090def1bf4185068d36abbb94841dbc7107a8" }, - "version": "31.2.0-alpha15" + "version": "8.9.35" }, "com.android.tools:repository": { "shasums": { - "jar": "0f1778a98a79fb6f3a8fa5116b7f16092960bf49509802656c1117c75cc7875c" + "jar": "095becb618937d1d2a4d77a921d70563ec9ffda05d62ec1aff6a9bae701d39da" }, - "version": "31.2.0-alpha15" + "version": "31.11.0-alpha10" }, "com.android.tools:sdk-common": { "shasums": { - "jar": "a03d64f134f4597fda31f53c2a45a4f9dee6fd667e47b64a46153cec3b2bffc1" + "jar": "46f4645222d393c1131be1e66fdc0be0da4d7f2ab3c68a728308367f99f3bdf2" }, - "version": "31.2.0-alpha15" + "version": "31.11.0-alpha10" }, "com.android.tools:sdklib": { "shasums": { - "jar": "b457724135aed8a9676e72d3b2dd66432ae63acc8b35460113d37578190b992c" + "jar": "d2360450812c5b0a785d7ca4927d022fee557c45132a220ea87e6df2460c3790" }, - "version": "31.2.0-alpha15" + "version": "31.11.0-alpha10" }, "com.android:signflinger": { "shasums": { "jar": "c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" }, - "version": "8.2.0-alpha15" + "version": "8.7.0" }, "com.android:zipflinger": { "shasums": { - "jar": "81dd485618a509a3235929b9eb13091d884452661de6ce5a45cc38b1c555421c" + "jar": "a6a68f03e8d9f8944688c36c6d16c253e81a625930af1d0eb5e592bd2b2da9e8" + }, + "version": "8.11.0-alpha10" + }, + "com.beust:jcommander": { + "shasums": { + "jar": "deeac157c8de6822878d85d0c7bc8467a19cc8484d37788f7804f039dde280b1" }, - "version": "8.2.0-alpha15" + "version": "1.82" + }, + "com.github.ben-manes.caffeine:caffeine": { + "shasums": { + "jar": "8a9b54d3506a3b92ee46b217bcee79196b21ca6d52dc2967c686a205fb2f9c15" + }, + "version": "3.0.5" + }, + "com.github.kevinstern:software-and-algorithms": { + "shasums": { + "jar": "61ab82439cef37343b14f53154c461619375373a56b9338e895709fb54e0864c" + }, + "version": "1.0" }, "com.google.android:annotations": { "shasums": { @@ -392,15 +473,39 @@ }, "com.google.api.grpc:proto-google-common-protos": { "shasums": { - "jar": "5ce71656118618731e34a5d4c61aa3a031be23446dc7de8b5a5e77b66ebcd6ef" + "jar": "4ef1fe0c327fc1521d1d753b0b1c4a875a54bd14ebded3afff0ca395320b6ea9" }, - "version": "2.0.1" + "version": "2.17.0" + }, + "com.google.auto.service:auto-service": { + "shasums": { + "jar": "1f48f451503e623daba7d9ed368cca0f81e1e3815653a4560113e12c0129ebd5" + }, + "version": "1.1.1" + }, + "com.google.auto.service:auto-service-annotations": { + "shasums": { + "jar": "16a76dd00a2650568447f5d6e3a9e2c809d9a42367d56b45215cfb89731f4d24" + }, + "version": "1.1.1" + }, + "com.google.auto.value:auto-value": { + "shasums": { + "jar": "aaf8d637bfed3c420436b9facf1b7a88d12c8785374e4202382783005319c2c3" + }, + "version": "1.11.0" }, "com.google.auto.value:auto-value-annotations": { "shasums": { - "jar": "a4fe0a211925e938a8510d741763ee1171a11bf931f5891ef4d4ee84fca72be2" + "jar": "5a055ce4255333b3346e1a8703da5bf8ff049532286fdcd31712d624abe111dd" + }, + "version": "1.11.0" + }, + "com.google.auto:auto-common": { + "shasums": { + "jar": "f50b1ce8a41fad31a8a819c052f8ffa362ea0a3dbe9ef8f7c7dc9a36d4738a59" }, - "version": "1.10.1" + "version": "1.2.2" }, "com.google.code.findbugs:jsr305": { "shasums": { @@ -410,9 +515,9 @@ }, "com.google.code.gson:gson": { "shasums": { - "jar": "0cdd163ce3598a20fc04eee71b140b24f6f2a3b35f0a499dbbdd9852e83fbfaf" + "jar": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b" }, - "version": "2.10" + "version": "2.11.0" }, "com.google.crypto.tink:tink": { "shasums": { @@ -426,11 +531,35 @@ }, "version": "2.28.3" }, + "com.google.errorprone:error_prone_annotation": { + "shasums": { + "jar": "99f8b53c75a50617d4f9bf45512eda82e7d8e9eb377471d822d3d4c4e034c510" + }, + "version": "2.34.0" + }, "com.google.errorprone:error_prone_annotations": { "shasums": { - "jar": "add3990298501fdcb6ec58fff26608c1d298fb5dfe2f80d74867bf0f5c539668" + "jar": "d9f3af3974fa64cd0f0f34238f40d9898abf7df19ca15849e1978f5beb818cb6" + }, + "version": "2.33.0" + }, + "com.google.errorprone:error_prone_check_api": { + "shasums": { + "jar": "77a1472108ccfb9dcd91ebc7d534453d7a6e8730296f691cb26a7dfb1bc6e8df" + }, + "version": "2.33.0" + }, + "com.google.errorprone:error_prone_core": { + "shasums": { + "jar": "fa9718dede454324b69ea4be67ea1b87ddf4642fd3f62ec022fe448c33ff8a64" }, - "version": "2.19.1" + "version": "2.33.0" + }, + "com.google.errorprone:error_prone_type_annotations": { + "shasums": { + "jar": "5811125e354ad7350d8a7756af67f6455773f4f4fba8faed096ae15551dbd372" + }, + "version": "2.33.0" }, "com.google.flatbuffers:flatbuffers-java": { "shasums": { @@ -438,17 +567,35 @@ }, "version": "1.12.0" }, + "com.google.flogger:flogger": { + "shasums": { + "jar": "bebe7cd82be6c8d5208d6e960cd4344ea10672132ef06f5d4c71a48ab442b963" + }, + "version": "0.8" + }, + "com.google.flogger:flogger-system-backend": { + "shasums": { + "jar": "eb4428e483c5332381778d78c6a19da63b4fef3fa7e40f62dadabea0d7600cb4" + }, + "version": "0.8" + }, "com.google.guava:failureaccess": { "shasums": { - "jar": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26" + "jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064" }, - "version": "1.0.1" + "version": "1.0.2" }, "com.google.guava:guava": { "shasums": { - "jar": "bc65dea7cfd9e4dacf8419d8af0e741655857d27885bb35d943d7187fc3a8fce" + "jar": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90" }, - "version": "32.1.2-jre" + "version": "33.3.1-jre" + }, + "com.google.guava:guava-testlib": { + "shasums": { + "jar": "5ec141072658424f40cd30b91467f5ce63c0e617b91ec927df7256efdfd2d84a" + }, + "version": "33.2.1-jre" }, "com.google.guava:listenablefuture": { "shasums": { @@ -458,39 +605,69 @@ }, "com.google.j2objc:j2objc-annotations": { "shasums": { - "jar": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed" + "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64" }, - "version": "2.8" + "version": "3.0.0" }, "com.google.jimfs:jimfs": { "shasums": { - "jar": "c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd" + "jar": "de16d5c8489729a8512f1a02fbd81f58f89249b72066987da4cc5c87ecb9f72d" }, - "version": "1.1" + "version": "1.2" }, "com.google.protobuf:protobuf-java": { "shasums": { - "jar": "0b8581ad810d2dfaefd0dcfbf1569b1450448650238d7e2fd6b176c932d08c95" + "jar": "fd5cf3d55bc2c3ddb2a8640c9d4c69daa9a5b326fb6e05bae0e56b3f4f85e0f7" }, - "version": "3.21.8" + "version": "4.33.1" }, "com.google.protobuf:protobuf-java-util": { "shasums": { - "jar": "1ec0733f32d49f8194fb5452613039370623715739568a6d3c987d9a7809c16c" + "jar": "f8788f87658d46f8ddb864455eaa046aa218e419c98c93326643ae465aa5c843" }, - "version": "3.19.3" + "version": "4.33.1" + }, + "com.google.testing.compile:compile-testing": { + "shasums": { + "jar": "92cfbee5ad356a403d36688ab7bae74be65db9a117478ace34ac3ab4d1f9feb9" + }, + "version": "0.18" }, "com.google.testing.platform:core-proto": { "shasums": { - "jar": "3920575a74f1437975cdf45276f9b75e7ae41bafb8deb1d60e7d639f21d1b06c" + "jar": "6d8a8906774150f43a8fad08ca64e25c6070c39bd8a6fc13b2593f289242fe95" + }, + "version": "0.0.9-alpha02" + }, + "com.google.testparameterinjector:test-parameter-injector": { + "shasums": { + "jar": "e5a7c649c54c412049908247ca5e25fe6921d746849c6017a84dc6044237a4b4" }, - "version": "0.0.8-alpha08" + "version": "1.18" + }, + "com.google.truth.extensions:truth-java8-extension": { + "shasums": { + "jar": "293f4e4c59ce48e8b68651321d2d9f2355534412b221369b2af8ff76e6acf381" + }, + "version": "1.4.0" + }, + "com.google.truth.extensions:truth-liteproto-extension": { + "shasums": { + "jar": "2445c955286b8bc58903a853d4b9166000c94e4b95aea6ac9da3e1fdc3e08f10" + }, + "version": "1.4.0" + }, + "com.google.truth.extensions:truth-proto-extension": { + "shasums": { + "jar": "99e6cede45cb1fe962e6ae4e95fb045df8038b01eee03eee362bb073e42f54fc" + }, + "version": "1.4.0" }, "com.google.truth:truth": { "shasums": { - "jar": "7f6d50d6f43a102942ef2c5a05f37a84f77788bb448cf33cceebf86d34e575c0" + "jar": "235c28e96ee6701ab01cc852fb294cb0f34756f636a8154b9aef08fb1215bbc4" }, - "version": "1.1.5" + "version": "1.4.0" }, "com.googlecode.juniversalchardet:juniversalchardet": { "shasums": { @@ -500,9 +677,9 @@ }, "com.ibm.icu:icu4j": { "shasums": { - "jar": "3df572b240a68d13b5cd778ad2393e885d26411434cd8f098ac5987ea2e64ce3" + "jar": "543e43a91d1499e331c711a756f833d6fb8cc019f9c9913c0bdf4d53009932d5" }, - "version": "72.1" + "version": "75.1" }, "com.squareup:javapoet": { "shasums": { @@ -542,15 +719,15 @@ }, "commons-codec:commons-codec": { "shasums": { - "jar": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d" + "jar": "b3e9f6d63a790109bf0d056611fbed1cf69055826defeb9894a71369d246ed63" }, - "version": "1.11" + "version": "1.15" }, "commons-io:commons-io": { "shasums": { - "jar": "cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581" + "jar": "671eaa39688dac2ffaa4645b3c9980ae2d0ea2471e4ae6a5da199cd15ae23666" }, - "version": "2.4" + "version": "2.13.0" }, "commons-logging:commons-logging": { "shasums": { @@ -564,119 +741,131 @@ }, "version": "4.7.4" }, + "io.github.eisop:dataflow-errorprone": { + "shasums": { + "jar": "10434fba4e53f55fa9c76904cde414b918932548c9dfc4e2d634ac05ff7a7d10" + }, + "version": "3.41.0-eisop1" + }, + "io.github.java-diff-utils:java-diff-utils": { + "shasums": { + "jar": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5" + }, + "version": "4.12" + }, "io.grpc:grpc-api": { "shasums": { - "jar": "dc381fe018fb10bba8cc66f98db1050a70cee49a8270017c22ec6f77b10f13e5" + "jar": "8d2c384299f84ee8aa7f670f00e7cb26b87e231cf3091474307b32b76910f71c" }, - "version": "1.45.1" + "version": "1.57.0" }, "io.grpc:grpc-context": { "shasums": { - "jar": "262b8d0d23551ccb0c814f89794c73e9b5333ce71eab28eec6a9fc530613e15e" + "jar": "953fcacd82f531e69b76e3834f5830bad4c22ae84144e058d71dc80a7430275d" }, - "version": "1.45.1" + "version": "1.57.0" }, "io.grpc:grpc-core": { "shasums": { - "jar": "8dd8353e2a55678581ec92415c2b92cc8dafb437647dee57a49e36d1e8345b9e" + "jar": "3bee48c73bc4c5b55bed79be0e484adf26ba56bebbe5798ddbf34714ef1e1cea" }, - "version": "1.45.1" + "version": "1.57.0" }, "io.grpc:grpc-netty": { "shasums": { - "jar": "0fef3ca6747242624cad219fdd13b5dbca121de04ea122f5cb1cb5082d998313" + "jar": "81d43f2d4ed18fa341bd840a3735f1403a70074a046e157e27f679b721b4c9ad" }, - "version": "1.45.1" + "version": "1.57.0" }, "io.grpc:grpc-protobuf": { "shasums": { - "jar": "f59fe662030e30923a91c5d80bf3a25486be2740d08b6757575e7c4213782694" + "jar": "49f986d4eab12610fdba4a6890fca52d5eb653598916fdb863a366d5e28eecf7" }, - "version": "1.45.1" + "version": "1.57.0" }, "io.grpc:grpc-protobuf-lite": { "shasums": { - "jar": "874afc4cac1161fdd38121ffd56e58e8c85f5149c13954ab672d6b4ae24c8b9f" + "jar": "2c507c02d981b84a21763d44e09af4f279881dd3e25be3080f6361258607f198" }, - "version": "1.45.1" + "version": "1.57.0" }, "io.grpc:grpc-stub": { "shasums": { - "jar": "4d9d82c59b90383c17f152ba03123c6b4b5a885f933da9a05a05f5f2c9e5b4a0" + "jar": "6e6ee141539fa14d9fa479f7f511605544443c7e011e78e273cf9468aa183060" }, - "version": "1.45.1" + "version": "1.57.0" }, "io.netty:netty-buffer": { "shasums": { - "jar": "568ff7cd9d8e2284ec980730c88924f686642929f8f219a74518b4e64755f3a1" + "jar": "007c7d9c378df02d390567d0d7ddf542ffddb021b7313dbf502392113ffabb08" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, "io.netty:netty-codec": { "shasums": { - "jar": "5d8591ca271a1e9c224e8de3873aa9936acb581ee0db514e7dc18523df36d16c" + "jar": "990c378168dc6364c6ff569701f4f2f122fffe8998b3e189eba4c4d868ed1084" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, "io.netty:netty-codec-http": { "shasums": { - "jar": "fa6fec88010bfaf6a7415b5364671b6b18ffb6b35a986ab97b423fd8c3a0174b" + "jar": "dacf78ce78ab2d29570325db4cd2451ea589639807de95881a0fa7155a9e6b55" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, "io.netty:netty-codec-http2": { "shasums": { - "jar": "c89a70500f59e8563e720aaa808263a514bd9e2bd91ba84eab8c2ccb45f234b2" + "jar": "d96cc09045a1341c6d47494352aa263b87b72fb1d2ea9eca161aa73820bfe8bb" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, "io.netty:netty-codec-socks": { "shasums": { - "jar": "33c4cd134858aabc5afe5dc440c8880186017dc4dc541f34c8e16bffc5546d07" + "jar": "0ea47b5ba23ca1da8eb9146c8fc755c1271414633b1e2be2ce1df764ba0fff2a" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, "io.netty:netty-common": { "shasums": { - "jar": "8adb4c291260ceb2859a68c49f0adeed36bf49587608e2b81ecff6aaf06025e9" + "jar": "443bb316599fb16e3baeba2fb58881814d7ff0b7af176fe76e38071a6e86f8c0" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, "io.netty:netty-handler": { "shasums": { - "jar": "9cb6012af7e06361d738ac4e3bdc49a158f8cf87d9dee0f2744056b7d99c28d5" + "jar": "4e5f563ae14ed713381816d582f5fcfd0615aefb29203486cdfb782d8a00a02b" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, "io.netty:netty-handler-proxy": { "shasums": { - "jar": "ce1123250450d2b17815748177fd36843690b8cd703b47e6dc12d159d86da30d" + "jar": "2ac5f7fbefa0b73ef783889069344d5515505a14b2303be693c5002c486df2b4" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, "io.netty:netty-resolver": { "shasums": { - "jar": "6474598aab7cc9d8d6cfa06c05bd1b19adbf7f8451dbdd73070b33a6c60b1b90" + "jar": "e59770b66e81822e5d111ac4e544d7eb0c543e0a285f52628e53941acd8ed759" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, - "io.netty:netty-tcnative-classes": { + "io.netty:netty-transport": { "shasums": { - "jar": "d3ec888dcc4ac7915bf88b417c5e04fd354f4311032a748a6882df09347eed9a" + "jar": "a5a78019bc1cd43dbc3c7b7cdd3801912ca26d1f498fb560514fee497864ba96" }, - "version": "2.0.46.Final" + "version": "4.1.93.Final" }, - "io.netty:netty-transport": { + "io.netty:netty-transport-native-unix-common": { "shasums": { - "jar": "c5fb68e9a65b6e8a516adfcb9fa323479ee7b4d9449d8a529d2ecab3d3711d5a" + "jar": "774165a1c4dbaacb17f9c1ad666b3569a6a59715ae828e7c3d47703f479a53e7" }, - "version": "4.1.72.Final" + "version": "4.1.93.Final" }, "io.perfmark:perfmark-api": { "shasums": { - "jar": "c705b5c10c18ff3032b9e81742bc2f6b0e5607f6a6dfc0c8ad0cff75d4913042" + "jar": "b7d23e93a34537ce332708269a0d1404788a5b5e1949e82f5535fce51b3ea95b" }, - "version": "0.23.0" + "version": "0.26.0" }, "jakarta.activation:jakarta.activation-api": { "shasums": { @@ -684,6 +873,12 @@ }, "version": "1.2.1" }, + "jakarta.inject:jakarta.inject-api": { + "shasums": { + "jar": "f7dc98062fccf14126abb751b64fab12c312566e8cbdc8483598bffcea93af7c" + }, + "version": "2.0.1" + }, "jakarta.xml.bind:jakarta.xml.bind-api": { "shasums": { "jar": "69156304079bdeed9fc0ae3b39389f19b3cc4ba4443bc80508995394ead742ea" @@ -708,6 +903,18 @@ }, "version": "4.13.2" }, + "net.bytebuddy:byte-buddy": { + "shasums": { + "jar": "e99761a526df0fefbbd3fe14436b0f953000cdfa5151dc63c0b18d37d9c46f1c" + }, + "version": "1.14.5" + }, + "net.bytebuddy:byte-buddy-agent": { + "shasums": { + "jar": "55f19862b870f5d85890ba5386b1b45e9bbc88d5fe1f819abe0c788b4929fa6b" + }, + "version": "1.14.5" + }, "net.java.dev.jna:jna": { "shasums": { "jar": "5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf" @@ -758,39 +965,45 @@ }, "org.bitbucket.b_c:jose4j": { "shasums": { - "jar": "eb14f69c0395d4a106c6c46fe6dff080c4608ccabc99b1f03933d374383d9bbe" + "jar": "808fb3166f3e67dad9811c331029ab1681242fd52b735bc3f33f281167fcc72e" }, - "version": "0.7.0" + "version": "0.9.5" }, - "org.bouncycastle:bcpkix-jdk15on": { + "org.bouncycastle:bcpkix-jdk18on": { "shasums": { - "jar": "efbca754880ce3922ca47a43c1f0b72c45731450a0ef193b9db33bf4bb38ce5f" + "jar": "3639a24ddf9ba4b7eba0659b44770e91eba816421888e571f285aadefe532cd6" }, - "version": "1.67" + "version": "1.79" }, - "org.bouncycastle:bcprov-jdk15on": { + "org.bouncycastle:bcprov-jdk18on": { "shasums": { - "jar": "fa0041a36f9f20af3c6b8dbf6eb49a969e2c9cc029049d61acc526ba3247b3ef" + "jar": "0d81ecc3124536b539bce9aa3fe9621b7f84c9cee371b635a5b31c78b79ab1da" }, - "version": "1.67" + "version": "1.79" }, - "org.bouncycastle:bcprov-jdk18on": { + "org.bouncycastle:bcutil-jdk18on": { "shasums": { - "jar": "dabb98c24d72c9b9f585633d1df9c5cd58d9ad373d0cd681367e6a603a495d58" + "jar": "c70b88ada58938cbc2f005d40329054078bcfa1149e6ffc03e9242eb6ab21836" }, - "version": "1.77" + "version": "1.79" + }, + "org.checkerframework:checker-compat-qual": { + "shasums": { + "jar": "d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d" + }, + "version": "2.5.3" }, "org.checkerframework:checker-qual": { "shasums": { - "jar": "21060faa086dfdec830a40f9460677a75ebbdcffe7cdc012ad1069e9cc30a959" + "jar": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6" }, - "version": "3.35.0" + "version": "3.43.0" }, "org.codehaus.mojo:animal-sniffer-annotations": { "shasums": { - "jar": "e67ec27ceeaf13ab5d54cf5fdbcc544c41b4db8d02d9f006678cca2c7c13ee9d" + "jar": "9ffe526bf43a6348e9d8b33b9cd6f580a7f5eed0cf055913007eda263de974d0" }, - "version": "1.19" + "version": "1.23" }, "org.conscrypt:conscrypt-openjdk-uber": { "shasums": { @@ -828,41 +1041,41 @@ }, "version": "2.0.6" }, - "org.jetbrains.intellij.deps:trove4j": { + "org.jetbrains.kotlin:kotlin-reflect": { "shasums": { - "jar": "c5fd725bffab51846bf3c77db1383c60aaaebfe1b7fe2f00d23fe1b7df0a439d" + "jar": "419778f2b7a826bad6ee2ca1e4bdebe639ab306d2904fa3ef2a308ecfaab3811" }, - "version": "1.0.20200330" + "version": "2.1.20" }, - "org.jetbrains.kotlin:kotlin-reflect": { + "org.jetbrains.kotlin:kotlin-stdlib": { "shasums": { - "jar": "a2b16d1e93a0f635f41789b18ab3d32e6354d27925b3e1a419f9241515cbcdd6" + "jar": "1bcc74e8ce84e2c25eaafde10f1248349cce3062b6e36978cbeec610db1e930a" }, - "version": "1.9.0-Beta" + "version": "2.1.20" }, - "org.jetbrains.kotlin:kotlin-stdlib": { + "org.jetbrains.kotlin:kotlin-stdlib-jdk7": { "shasums": { - "jar": "af458cc55cf69e966668e6010c7ccee4a50d553b3504a2e8311dd0c76242d881" + "jar": "5343bf795783932e5fa538b0bca05af810bb07213edb9baa770c784068f57867" }, - "version": "1.9.0-Beta" + "version": "2.1.20" }, - "org.jetbrains.kotlin:kotlin-stdlib-common": { + "org.jetbrains.kotlin:kotlin-stdlib-jdk8": { "shasums": { - "jar": "3d0d295899cfaa96f82fb6fb85efffa04507dcf0a0d145a496c4e220ea827b57" + "jar": "ed22217b5dc0940a068d8be9440bbe2f7f9f51c466cdd1185e2385cdec19f238" }, - "version": "1.9.0-Beta" + "version": "2.1.20" }, - "org.jetbrains.kotlin:kotlin-stdlib-jdk7": { + "org.jetbrains.kotlinx:kotlinx-coroutines-core": { "shasums": { - "jar": "73b011d84e8c0703430f48e7c6488d240a9f4da800047d4c5c39cf7ad1ec36f2" + "jar": "7089c33c145865020760d3dbca5e4634133cc3dd7feb926e830f6de6ede28ac6" }, - "version": "1.9.0-Beta" + "version": "1.9.0" }, - "org.jetbrains.kotlin:kotlin-stdlib-jdk8": { + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm": { "shasums": { - "jar": "4de2eacedb30a21ff9bf5094c39013ee7e8644685319c08ec86033834e576b43" + "jar": "ad89c2892235e670f222d819cb3d81188143cb19a05b59df9889ae4269f5c70a" }, - "version": "1.9.0-Beta" + "version": "1.9.0" }, "org.jetbrains.kotlinx:kotlinx-metadata-jvm": { "shasums": { @@ -872,9 +1085,15 @@ }, "org.jetbrains:annotations": { "shasums": { - "jar": "ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478" + "jar": "7b0f19724082cbfcbc66e5abea2b9bc92cf08a1ea11e191933ed43801eb3cd05" + }, + "version": "23.0.0" + }, + "org.jspecify:jspecify": { + "shasums": { + "jar": "1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab" }, - "version": "13.0" + "version": "1.0.0" }, "org.jvnet.staxex:stax-ex": { "shasums": { @@ -882,113 +1101,131 @@ }, "version": "1.8.1" }, + "org.mockito:mockito-core": { + "shasums": { + "jar": "b1689b06617ea01fd777bfaedbdde512faf083d639a049f79b388d5a4e96d2e5" + }, + "version": "5.4.0" + }, + "org.objenesis:objenesis": { + "shasums": { + "jar": "02dfd0b0439a5591e35b708ed2f5474eb0948f53abf74637e959b8e4ef69bfeb" + }, + "version": "3.3" + }, "org.ow2.asm:asm": { "shasums": { - "jar": "b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353" + "jar": "8cadd43ac5eb6d09de05faecca38b917a040bb9139c7edeb4cc81c740b713281" }, - "version": "9.5" + "version": "9.7.1" }, "org.ow2.asm:asm-analysis": { "shasums": { - "jar": "39f1cf1791335701c3b02cae7b2bc21057ec9a55b2240789cb6d552b2b2c62fa" + "jar": "85b29371884ba31bb76edf22323c2c24e172c3267a67152eba3d1ccc2e041ef2" }, - "version": "9.5" + "version": "9.7.1" }, "org.ow2.asm:asm-commons": { "shasums": { - "jar": "72eee9fbafb9de8d9463f20dd584a48ceeb7e5152ad4c987bfbe17dd4811c9ae" + "jar": "9a579b54d292ad9be171d4313fd4739c635592c2b5ac3a459bbd1049cddec6a0" }, - "version": "9.5" + "version": "9.7.1" }, "org.ow2.asm:asm-tree": { "shasums": { - "jar": "3c33a648191079aeaeaeb7c19a49b153952f9e40fe86fbac5205554ddd9acd94" + "jar": "9929881f59eb6b840e86d54570c77b59ce721d104e6dfd7a40978991c2d3b41f" }, - "version": "9.5" + "version": "9.7.1" }, "org.ow2.asm:asm-util": { "shasums": { - "jar": "c467f1bb3c08888f47243e2d475209b34a772d627e44fca06752e18bb038bd74" + "jar": "f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6" }, - "version": "9.5" + "version": "9.7.1" + }, + "org.pcollections:pcollections": { + "shasums": { + "jar": "1f82766d7c3221930854033bebff5073ea46b43f27326074bbe15d148c18bfb3" + }, + "version": "4.0.1" }, "org.robolectric:annotations": { "shasums": { - "jar": "f3d6b921b7bf9d541577414c3b3124293eb09ced71f939e0c325c8d8abad0b6f" + "jar": "463a5ad1386c31010bc9af00bfe19a1b758d8c2dedd8c19e5c75d29ab8abb9ba" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:junit": { "shasums": { - "jar": "815f0bae88eb198889e1878ef65b904c4ec59131be2458829bcc942bd7b9f6da" + "jar": "2cee817aadce3552706b09450ad1ea7ff5981924072d2adfe40ddad57d5fa123" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:nativeruntime": { "shasums": { - "jar": "71fd2d1e8e78f2d70cc4879f5aa6910bf05a68274d3ca87179fb6f9447db5fb9" + "jar": "c07b66d315aec3272a7c64aa5f154b4194be2cc6030a733d16f2ee87330232a8" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:nativeruntime-dist-compat": { "shasums": { - "jar": "2dd7aae2332b8f57932e1ef78fb8d973aac1da631ec9fb471752280df50d140c" + "jar": "2f4e879b00eed634d0e43353ecff80db4d5ce24b3b213d1e6053cb21b0ced10f" }, - "version": "1.0.1" + "version": "1.0.16" }, "org.robolectric:pluginapi": { "shasums": { - "jar": "56be2717854add52e3437bb3be1b898dfea8ce8c6fcd26c4d0de68bf605274b0" + "jar": "ad8b74238d59bce6631e29190c105dd0c4701e836a2631060678407f621c7b7a" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:plugins-maven-dependency-resolver": { "shasums": { - "jar": "54618c67214824dd5ebd72c5ed9c56fb62b776902455d0b0efc0e0940d8ebcf6" + "jar": "6c8dbc979db0780755e712acab9eeb9396811b2d4dc31a92a5b259f9876205ec" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:resources": { "shasums": { - "jar": "8decd0518e147c1038d38f6d33632e3310886194d7a8afeeb62849495f36e5f7" + "jar": "54eb274a47dec9e74cc9b45b9e4335bb5d83857c63b2a49dd8d1993e6321f2c5" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:robolectric": { "shasums": { - "jar": "e61c4733bd64f57ba9884bf232b293fdd19b233608dd3481cd0e3c99f0f7c0fc" + "jar": "e0a73d45bceb94a5a0352b66e2120ad4a4b222fe406079130893b6c79d4441d1" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:sandbox": { "shasums": { - "jar": "59611ce3f110f21d464003a7a812dc8155f4132173cb13cf4e246da496cf17d0" + "jar": "de361f3de8c08d4488cf156683830f2bd43db1da85a5b136ad6d065b868d3bab" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:shadowapi": { "shasums": { - "jar": "1ba648a76968f1bb9f4fc64321af70c4eeed94b2a3fa1b2a848a7706ec25c75a" + "jar": "fd158863cee488475206ba1d23ff4c7d29be412eccd21b12d9416b0030aa582d" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:shadows-framework": { "shasums": { - "jar": "106f6a19abc9d5786a18461a2554afbf782a30e799f867d7f1a9f26bcbb873a7" + "jar": "f3cf7785eecf9b2e80fbb4caac4c42f63eeea3506e289581c04696a56a494622" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:utils": { "shasums": { - "jar": "0081b1a65c2c6d7cf56a56f6b4ed85b35a91f5a9f40a4b81c6771b497265518e" + "jar": "6884eec32c9c9b23d74250e30a5ba9c5ece48784f808feba98f119b215ab59d8" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.robolectric:utils-reflector": { "shasums": { - "jar": "fcd2dde7623a5b47caa7efcbdf7dd2a95429e640b42490db5bc645367f0a0e1a" + "jar": "eb8f52cdc24f59ae4cf13369c5bf990354c19c386e3e8f9f5d5cee04d836557b" }, - "version": "4.10.3" + "version": "4.14.1" }, "org.slf4j:slf4j-api": { "shasums": { @@ -1002,24 +1239,45 @@ }, "version": "0.1.0-rc2" }, - "xerces:xercesImpl": { + "org.xerial:sqlite-jdbc": { "shasums": { - "jar": "b50d3a4ca502faa4d1c838acb8aa9480446953421f7327e338c5dda3da5e76d0" + "jar": "50524b16b649fb03f81df6e61dec69911b8849e6943c61b85faa24e49bfd98fc" }, - "version": "2.12.0" + "version": "3.43.0.0" }, - "xml-apis:xml-apis": { + "org.yaml:snakeyaml": { "shasums": { - "jar": "a840968176645684bb01aed376e067ab39614885f9eee44abe35a5f20ebe7fad" + "jar": "63a76fe66b652360bd4c2c107e6f0258daa7d4bb492008ba8c26fcd230ff9146" }, - "version": "1.4.01" + "version": "2.3" } }, "dependencies": { + "androidx.annotation:annotation": [ + "androidx.annotation:annotation-jvm", + "org.jetbrains.kotlin:kotlin-stdlib" + ], + "androidx.annotation:annotation-jvm": [ + "org.jetbrains.kotlin:kotlin-stdlib" + ], "androidx.concurrent:concurrent-futures": [ "androidx.annotation:annotation", "com.google.guava:listenablefuture" ], + "androidx.databinding:databinding-compiler": [ + "androidx.databinding:databinding-common", + "androidx.databinding:databinding-compiler-common", + "com.android.tools:annotations", + "com.google.auto:auto-common", + "com.google.code.gson:gson", + "com.google.guava:guava", + "com.googlecode.juniversalchardet:juniversalchardet", + "com.squareup:javapoet", + "commons-codec:commons-codec", + "commons-io:commons-io", + "org.glassfish.jaxb:jaxb-runtime", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8" + ], "androidx.databinding:databinding-compiler-common": [ "androidx.databinding:databinding-common", "com.android.databinding:baseLibrary", @@ -1093,13 +1351,23 @@ ], "androidx.test:monitor:aar": [ "androidx.annotation:annotation", - "androidx.test:annotation:aar", "androidx.tracing:tracing:aar", "org.jetbrains.kotlin:kotlin-stdlib" ], "androidx.tracing:tracing:aar": [ "androidx.annotation:annotation" ], + "com.android.tools.adblib:adblib": [ + "com.google.protobuf:protobuf-java", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8", + "org.jetbrains.kotlinx:kotlinx-coroutines-core" + ], + "com.android.tools.adblib:adblib-tools": [ + "com.android.tools.adblib:adblib", + "com.google.protobuf:protobuf-java", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8", + "org.jetbrains.kotlinx:kotlinx-coroutines-core" + ], "com.android.tools.analytics-library:crash": [ "com.android.tools:annotations", "com.google.guava:guava", @@ -1128,6 +1396,26 @@ "com.google.protobuf:protobuf-java", "org.jetbrains.kotlin:kotlin-stdlib-jdk8" ], + "com.android.tools.apkdeployer:apkdeployer": [ + "com.android.tools.adblib:adblib", + "com.android.tools.adblib:adblib-tools", + "com.android.tools.apkparser:binary-resources", + "com.android.tools.ddms:ddmlib", + "com.android.tools:annotations", + "com.android.tools:common", + "com.android.tools:r8", + "com.android.tools:sdk-common", + "com.android:zipflinger", + "com.google.guava:guava", + "com.google.protobuf:protobuf-java", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8", + "org.jetbrains:annotations", + "org.xerial:sqlite-jdbc" + ], + "com.android.tools.apkparser:binary-resources": [ + "com.android.tools:annotations", + "com.google.guava:guava" + ], "com.android.tools.build.jetifier:jetifier-core": [ "com.google.code.gson:gson", "org.jetbrains.kotlin:kotlin-stdlib" @@ -1155,8 +1443,8 @@ "com.android.tools.build:apksig", "com.google.code.findbugs:jsr305", "com.google.guava:guava", - "org.bouncycastle:bcpkix-jdk15on", - "org.bouncycastle:bcprov-jdk15on" + "org.bouncycastle:bcpkix-jdk18on", + "org.bouncycastle:bcprov-jdk18on" ], "com.android.tools.build:builder": [ "com.android.tools.analytics-library:protos", @@ -1176,8 +1464,8 @@ "com.squareup:javawriter", "commons-codec:commons-codec", "javax.inject:javax.inject", - "org.bouncycastle:bcpkix-jdk15on", - "org.bouncycastle:bcprov-jdk15on", + "org.bouncycastle:bcpkix-jdk18on", + "org.bouncycastle:bcprov-jdk18on", "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "org.ow2.asm:asm-commons" ], @@ -1226,6 +1514,7 @@ "com.android.tools.lint:lint-typedef-remover", "com.android.tools.utp:android-device-provider-ddmlib-proto", "com.android.tools.utp:android-device-provider-gradle-proto", + "com.android.tools.utp:android-device-provider-profile-proto", "com.android.tools.utp:android-test-plugin-host-additional-test-output-proto", "com.android.tools.utp:android-test-plugin-host-apk-installer-proto", "com.android.tools.utp:android-test-plugin-host-coverage-proto", @@ -1250,7 +1539,7 @@ "io.grpc:grpc-stub", "net.sf.jopt-simple:jopt-simple", "org.apache.httpcomponents:httpmime", - "org.bouncycastle:bcpkix-jdk15on", + "org.bouncycastle:bcpkix-jdk18on", "org.glassfish.jaxb:jaxb-runtime", "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "org.ow2.asm:asm", @@ -1273,7 +1562,6 @@ "com.android.tools:sdk-common", "com.android.tools:sdklib", "com.google.code.gson:gson", - "net.sf.kxml:kxml2", "org.jetbrains.kotlin:kotlin-stdlib-jdk8" ], "com.android.tools.ddms:ddmlib": [ @@ -1306,6 +1594,9 @@ "com.android.tools.utp:android-device-provider-gradle-proto": [ "com.google.protobuf:protobuf-java" ], + "com.android.tools.utp:android-device-provider-profile-proto": [ + "com.google.protobuf:protobuf-java" + ], "com.android.tools.utp:android-test-plugin-host-additional-test-output-proto": [ "com.google.protobuf:protobuf-java" ], @@ -1372,13 +1663,12 @@ "com.google.protobuf:protobuf-java", "javax.inject:javax.inject", "net.sf.kxml:kxml2", - "org.bouncycastle:bcpkix-jdk15on", - "org.bouncycastle:bcprov-jdk15on", + "org.apache.commons:commons-compress", + "org.bouncycastle:bcpkix-jdk18on", + "org.bouncycastle:bcprov-jdk18on", "org.glassfish.jaxb:jaxb-runtime", - "org.jetbrains.intellij.deps:trove4j", "org.jetbrains.kotlin:kotlin-reflect", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8", - "xerces:xercesImpl" + "org.jetbrains.kotlin:kotlin-stdlib-jdk8" ], "com.android.tools:sdklib": [ "com.android.tools.layoutlib:layoutlib-api", @@ -1399,9 +1689,24 @@ "com.android:zipflinger": [ "com.android.tools:annotations" ], + "com.github.ben-manes.caffeine:caffeine": [ + "com.google.errorprone:error_prone_annotations", + "org.checkerframework:checker-qual" + ], "com.google.api.grpc:proto-google-common-protos": [ "com.google.protobuf:protobuf-java" ], + "com.google.auto.service:auto-service": [ + "com.google.auto.service:auto-service-annotations", + "com.google.auto:auto-common", + "com.google.guava:guava" + ], + "com.google.auto:auto-common": [ + "com.google.guava:guava" + ], + "com.google.code.gson:gson": [ + "com.google.errorprone:error_prone_annotations" + ], "com.google.crypto.tink:tink": [ "com.google.code.gson:gson", "com.google.protobuf:protobuf-java" @@ -1409,6 +1714,42 @@ "com.google.dagger:dagger": [ "javax.inject:javax.inject" ], + "com.google.errorprone:error_prone_annotation": [ + "com.google.guava:guava" + ], + "com.google.errorprone:error_prone_check_api": [ + "com.github.ben-manes.caffeine:caffeine", + "com.github.kevinstern:software-and-algorithms", + "com.google.auto.value:auto-value-annotations", + "com.google.errorprone:error_prone_annotation", + "com.google.errorprone:error_prone_annotations", + "io.github.eisop:dataflow-errorprone", + "io.github.java-diff-utils:java-diff-utils", + "javax.inject:javax.inject", + "org.jspecify:jspecify" + ], + "com.google.errorprone:error_prone_core": [ + "com.google.auto.service:auto-service-annotations", + "com.google.auto.value:auto-value-annotations", + "com.google.auto:auto-common", + "com.google.errorprone:error_prone_annotation", + "com.google.errorprone:error_prone_annotations", + "com.google.errorprone:error_prone_check_api", + "com.google.errorprone:error_prone_type_annotations", + "com.google.guava:guava", + "com.google.protobuf:protobuf-java", + "io.github.eisop:dataflow-errorprone", + "javax.inject:javax.inject", + "org.jspecify:jspecify", + "org.pcollections:pcollections" + ], + "com.google.flogger:flogger": [ + "org.checkerframework:checker-compat-qual" + ], + "com.google.flogger:flogger-system-backend": [ + "com.google.flogger:flogger", + "org.checkerframework:checker-compat-qual" + ], "com.google.guava:guava": [ "com.google.code.findbugs:jsr305", "com.google.errorprone:error_prone_annotations", @@ -1417,6 +1758,14 @@ "com.google.j2objc:j2objc-annotations", "org.checkerframework:checker-qual" ], + "com.google.guava:guava-testlib": [ + "com.google.code.findbugs:jsr305", + "com.google.errorprone:error_prone_annotations", + "com.google.guava:guava", + "com.google.j2objc:j2objc-annotations", + "junit:junit", + "org.checkerframework:checker-qual" + ], "com.google.jimfs:jimfs": [ "com.google.guava:guava" ], @@ -1424,10 +1773,42 @@ "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.testing.compile:compile-testing": [ + "com.google.auto.value:auto-value", + "com.google.auto:auto-common", + "com.google.guava:guava", + "com.google.truth:truth", + "junit:junit" + ], + "com.google.testparameterinjector:test-parameter-injector": [ + "com.google.auto.value:auto-value-annotations", + "com.google.code.findbugs:jsr305", + "com.google.guava:guava", + "junit:junit", + "org.yaml:snakeyaml" + ], + "com.google.truth.extensions:truth-java8-extension": [ + "com.google.truth:truth", + "org.checkerframework:checker-qual" + ], + "com.google.truth.extensions:truth-liteproto-extension": [ + "com.google.auto.value:auto-value-annotations", + "com.google.errorprone:error_prone_annotations", + "com.google.guava:guava", + "com.google.truth:truth", + "org.checkerframework:checker-qual" + ], + "com.google.truth.extensions:truth-proto-extension": [ + "com.google.auto.value:auto-value-annotations", + "com.google.errorprone:error_prone_annotations", + "com.google.guava:guava", + "com.google.protobuf:protobuf-java", + "com.google.truth.extensions:truth-liteproto-extension", + "com.google.truth:truth", + "org.checkerframework:checker-qual" + ], "com.google.truth:truth": [ "com.google.auto.value:auto-value-annotations", "com.google.errorprone:error_prone_annotations", @@ -1446,8 +1827,10 @@ "io.grpc:grpc-api": [ "com.google.code.findbugs:jsr305", "com.google.errorprone:error_prone_annotations", - "com.google.guava:guava", - "io.grpc:grpc-context" + "com.google.guava:guava" + ], + "io.grpc:grpc-context": [ + "io.grpc:grpc-api" ], "io.grpc:grpc-core": [ "com.google.android:annotations", @@ -1455,6 +1838,7 @@ "com.google.errorprone:error_prone_annotations", "com.google.guava:guava", "io.grpc:grpc-api", + "io.grpc:grpc-context", "io.perfmark:perfmark-api", "org.codehaus.mojo:animal-sniffer-annotations" ], @@ -1464,6 +1848,7 @@ "io.grpc:grpc-core", "io.netty:netty-codec-http2", "io.netty:netty-handler-proxy", + "io.netty:netty-transport-native-unix-common", "io.perfmark:perfmark-api" ], "io.grpc:grpc-protobuf": [ @@ -1518,8 +1903,8 @@ "io.netty:netty-codec", "io.netty:netty-common", "io.netty:netty-resolver", - "io.netty:netty-tcnative-classes", - "io.netty:netty-transport" + "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common" ], "io.netty:netty-handler-proxy": [ "io.netty:netty-buffer", @@ -1537,6 +1922,11 @@ "io.netty:netty-common", "io.netty:netty-resolver" ], + "io.netty:netty-transport-native-unix-common": [ + "io.netty:netty-buffer", + "io.netty:netty-common", + "io.netty:netty-transport" + ], "jakarta.xml.bind:jakarta.xml.bind-api": [ "jakarta.activation:jakarta.activation-api" ], @@ -1554,8 +1944,12 @@ "org.apache.httpcomponents:httpmime": [ "org.apache.httpcomponents:httpclient" ], - "org.bouncycastle:bcpkix-jdk15on": [ - "org.bouncycastle:bcprov-jdk15on" + "org.bouncycastle:bcpkix-jdk18on": [ + "org.bouncycastle:bcprov-jdk18on", + "org.bouncycastle:bcutil-jdk18on" + ], + "org.bouncycastle:bcutil-jdk18on": [ + "org.bouncycastle:bcprov-jdk18on" ], "org.glassfish.jaxb:jaxb-runtime": [ "com.sun.istack:istack-commons-runtime", @@ -1572,7 +1966,6 @@ "org.jetbrains.kotlin:kotlin-stdlib" ], "org.jetbrains.kotlin:kotlin-stdlib": [ - "org.jetbrains.kotlin:kotlin-stdlib-common", "org.jetbrains:annotations" ], "org.jetbrains.kotlin:kotlin-stdlib-jdk7": [ @@ -1582,6 +1975,13 @@ "org.jetbrains.kotlin:kotlin-stdlib", "org.jetbrains.kotlin:kotlin-stdlib-jdk7" ], + "org.jetbrains.kotlinx:kotlinx-coroutines-core": [ + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm" + ], + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm": [ + "org.jetbrains.kotlin:kotlin-stdlib", + "org.jetbrains:annotations" + ], "org.jetbrains.kotlinx:kotlinx-metadata-jvm": [ "org.jetbrains.kotlin:kotlin-stdlib" ], @@ -1589,6 +1989,11 @@ "jakarta.activation:jakarta.activation-api", "jakarta.xml.bind:jakarta.xml.bind-api" ], + "org.mockito:mockito-core": [ + "net.bytebuddy:byte-buddy", + "net.bytebuddy:byte-buddy-agent", + "org.objenesis:objenesis" + ], "org.ow2.asm:asm-analysis": [ "org.ow2.asm:asm-tree" ], @@ -1614,6 +2019,7 @@ "org.robolectric:nativeruntime": [ "com.google.guava:guava", "org.robolectric:nativeruntime-dist-compat", + "org.robolectric:shadowapi", "org.robolectric:utils", "org.robolectric:utils-reflector" ], @@ -1628,6 +2034,7 @@ "org.robolectric:utils" ], "org.robolectric:resources": [ + "com.google.auto.value:auto-value-annotations", "com.google.guava:guava", "org.robolectric:annotations", "org.robolectric:pluginapi", @@ -1636,6 +2043,7 @@ "org.robolectric:robolectric": [ "androidx.test.espresso:espresso-idling-resource:aar", "androidx.test:monitor:aar", + "com.google.testparameterinjector:test-parameter-injector", "javax.annotation:javax.annotation-api", "javax.inject:javax.inject", "org.bouncycastle:bcprov-jdk18on", @@ -1648,7 +2056,8 @@ "org.robolectric:sandbox", "org.robolectric:shadows-framework", "org.robolectric:utils", - "org.robolectric:utils-reflector" + "org.robolectric:utils-reflector", + "org.yaml:snakeyaml" ], "org.robolectric:sandbox": [ "com.google.guava:guava", @@ -1666,11 +2075,10 @@ "org.robolectric:utils" ], "org.robolectric:shadows-framework": [ - "androidx.annotation:annotation", "androidx.test:monitor:aar", "com.almworks.sqlite4java:sqlite4java", "com.google.auto.value:auto-value-annotations", - "com.google.errorprone:error_prone_annotations", + "com.google.errorprone:error_prone_annotation", "com.ibm.icu:icu4j", "org.robolectric:annotations", "org.robolectric:nativeruntime", @@ -1682,8 +2090,7 @@ "org.robolectric:utils-reflector" ], "org.robolectric:utils": [ - "com.google.errorprone:error_prone_annotations", - "com.google.guava:guava", + "com.google.errorprone:error_prone_annotation", "javax.annotation:javax.annotation-api", "javax.inject:javax.inject", "org.robolectric:annotations", @@ -1698,13 +2105,10 @@ "org.tensorflow:tensorflow-lite-metadata": [ "com.google.flatbuffers:flatbuffers-java", "org.checkerframework:checker-qual" - ], - "xerces:xercesImpl": [ - "xml-apis:xml-apis" ] }, "packages": { - "androidx.annotation:annotation": [ + "androidx.annotation:annotation-jvm": [ "androidx.annotation" ], "androidx.concurrent:concurrent-futures": [ @@ -1713,6 +2117,17 @@ "androidx.databinding:databinding-common": [ "androidx.databinding" ], + "androidx.databinding:databinding-compiler": [ + "android.databinding.annotationprocessor", + "android.databinding.tool", + "android.databinding.tool.expr", + "android.databinding.tool.reflection", + "android.databinding.tool.reflection.annotation", + "android.databinding.tool.solver", + "android.databinding.tool.store", + "android.databinding.tool.util", + "android.databinding.tool.writer" + ], "androidx.databinding:databinding-compiler-common": [ "android.databinding.internal.org.antlr.v4.runtime", "android.databinding.internal.org.antlr.v4.runtime.atn", @@ -1760,6 +2175,32 @@ "com.android.databinding:baseLibrary": [ "android.databinding" ], + "com.android.tools.adblib:adblib": [ + "com.android.adblib", + "com.android.adblib.impl", + "com.android.adblib.impl.channels", + "com.android.adblib.impl.services", + "com.android.adblib.testing", + "com.android.adblib.utils", + "com.android.server.adb.protos" + ], + "com.android.tools.adblib:adblib-tools": [ + "com.android.adblib.tools", + "com.android.adblib.tools.debugging", + "com.android.adblib.tools.debugging.impl", + "com.android.adblib.tools.debugging.packets", + "com.android.adblib.tools.debugging.packets.ddms", + "com.android.adblib.tools.debugging.packets.ddms.chunks", + "com.android.adblib.tools.debugging.packets.impl", + "com.android.adblib.tools.debugging.processinventory", + "com.android.adblib.tools.debugging.processinventory.impl", + "com.android.adblib.tools.debugging.processinventory.protos", + "com.android.adblib.tools.debugging.processinventory.server", + "com.android.adblib.tools.debugging.utils", + "com.android.adblib.tools.impl", + "com.android.adblib.tools.tcpserver", + "com.android.adblib.tools.tcpserver.impl" + ], "com.android.tools.analytics-library:crash": [ "com.android.tools.analytics.crash" ], @@ -1774,6 +2215,22 @@ "com.android.tools.analytics-library:tracker": [ "com.android.tools.analytics" ], + "com.android.tools.apkdeployer:apkdeployer": [ + "com.android.tools.deploy.proto", + "com.android.tools.deployer", + "com.android.tools.deployer.model", + "com.android.tools.deployer.model.component", + "com.android.tools.deployer.tasks", + "com.android.tools.idea.protobuf", + "com.android.tools.idea.protobuf.compiler", + "com.android.tools.idea.protobuf.util", + "com.android.tools.manifest.parser", + "com.android.tools.manifest.parser.components", + "com.android.tools.tracer" + ], + "com.android.tools.apkparser:binary-resources": [ + "com.google.devrel.gmscore.tools.apk.arsc" + ], "com.android.tools.build.jetifier:jetifier-core": [ "com.android.tools.build.jetifier.core", "com.android.tools.build.jetifier.core.config", @@ -1824,6 +2281,7 @@ "com.android.apksig.internal.util", "com.android.apksig.internal.x509", "com.android.apksig.internal.zip", + "com.android.apksig.kms", "com.android.apksig.util", "com.android.apksig.zip" ], @@ -1837,7 +2295,6 @@ "com.android.tools.build.apkzlib.zip.utils" ], "com.android.tools.build:builder": [ - "com.android.builder.aar", "com.android.builder.compiling", "com.android.builder.core", "com.android.builder.dependency", @@ -1867,7 +2324,6 @@ "com.android.tools.r8.androidapi", "com.android.tools.r8.compatproguard", "com.android.tools.r8.dex", - "com.android.tools.r8.dex.code", "com.android.tools.r8.diagnostic", "com.android.tools.r8.diagnostic.internal", "com.android.tools.r8.errors", @@ -1879,12 +2335,9 @@ "com.android.tools.r8.ir.desugar.desugaredlibrary.lint", "com.android.tools.r8.ir.desugar.varhandle", "com.android.tools.r8.ir.optimize", - "com.android.tools.r8.ir.optimize.info", "com.android.tools.r8.ir.optimize.inliner", - "com.android.tools.r8.ir.regalloc", - "com.android.tools.r8.jetbrains.kotlin", - "com.android.tools.r8.jetbrains.kotlinx.metadata.jvm", - "com.android.tools.r8.keepanno.annotations", + "com.android.tools.r8.kotlin", + "com.android.tools.r8.metadata", "com.android.tools.r8.naming", "com.android.tools.r8.naming.mappinginformation", "com.android.tools.r8.origin", @@ -1892,16 +2345,19 @@ "com.android.tools.r8.profile.art", "com.android.tools.r8.profile.art.diagnostic", "com.android.tools.r8.references", + "com.android.tools.r8.relocated.keepanno.proto", "com.android.tools.r8.relocator", "com.android.tools.r8.retrace", "com.android.tools.r8.shaking", "com.android.tools.r8.startup", "com.android.tools.r8.startup.diagnostic", "com.android.tools.r8.synthesis", + "com.android.tools.r8.threading", + "com.android.tools.r8.threading.providers.blocking", + "com.android.tools.r8.threading.providers.singlethreaded", "com.android.tools.r8.tracereferences", "com.android.tools.r8.utils", - "com.android.tools.r8.utils.positions", - "com.android.tools.r8.utils.structural" + "com.android.tools.r8.utils.positions" ], "com.android.tools.build:builder-model": [ "com.android.build", @@ -1968,7 +2424,10 @@ "shadow.bundletool.com.android.apksig.zip", "shadow.bundletool.com.android.commands.am", "shadow.bundletool.com.android.ddmlib", + "shadow.bundletool.com.android.ddmlib.clientmanager", + "shadow.bundletool.com.android.ddmlib.idevicemanager", "shadow.bundletool.com.android.ddmlib.internal", + "shadow.bundletool.com.android.ddmlib.internal.commands", "shadow.bundletool.com.android.ddmlib.internal.jdwp", "shadow.bundletool.com.android.ddmlib.internal.jdwp.chunkhandler", "shadow.bundletool.com.android.ddmlib.internal.jdwp.interceptor", @@ -2023,8 +2482,16 @@ "shadow.bundletool.com.android.utils", "shadow.bundletool.com.android.utils.concurrency", "shadow.bundletool.com.android.utils.cxx", + "shadow.bundletool.com.android.utils.cxx.collections", + "shadow.bundletool.com.android.utils.cxx.io", + "shadow.bundletool.com.android.utils.cxx.ninja", + "shadow.bundletool.com.android.utils.cxx.os", + "shadow.bundletool.com.android.utils.cxx.process", "shadow.bundletool.com.android.utils.reflection", + "shadow.bundletool.com.android.utils.sleep", + "shadow.bundletool.com.android.utils.time", "shadow.bundletool.com.android.xml", + "shadow.bundletool.com.android.xml.sax", "shadow.bundletool.com.android.zipflinger" ], "com.android.tools.build:gradle": [ @@ -2102,6 +2569,7 @@ "com.android.build.gradle.internal.manifest", "com.android.build.gradle.internal.matcher", "com.android.build.gradle.internal.model", + "com.android.build.gradle.internal.multiplatform", "com.android.build.gradle.internal.ndk", "com.android.build.gradle.internal.packaging", "com.android.build.gradle.internal.plugins", @@ -2109,6 +2577,7 @@ "com.android.build.gradle.internal.process", "com.android.build.gradle.internal.profile", "com.android.build.gradle.internal.publishing", + "com.android.build.gradle.internal.r8", "com.android.build.gradle.internal.res", "com.android.build.gradle.internal.res.namespaced", "com.android.build.gradle.internal.scope", @@ -2141,7 +2610,6 @@ "com.android.build.gradle.options", "com.android.build.gradle.tasks", "com.android.build.gradle.tasks.factory", - "com.android.build.gradle.tasks.sync", "com.android.build.shrinker", "com.android.build.shrinker.gatherer", "com.android.build.shrinker.graph", @@ -2181,6 +2649,7 @@ "com.android.commands.am", "com.android.ddmlib", "com.android.ddmlib.clientmanager", + "com.android.ddmlib.idevicemanager", "com.android.ddmlib.internal", "com.android.ddmlib.internal.commands", "com.android.ddmlib.internal.jdwp", @@ -2212,6 +2681,9 @@ "com.android.tools.utp:android-device-provider-gradle-proto": [ "com.android.tools.utp.plugins.deviceprovider.gradle.proto" ], + "com.android.tools.utp:android-device-provider-profile-proto": [ + "com.android.tools.utp.plugins.deviceprovider.profile.proto" + ], "com.android.tools.utp:android-test-plugin-host-additional-test-output-proto": [ "com.android.tools.utp.plugins.host.additionaltestoutput.proto" ], @@ -2248,6 +2720,7 @@ "com.android.testing.utils", "com.android.tools.proguard", "com.android.utils", + "com.android.utils.cache", "com.android.utils.concurrency", "com.android.utils.cxx", "com.android.utils.cxx.collections", @@ -2255,12 +2728,22 @@ "com.android.utils.cxx.ninja", "com.android.utils.cxx.os", "com.android.utils.cxx.process", + "com.android.utils.function", "com.android.utils.reflection", "com.android.utils.sleep", - "com.android.utils.time", + "com.android.utils.text", "com.android.xml", "com.android.xml.sax" ], + "com.android.tools:desugar_jdk_libs_configuration": [ + "java.adapter", + "java.nio.channels", + "java.nio.file", + "java.nio.file.attribute", + "java.time", + "java.util", + "java.util.stream" + ], "com.android.tools:desugar_jdk_libs_configuration_minimal": [ "java.adapter", "java.nio.channels", @@ -2350,6 +2833,46 @@ "com.android.tools:dvlib": [ "com.android.dvlib" ], + "com.android.tools:r8": [ + "com.android.tools.r8", + "com.android.tools.r8.androidapi", + "com.android.tools.r8.compatproguard", + "com.android.tools.r8.dex", + "com.android.tools.r8.diagnostic", + "com.android.tools.r8.diagnostic.internal", + "com.android.tools.r8.errors", + "com.android.tools.r8.experimental.graphinfo", + "com.android.tools.r8.graph", + "com.android.tools.r8.graph.proto", + "com.android.tools.r8.inspector", + "com.android.tools.r8.internal", + "com.android.tools.r8.ir.desugar.desugaredlibrary.lint", + "com.android.tools.r8.ir.desugar.varhandle", + "com.android.tools.r8.ir.optimize", + "com.android.tools.r8.ir.optimize.inliner", + "com.android.tools.r8.kotlin", + "com.android.tools.r8.metadata", + "com.android.tools.r8.naming", + "com.android.tools.r8.naming.mappinginformation", + "com.android.tools.r8.origin", + "com.android.tools.r8.position", + "com.android.tools.r8.profile.art", + "com.android.tools.r8.profile.art.diagnostic", + "com.android.tools.r8.references", + "com.android.tools.r8.relocated.keepanno.proto", + "com.android.tools.r8.relocator", + "com.android.tools.r8.retrace", + "com.android.tools.r8.shaking", + "com.android.tools.r8.startup", + "com.android.tools.r8.startup.diagnostic", + "com.android.tools.r8.synthesis", + "com.android.tools.r8.threading", + "com.android.tools.r8.threading.providers.blocking", + "com.android.tools.r8.threading.providers.singlethreaded", + "com.android.tools.r8.tracereferences", + "com.android.tools.r8.utils", + "com.android.tools.r8.utils.positions" + ], "com.android.tools:repository": [ "com.android.repository", "com.android.repository.api", @@ -2372,12 +2895,11 @@ "com.android.ide.common.blame.parser.aapt", "com.android.ide.common.blame.parser.util", "com.android.ide.common.build", - "com.android.ide.common.build.filebasedproperties.module", - "com.android.ide.common.build.filebasedproperties.variant", "com.android.ide.common.caching", "com.android.ide.common.fonts", "com.android.ide.common.gradle", "com.android.ide.common.internal", + "com.android.ide.common.pagealign", "com.android.ide.common.process", "com.android.ide.common.rendering", "com.android.ide.common.repository", @@ -2420,6 +2942,7 @@ "com.android.sdklib.repository.generated.sysimg.v1", "com.android.sdklib.repository.generated.sysimg.v2", "com.android.sdklib.repository.generated.sysimg.v3", + "com.android.sdklib.repository.generated.sysimg.v4", "com.android.sdklib.repository.installer", "com.android.sdklib.repository.legacy", "com.android.sdklib.repository.legacy.descriptors", @@ -2437,6 +2960,7 @@ "com.android.sdklib.repository.sources.generated.v3", "com.android.sdklib.repository.sources.generated.v4", "com.android.sdklib.repository.sources.generated.v5", + "com.android.sdklib.repository.sources.generated.v6", "com.android.sdklib.repository.targets", "com.android.sdklib.tool", "com.android.sdklib.tool.sdkmanager", @@ -2448,12 +2972,33 @@ "com.android:zipflinger": [ "com.android.zipflinger" ], + "com.beust:jcommander": [ + "com.beust.ah", + "com.beust.jcommander", + "com.beust.jcommander.converters", + "com.beust.jcommander.defaultprovider", + "com.beust.jcommander.internal", + "com.beust.jcommander.parser", + "com.beust.jcommander.validators" + ], + "com.github.ben-manes.caffeine:caffeine": [ + "com.github.benmanes.caffeine.cache", + "com.github.benmanes.caffeine.cache.stats" + ], + "com.github.kevinstern:software-and-algorithms": [ + "blogspot.software_and_algorithms.stern_library.data_structure", + "blogspot.software_and_algorithms.stern_library.geometry", + "blogspot.software_and_algorithms.stern_library.optimization", + "blogspot.software_and_algorithms.stern_library.string" + ], "com.google.android:annotations": [ "android.annotation" ], "com.google.api.grpc:proto-google-common-protos": [ "com.google.api", + "com.google.cloud", "com.google.cloud.audit", + "com.google.cloud.location", "com.google.geo.type", "com.google.logging.type", "com.google.longrunning", @@ -2461,12 +3006,59 @@ "com.google.rpc.context", "com.google.type" ], + "com.google.auto.service:auto-service": [ + "com.google.auto.service.processor" + ], + "com.google.auto.service:auto-service-annotations": [ + "com.google.auto.service" + ], + "com.google.auto.value:auto-value": [ + "autovalue.shaded.com.google.auto.common", + "autovalue.shaded.com.google.auto.service", + "autovalue.shaded.com.google.common.annotations", + "autovalue.shaded.com.google.common.base", + "autovalue.shaded.com.google.common.cache", + "autovalue.shaded.com.google.common.collect", + "autovalue.shaded.com.google.common.escape", + "autovalue.shaded.com.google.common.eventbus", + "autovalue.shaded.com.google.common.graph", + "autovalue.shaded.com.google.common.hash", + "autovalue.shaded.com.google.common.html", + "autovalue.shaded.com.google.common.io", + "autovalue.shaded.com.google.common.math", + "autovalue.shaded.com.google.common.net", + "autovalue.shaded.com.google.common.primitives", + "autovalue.shaded.com.google.common.reflect", + "autovalue.shaded.com.google.common.util.concurrent", + "autovalue.shaded.com.google.common.xml", + "autovalue.shaded.com.google.errorprone.annotations", + "autovalue.shaded.com.google.errorprone.annotations.concurrent", + "autovalue.shaded.com.google.escapevelocity", + "autovalue.shaded.com.google.j2objc.annotations", + "autovalue.shaded.com.squareup.javapoet", + "autovalue.shaded.net.ltgt.gradle.incap", + "autovalue.shaded.org.checkerframework.checker.nullness.qual", + "autovalue.shaded.org.checkerframework.framework.qual", + "autovalue.shaded.org.objectweb.asm", + "com.google.auto.value.extension", + "com.google.auto.value.extension.memoized.processor", + "com.google.auto.value.extension.serializable.processor", + "com.google.auto.value.extension.serializable.serializer", + "com.google.auto.value.extension.serializable.serializer.impl", + "com.google.auto.value.extension.serializable.serializer.interfaces", + "com.google.auto.value.extension.serializable.serializer.runtime", + "com.google.auto.value.extension.toprettystring.processor", + "com.google.auto.value.processor" + ], "com.google.auto.value:auto-value-annotations": [ "com.google.auto.value", "com.google.auto.value.extension.memoized", "com.google.auto.value.extension.serializable", "com.google.auto.value.extension.toprettystring" ], + "com.google.auto:auto-common": [ + "com.google.auto.common" + ], "com.google.code.findbugs:jsr305": [ "javax.annotation", "javax.annotation.concurrent", @@ -2516,13 +3108,70 @@ "dagger.internal", "dagger.multibindings" ], + "com.google.errorprone:error_prone_annotation": [ + "com.google.errorprone" + ], "com.google.errorprone:error_prone_annotations": [ "com.google.errorprone.annotations", "com.google.errorprone.annotations.concurrent" ], + "com.google.errorprone:error_prone_check_api": [ + "com.google.errorprone", + "com.google.errorprone.apply", + "com.google.errorprone.bugpatterns", + "com.google.errorprone.dataflow", + "com.google.errorprone.dataflow.nullnesspropagation", + "com.google.errorprone.dataflow.nullnesspropagation.inference", + "com.google.errorprone.fixes", + "com.google.errorprone.matchers", + "com.google.errorprone.matchers.method", + "com.google.errorprone.names", + "com.google.errorprone.predicates", + "com.google.errorprone.predicates.type", + "com.google.errorprone.scanner", + "com.google.errorprone.suppliers", + "com.google.errorprone.util" + ], + "com.google.errorprone:error_prone_core": [ + "com.google.errorprone", + "com.google.errorprone.bugpatterns", + "com.google.errorprone.bugpatterns.android", + "com.google.errorprone.bugpatterns.apidiff", + "com.google.errorprone.bugpatterns.argumentselectiondefects", + "com.google.errorprone.bugpatterns.checkreturnvalue", + "com.google.errorprone.bugpatterns.collectionincompatibletype", + "com.google.errorprone.bugpatterns.flogger", + "com.google.errorprone.bugpatterns.formatstring", + "com.google.errorprone.bugpatterns.inject", + "com.google.errorprone.bugpatterns.inject.dagger", + "com.google.errorprone.bugpatterns.inject.guice", + "com.google.errorprone.bugpatterns.inlineme", + "com.google.errorprone.bugpatterns.javadoc", + "com.google.errorprone.bugpatterns.nullness", + "com.google.errorprone.bugpatterns.overloading", + "com.google.errorprone.bugpatterns.threadsafety", + "com.google.errorprone.bugpatterns.time", + "com.google.errorprone.refaster", + "com.google.errorprone.refaster.annotation", + "com.google.errorprone.scanner" + ], + "com.google.errorprone:error_prone_type_annotations": [ + "com.google.errorprone.annotations" + ], "com.google.flatbuffers:flatbuffers-java": [ "com.google.flatbuffers" ], + "com.google.flogger:flogger": [ + "com.google.common.flogger", + "com.google.common.flogger.backend", + "com.google.common.flogger.context", + "com.google.common.flogger.parameter", + "com.google.common.flogger.parser", + "com.google.common.flogger.util" + ], + "com.google.flogger:flogger-system-backend": [ + "com.google.common.flogger.backend.system" + ], "com.google.guava:failureaccess": [ "com.google.common.util.concurrent.internal" ], @@ -2546,6 +3195,16 @@ "com.google.common.xml", "com.google.thirdparty.publicsuffix" ], + "com.google.guava:guava-testlib": [ + "com.google.common.collect.testing", + "com.google.common.collect.testing.features", + "com.google.common.collect.testing.google", + "com.google.common.collect.testing.suites", + "com.google.common.collect.testing.testers", + "com.google.common.escape.testing", + "com.google.common.testing", + "com.google.common.util.concurrent.testing" + ], "com.google.j2objc:j2objc-annotations": [ "com.google.j2objc.annotations" ], @@ -2559,6 +3218,9 @@ "com.google.protobuf:protobuf-java-util": [ "com.google.protobuf.util" ], + "com.google.testing.compile:compile-testing": [ + "com.google.testing.compile" + ], "com.google.testing.platform:core-proto": [ "com.google.testing.platform.core.telemetry.proto", "com.google.testing.platform.plugin.android.proto", @@ -2566,6 +3228,15 @@ "com.google.testing.platform.proto.api.core", "com.google.testing.platform.proto.api.service" ], + "com.google.testparameterinjector:test-parameter-injector": [ + "com.google.testing.junit.testparameterinjector" + ], + "com.google.truth.extensions:truth-liteproto-extension": [ + "com.google.common.truth.extensions.proto" + ], + "com.google.truth.extensions:truth-proto-extension": [ + "com.google.common.truth.extensions.proto" + ], "com.google.truth:truth": [ "com.google.common.truth" ], @@ -2649,11 +3320,19 @@ ], "commons-io:commons-io": [ "org.apache.commons.io", + "org.apache.commons.io.build", + "org.apache.commons.io.charset", "org.apache.commons.io.comparator", + "org.apache.commons.io.file", + "org.apache.commons.io.file.attribute", + "org.apache.commons.io.file.spi", "org.apache.commons.io.filefilter", + "org.apache.commons.io.function", "org.apache.commons.io.input", + "org.apache.commons.io.input.buffer", "org.apache.commons.io.monitor", - "org.apache.commons.io.output" + "org.apache.commons.io.output", + "org.apache.commons.io.serialization" ], "commons-logging:commons-logging": [ "org.apache.commons.logging", @@ -2662,10 +3341,84 @@ "info.picocli:picocli": [ "picocli" ], - "io.grpc:grpc-api": [ - "io.grpc" + "io.github.eisop:dataflow-errorprone": [ + "org.checkerframework.dataflow.qual", + "org.checkerframework.errorprone.checker.builder.qual", + "org.checkerframework.errorprone.checker.calledmethods.qual", + "org.checkerframework.errorprone.checker.compilermsgs.qual", + "org.checkerframework.errorprone.checker.fenum.qual", + "org.checkerframework.errorprone.checker.formatter.qual", + "org.checkerframework.errorprone.checker.guieffect.qual", + "org.checkerframework.errorprone.checker.i18n.qual", + "org.checkerframework.errorprone.checker.i18nformatter.qual", + "org.checkerframework.errorprone.checker.index.qual", + "org.checkerframework.errorprone.checker.initialization.qual", + "org.checkerframework.errorprone.checker.interning.qual", + "org.checkerframework.errorprone.checker.lock.qual", + "org.checkerframework.errorprone.checker.mustcall.qual", + "org.checkerframework.errorprone.checker.nullness.qual", + "org.checkerframework.errorprone.checker.optional.qual", + "org.checkerframework.errorprone.checker.propkey.qual", + "org.checkerframework.errorprone.checker.regex.qual", + "org.checkerframework.errorprone.checker.signature.qual", + "org.checkerframework.errorprone.checker.signedness.qual", + "org.checkerframework.errorprone.checker.tainting.qual", + "org.checkerframework.errorprone.checker.units.qual", + "org.checkerframework.errorprone.com.google.common.annotations", + "org.checkerframework.errorprone.com.google.common.base", + "org.checkerframework.errorprone.com.google.common.base.internal", + "org.checkerframework.errorprone.com.google.common.cache", + "org.checkerframework.errorprone.com.google.common.collect", + "org.checkerframework.errorprone.com.google.common.escape", + "org.checkerframework.errorprone.com.google.common.eventbus", + "org.checkerframework.errorprone.com.google.common.graph", + "org.checkerframework.errorprone.com.google.common.hash", + "org.checkerframework.errorprone.com.google.common.html", + "org.checkerframework.errorprone.com.google.common.io", + "org.checkerframework.errorprone.com.google.common.math", + "org.checkerframework.errorprone.com.google.common.net", + "org.checkerframework.errorprone.com.google.common.primitives", + "org.checkerframework.errorprone.com.google.common.reflect", + "org.checkerframework.errorprone.com.google.common.util.concurrent", + "org.checkerframework.errorprone.com.google.common.xml", + "org.checkerframework.errorprone.com.google.errorprone.annotations", + "org.checkerframework.errorprone.com.google.errorprone.annotations.concurrent", + "org.checkerframework.errorprone.com.google.thirdparty.publicsuffix", + "org.checkerframework.errorprone.common.aliasing.qual", + "org.checkerframework.errorprone.common.initializedfields.qual", + "org.checkerframework.errorprone.common.reflection.qual", + "org.checkerframework.errorprone.common.returnsreceiver.qual", + "org.checkerframework.errorprone.common.subtyping.qual", + "org.checkerframework.errorprone.common.util.report.qual", + "org.checkerframework.errorprone.common.value.qual", + "org.checkerframework.errorprone.dataflow.analysis", + "org.checkerframework.errorprone.dataflow.busyexpr", + "org.checkerframework.errorprone.dataflow.cfg", + "org.checkerframework.errorprone.dataflow.cfg.block", + "org.checkerframework.errorprone.dataflow.cfg.builder", + "org.checkerframework.errorprone.dataflow.cfg.node", + "org.checkerframework.errorprone.dataflow.cfg.playground", + "org.checkerframework.errorprone.dataflow.cfg.visualize", + "org.checkerframework.errorprone.dataflow.constantpropagation", + "org.checkerframework.errorprone.dataflow.expression", + "org.checkerframework.errorprone.dataflow.livevariable", + "org.checkerframework.errorprone.dataflow.reachingdef", + "org.checkerframework.errorprone.dataflow.util", + "org.checkerframework.errorprone.framework.qual", + "org.checkerframework.errorprone.javacutil", + "org.checkerframework.errorprone.javacutil.trees", + "org.checkerframework.errorprone.org.plumelib.reflection", + "org.checkerframework.errorprone.org.plumelib.util" + ], + "io.github.java-diff-utils:java-diff-utils": [ + "com.github.difflib", + "com.github.difflib.algorithm", + "com.github.difflib.algorithm.myers", + "com.github.difflib.patch", + "com.github.difflib.text", + "com.github.difflib.unifieddiff" ], - "io.grpc:grpc-context": [ + "io.grpc:grpc-api": [ "io.grpc" ], "io.grpc:grpc-core": [ @@ -2753,9 +3506,6 @@ "io.netty:netty-resolver": [ "io.netty.resolver" ], - "io.netty:netty-tcnative-classes": [ - "io.netty.internal.tcnative" - ], "io.netty:netty-transport": [ "io.netty.bootstrap", "io.netty.channel", @@ -2770,12 +3520,18 @@ "io.netty.channel.socket.nio", "io.netty.channel.socket.oio" ], + "io.netty:netty-transport-native-unix-common": [ + "io.netty.channel.unix" + ], "io.perfmark:perfmark-api": [ "io.perfmark" ], "jakarta.activation:jakarta.activation-api": [ "javax.activation" ], + "jakarta.inject:jakarta.inject-api": [ + "jakarta.inject" + ], "jakarta.xml.bind:jakarta.xml.bind-api": [ "javax.xml.bind", "javax.xml.bind.annotation", @@ -2826,6 +3582,50 @@ "org.junit.runners.parameterized", "org.junit.validator" ], + "net.bytebuddy:byte-buddy": [ + "net.bytebuddy", + "net.bytebuddy.agent.builder", + "net.bytebuddy.asm", + "net.bytebuddy.build", + "net.bytebuddy.description", + "net.bytebuddy.description.annotation", + "net.bytebuddy.description.enumeration", + "net.bytebuddy.description.field", + "net.bytebuddy.description.method", + "net.bytebuddy.description.modifier", + "net.bytebuddy.description.type", + "net.bytebuddy.dynamic", + "net.bytebuddy.dynamic.loading", + "net.bytebuddy.dynamic.scaffold", + "net.bytebuddy.dynamic.scaffold.inline", + "net.bytebuddy.dynamic.scaffold.subclass", + "net.bytebuddy.implementation", + "net.bytebuddy.implementation.attribute", + "net.bytebuddy.implementation.auxiliary", + "net.bytebuddy.implementation.bind", + "net.bytebuddy.implementation.bind.annotation", + "net.bytebuddy.implementation.bytecode", + "net.bytebuddy.implementation.bytecode.assign", + "net.bytebuddy.implementation.bytecode.assign.primitive", + "net.bytebuddy.implementation.bytecode.assign.reference", + "net.bytebuddy.implementation.bytecode.collection", + "net.bytebuddy.implementation.bytecode.constant", + "net.bytebuddy.implementation.bytecode.member", + "net.bytebuddy.jar.asm", + "net.bytebuddy.jar.asm.commons", + "net.bytebuddy.jar.asm.signature", + "net.bytebuddy.matcher", + "net.bytebuddy.pool", + "net.bytebuddy.utility", + "net.bytebuddy.utility.dispatcher", + "net.bytebuddy.utility.nullability", + "net.bytebuddy.utility.privilege", + "net.bytebuddy.utility.visitor" + ], + "net.bytebuddy:byte-buddy-agent": [ + "net.bytebuddy.agent", + "net.bytebuddy.agent.utility.nullability" + ], "net.java.dev.jna:jna": [ "com.sun.jna", "com.sun.jna.internal", @@ -2969,7 +3769,7 @@ "org.jose4j.mac", "org.jose4j.zip" ], - "org.bouncycastle:bcpkix-jdk15on": [ + "org.bouncycastle:bcpkix-jdk18on": [ "org.bouncycastle.cert", "org.bouncycastle.cert.bc", "org.bouncycastle.cert.cmp", @@ -2996,6 +3796,10 @@ "org.bouncycastle.eac.operator.jcajce", "org.bouncycastle.est", "org.bouncycastle.est.jcajce", + "org.bouncycastle.its", + "org.bouncycastle.its.bc", + "org.bouncycastle.its.jcajce", + "org.bouncycastle.its.operator", "org.bouncycastle.mime", "org.bouncycastle.mime.encoding", "org.bouncycastle.mime.smime", @@ -3012,195 +3816,23 @@ "org.bouncycastle.pkcs.jcajce", "org.bouncycastle.pkix", "org.bouncycastle.pkix.jcajce", + "org.bouncycastle.pkix.util", + "org.bouncycastle.pkix.util.filter", "org.bouncycastle.tsp", "org.bouncycastle.tsp.cms", + "org.bouncycastle.tsp.ers", "org.bouncycastle.voms" ], - "org.bouncycastle:bcprov-jdk15on": [ - "org.bouncycastle", - "org.bouncycastle.asn1", - "org.bouncycastle.asn1.anssi", - "org.bouncycastle.asn1.bc", - "org.bouncycastle.asn1.bsi", - "org.bouncycastle.asn1.cmc", - "org.bouncycastle.asn1.cmp", - "org.bouncycastle.asn1.cms", - "org.bouncycastle.asn1.cms.ecc", - "org.bouncycastle.asn1.crmf", - "org.bouncycastle.asn1.cryptlib", - "org.bouncycastle.asn1.cryptopro", - "org.bouncycastle.asn1.dvcs", - "org.bouncycastle.asn1.eac", - "org.bouncycastle.asn1.edec", - "org.bouncycastle.asn1.esf", - "org.bouncycastle.asn1.ess", - "org.bouncycastle.asn1.est", - "org.bouncycastle.asn1.gm", - "org.bouncycastle.asn1.gnu", - "org.bouncycastle.asn1.iana", - "org.bouncycastle.asn1.icao", - "org.bouncycastle.asn1.isara", - "org.bouncycastle.asn1.isismtt", - "org.bouncycastle.asn1.isismtt.ocsp", - "org.bouncycastle.asn1.isismtt.x509", - "org.bouncycastle.asn1.iso", - "org.bouncycastle.asn1.kisa", - "org.bouncycastle.asn1.microsoft", - "org.bouncycastle.asn1.misc", - "org.bouncycastle.asn1.mozilla", - "org.bouncycastle.asn1.nist", - "org.bouncycastle.asn1.nsri", - "org.bouncycastle.asn1.ntt", - "org.bouncycastle.asn1.ocsp", - "org.bouncycastle.asn1.oiw", - "org.bouncycastle.asn1.pkcs", - "org.bouncycastle.asn1.rosstandart", - "org.bouncycastle.asn1.sec", - "org.bouncycastle.asn1.smime", - "org.bouncycastle.asn1.teletrust", - "org.bouncycastle.asn1.tsp", - "org.bouncycastle.asn1.ua", - "org.bouncycastle.asn1.util", - "org.bouncycastle.asn1.x500", - "org.bouncycastle.asn1.x500.style", - "org.bouncycastle.asn1.x509", - "org.bouncycastle.asn1.x509.qualified", - "org.bouncycastle.asn1.x509.sigi", - "org.bouncycastle.asn1.x9", - "org.bouncycastle.crypto", - "org.bouncycastle.crypto.agreement", - "org.bouncycastle.crypto.agreement.jpake", - "org.bouncycastle.crypto.agreement.kdf", - "org.bouncycastle.crypto.agreement.srp", - "org.bouncycastle.crypto.commitments", - "org.bouncycastle.crypto.digests", - "org.bouncycastle.crypto.ec", - "org.bouncycastle.crypto.encodings", - "org.bouncycastle.crypto.engines", - "org.bouncycastle.crypto.examples", - "org.bouncycastle.crypto.generators", - "org.bouncycastle.crypto.io", - "org.bouncycastle.crypto.kems", - "org.bouncycastle.crypto.macs", - "org.bouncycastle.crypto.modes", - "org.bouncycastle.crypto.modes.gcm", - "org.bouncycastle.crypto.modes.kgcm", - "org.bouncycastle.crypto.paddings", - "org.bouncycastle.crypto.params", - "org.bouncycastle.crypto.parsers", - "org.bouncycastle.crypto.prng", - "org.bouncycastle.crypto.prng.drbg", - "org.bouncycastle.crypto.signers", - "org.bouncycastle.crypto.util", - "org.bouncycastle.i18n", - "org.bouncycastle.i18n.filter", - "org.bouncycastle.iana", - "org.bouncycastle.its.asn1", - "org.bouncycastle.jcajce", - "org.bouncycastle.jcajce.interfaces", - "org.bouncycastle.jcajce.io", - "org.bouncycastle.jcajce.provider.asymmetric", - "org.bouncycastle.jcajce.provider.asymmetric.dh", - "org.bouncycastle.jcajce.provider.asymmetric.dsa", - "org.bouncycastle.jcajce.provider.asymmetric.dstu", - "org.bouncycastle.jcajce.provider.asymmetric.ec", - "org.bouncycastle.jcajce.provider.asymmetric.ecgost", - "org.bouncycastle.jcajce.provider.asymmetric.ecgost12", - "org.bouncycastle.jcajce.provider.asymmetric.edec", - "org.bouncycastle.jcajce.provider.asymmetric.elgamal", - "org.bouncycastle.jcajce.provider.asymmetric.gost", - "org.bouncycastle.jcajce.provider.asymmetric.ies", - "org.bouncycastle.jcajce.provider.asymmetric.rsa", - "org.bouncycastle.jcajce.provider.asymmetric.util", - "org.bouncycastle.jcajce.provider.asymmetric.x509", - "org.bouncycastle.jcajce.provider.config", - "org.bouncycastle.jcajce.provider.digest", - "org.bouncycastle.jcajce.provider.drbg", - "org.bouncycastle.jcajce.provider.keystore", - "org.bouncycastle.jcajce.provider.keystore.bc", - "org.bouncycastle.jcajce.provider.keystore.bcfks", - "org.bouncycastle.jcajce.provider.keystore.pkcs12", - "org.bouncycastle.jcajce.provider.symmetric", - "org.bouncycastle.jcajce.provider.symmetric.util", - "org.bouncycastle.jcajce.provider.util", - "org.bouncycastle.jcajce.spec", - "org.bouncycastle.jcajce.util", - "org.bouncycastle.jce", - "org.bouncycastle.jce.exception", - "org.bouncycastle.jce.interfaces", - "org.bouncycastle.jce.netscape", - "org.bouncycastle.jce.provider", - "org.bouncycastle.jce.spec", - "org.bouncycastle.math", - "org.bouncycastle.math.ec", - "org.bouncycastle.math.ec.custom.djb", - "org.bouncycastle.math.ec.custom.gm", - "org.bouncycastle.math.ec.custom.sec", - "org.bouncycastle.math.ec.endo", - "org.bouncycastle.math.ec.rfc7748", - "org.bouncycastle.math.ec.rfc8032", - "org.bouncycastle.math.ec.tools", - "org.bouncycastle.math.field", - "org.bouncycastle.math.raw", - "org.bouncycastle.pqc.asn1", - "org.bouncycastle.pqc.crypto", - "org.bouncycastle.pqc.crypto.gmss", - "org.bouncycastle.pqc.crypto.gmss.util", - "org.bouncycastle.pqc.crypto.lms", - "org.bouncycastle.pqc.crypto.mceliece", - "org.bouncycastle.pqc.crypto.newhope", - "org.bouncycastle.pqc.crypto.qtesla", - "org.bouncycastle.pqc.crypto.rainbow", - "org.bouncycastle.pqc.crypto.rainbow.util", - "org.bouncycastle.pqc.crypto.sphincs", - "org.bouncycastle.pqc.crypto.util", - "org.bouncycastle.pqc.crypto.xmss", - "org.bouncycastle.pqc.jcajce.interfaces", - "org.bouncycastle.pqc.jcajce.provider", - "org.bouncycastle.pqc.jcajce.provider.gmss", - "org.bouncycastle.pqc.jcajce.provider.lms", - "org.bouncycastle.pqc.jcajce.provider.mceliece", - "org.bouncycastle.pqc.jcajce.provider.newhope", - "org.bouncycastle.pqc.jcajce.provider.qtesla", - "org.bouncycastle.pqc.jcajce.provider.rainbow", - "org.bouncycastle.pqc.jcajce.provider.sphincs", - "org.bouncycastle.pqc.jcajce.provider.util", - "org.bouncycastle.pqc.jcajce.provider.xmss", - "org.bouncycastle.pqc.jcajce.spec", - "org.bouncycastle.pqc.math.linearalgebra", - "org.bouncycastle.util", - "org.bouncycastle.util.encoders", - "org.bouncycastle.util.io", - "org.bouncycastle.util.io.pem", - "org.bouncycastle.util.test", - "org.bouncycastle.x509", - "org.bouncycastle.x509.extension", - "org.bouncycastle.x509.util" - ], "org.bouncycastle:bcprov-jdk18on": [ "org.bouncycastle", "org.bouncycastle.asn1", "org.bouncycastle.asn1.anssi", "org.bouncycastle.asn1.bc", - "org.bouncycastle.asn1.cryptlib", "org.bouncycastle.asn1.cryptopro", - "org.bouncycastle.asn1.edec", "org.bouncycastle.asn1.gm", - "org.bouncycastle.asn1.gnu", - "org.bouncycastle.asn1.iana", - "org.bouncycastle.asn1.isara", - "org.bouncycastle.asn1.iso", - "org.bouncycastle.asn1.kisa", - "org.bouncycastle.asn1.microsoft", - "org.bouncycastle.asn1.misc", - "org.bouncycastle.asn1.mozilla", "org.bouncycastle.asn1.nist", - "org.bouncycastle.asn1.nsri", - "org.bouncycastle.asn1.ntt", "org.bouncycastle.asn1.ocsp", - "org.bouncycastle.asn1.oiw", "org.bouncycastle.asn1.pkcs", - "org.bouncycastle.asn1.rosstandart", "org.bouncycastle.asn1.sec", "org.bouncycastle.asn1.teletrust", "org.bouncycastle.asn1.ua", @@ -3238,18 +3870,33 @@ "org.bouncycastle.crypto.prng", "org.bouncycastle.crypto.prng.drbg", "org.bouncycastle.crypto.signers", + "org.bouncycastle.crypto.tls", "org.bouncycastle.crypto.util", "org.bouncycastle.i18n", "org.bouncycastle.i18n.filter", "org.bouncycastle.iana", "org.bouncycastle.internal.asn1.bsi", "org.bouncycastle.internal.asn1.cms", + "org.bouncycastle.internal.asn1.cryptlib", "org.bouncycastle.internal.asn1.eac", + "org.bouncycastle.internal.asn1.edec", + "org.bouncycastle.internal.asn1.gnu", + "org.bouncycastle.internal.asn1.iana", + "org.bouncycastle.internal.asn1.isara", "org.bouncycastle.internal.asn1.isismtt", + "org.bouncycastle.internal.asn1.iso", + "org.bouncycastle.internal.asn1.kisa", + "org.bouncycastle.internal.asn1.microsoft", + "org.bouncycastle.internal.asn1.misc", + "org.bouncycastle.internal.asn1.nsri", + "org.bouncycastle.internal.asn1.ntt", + "org.bouncycastle.internal.asn1.oiw", + "org.bouncycastle.internal.asn1.rosstandart", "org.bouncycastle.jcajce", "org.bouncycastle.jcajce.interfaces", "org.bouncycastle.jcajce.io", "org.bouncycastle.jcajce.provider.asymmetric", + "org.bouncycastle.jcajce.provider.asymmetric.compositesignatures", "org.bouncycastle.jcajce.provider.asymmetric.dh", "org.bouncycastle.jcajce.provider.asymmetric.dsa", "org.bouncycastle.jcajce.provider.asymmetric.dstu", @@ -3260,7 +3907,10 @@ "org.bouncycastle.jcajce.provider.asymmetric.elgamal", "org.bouncycastle.jcajce.provider.asymmetric.gost", "org.bouncycastle.jcajce.provider.asymmetric.ies", + "org.bouncycastle.jcajce.provider.asymmetric.mldsa", + "org.bouncycastle.jcajce.provider.asymmetric.mlkem", "org.bouncycastle.jcajce.provider.asymmetric.rsa", + "org.bouncycastle.jcajce.provider.asymmetric.slhdsa", "org.bouncycastle.jcajce.provider.asymmetric.util", "org.bouncycastle.jcajce.provider.asymmetric.x509", "org.bouncycastle.jcajce.provider.config", @@ -3298,22 +3948,25 @@ "org.bouncycastle.pqc.crypto.bike", "org.bouncycastle.pqc.crypto.cmce", "org.bouncycastle.pqc.crypto.crystals.dilithium", - "org.bouncycastle.pqc.crypto.crystals.kyber", "org.bouncycastle.pqc.crypto.falcon", "org.bouncycastle.pqc.crypto.frodo", "org.bouncycastle.pqc.crypto.gemss", "org.bouncycastle.pqc.crypto.hqc", "org.bouncycastle.pqc.crypto.lms", + "org.bouncycastle.pqc.crypto.mldsa", + "org.bouncycastle.pqc.crypto.mlkem", "org.bouncycastle.pqc.crypto.newhope", "org.bouncycastle.pqc.crypto.ntru", "org.bouncycastle.pqc.crypto.ntruprime", "org.bouncycastle.pqc.crypto.picnic", "org.bouncycastle.pqc.crypto.rainbow", "org.bouncycastle.pqc.crypto.saber", + "org.bouncycastle.pqc.crypto.slhdsa", "org.bouncycastle.pqc.crypto.sphincs", "org.bouncycastle.pqc.crypto.sphincsplus", "org.bouncycastle.pqc.crypto.util", "org.bouncycastle.pqc.crypto.xmss", + "org.bouncycastle.pqc.crypto.xwing", "org.bouncycastle.pqc.jcajce.interfaces", "org.bouncycastle.pqc.jcajce.provider", "org.bouncycastle.pqc.jcajce.provider.bike", @@ -3340,10 +3993,14 @@ "org.bouncycastle.pqc.legacy.crypto.gmss", "org.bouncycastle.pqc.legacy.crypto.gmss.util", "org.bouncycastle.pqc.legacy.crypto.mceliece", + "org.bouncycastle.pqc.legacy.crypto.ntru", "org.bouncycastle.pqc.legacy.crypto.qtesla", "org.bouncycastle.pqc.legacy.crypto.rainbow", "org.bouncycastle.pqc.legacy.crypto.rainbow.util", "org.bouncycastle.pqc.legacy.math.linearalgebra", + "org.bouncycastle.pqc.legacy.math.ntru.euclid", + "org.bouncycastle.pqc.legacy.math.ntru.polynomial", + "org.bouncycastle.pqc.legacy.math.ntru.util", "org.bouncycastle.pqc.math.ntru", "org.bouncycastle.pqc.math.ntru.parameters", "org.bouncycastle.util", @@ -3355,6 +4012,58 @@ "org.bouncycastle.x509.extension", "org.bouncycastle.x509.util" ], + "org.bouncycastle:bcutil-jdk18on": [ + "org.bouncycastle.asn1.bsi", + "org.bouncycastle.asn1.cmc", + "org.bouncycastle.asn1.cmp", + "org.bouncycastle.asn1.cms", + "org.bouncycastle.asn1.cms.ecc", + "org.bouncycastle.asn1.crmf", + "org.bouncycastle.asn1.cryptlib", + "org.bouncycastle.asn1.dvcs", + "org.bouncycastle.asn1.eac", + "org.bouncycastle.asn1.edec", + "org.bouncycastle.asn1.esf", + "org.bouncycastle.asn1.ess", + "org.bouncycastle.asn1.est", + "org.bouncycastle.asn1.gnu", + "org.bouncycastle.asn1.iana", + "org.bouncycastle.asn1.icao", + "org.bouncycastle.asn1.isara", + "org.bouncycastle.asn1.isismtt", + "org.bouncycastle.asn1.isismtt.ocsp", + "org.bouncycastle.asn1.isismtt.x509", + "org.bouncycastle.asn1.iso", + "org.bouncycastle.asn1.kisa", + "org.bouncycastle.asn1.microsoft", + "org.bouncycastle.asn1.misc", + "org.bouncycastle.asn1.mozilla", + "org.bouncycastle.asn1.nsri", + "org.bouncycastle.asn1.ntt", + "org.bouncycastle.asn1.oiw", + "org.bouncycastle.asn1.rosstandart", + "org.bouncycastle.asn1.smime", + "org.bouncycastle.asn1.tsp", + "org.bouncycastle.oer", + "org.bouncycastle.oer.its", + "org.bouncycastle.oer.its.etsi102941", + "org.bouncycastle.oer.its.etsi102941.basetypes", + "org.bouncycastle.oer.its.etsi103097", + "org.bouncycastle.oer.its.etsi103097.extension", + "org.bouncycastle.oer.its.ieee1609dot2", + "org.bouncycastle.oer.its.ieee1609dot2.basetypes", + "org.bouncycastle.oer.its.ieee1609dot2dot1", + "org.bouncycastle.oer.its.template.etsi102941", + "org.bouncycastle.oer.its.template.etsi102941.basetypes", + "org.bouncycastle.oer.its.template.etsi103097", + "org.bouncycastle.oer.its.template.etsi103097.extension", + "org.bouncycastle.oer.its.template.ieee1609dot2", + "org.bouncycastle.oer.its.template.ieee1609dot2.basetypes", + "org.bouncycastle.oer.its.template.ieee1609dot2dot1" + ], + "org.checkerframework:checker-compat-qual": [ + "org.checkerframework.checker.nullness.compatqual" + ], "org.checkerframework:checker-qual": [ "org.checkerframework.checker.builder.qual", "org.checkerframework.checker.calledmethods.qual", @@ -3382,7 +4091,7 @@ "org.checkerframework.common.reflection.qual", "org.checkerframework.common.returnsreceiver.qual", "org.checkerframework.common.subtyping.qual", - "org.checkerframework.common.util.report.qual", + "org.checkerframework.common.util.count.report.qual", "org.checkerframework.common.value.qual", "org.checkerframework.dataflow.qual", "org.checkerframework.framework.qual" @@ -3460,10 +4169,6 @@ "org.jdom2.xpath.jaxen", "org.jdom2.xpath.util" ], - "org.jetbrains.intellij.deps:trove4j": [ - "gnu.trove", - "gnu.trove.decorator" - ], "org.jetbrains.kotlin:kotlin-reflect": [ "kotlin.reflect.full", "kotlin.reflect.jvm", @@ -3538,6 +4243,8 @@ "kotlin.collections.unsigned", "kotlin.comparisons", "kotlin.concurrent", + "kotlin.concurrent.atomics", + "kotlin.concurrent.internal", "kotlin.contracts", "kotlin.coroutines", "kotlin.coroutines.cancellation", @@ -3572,7 +4279,25 @@ "kotlin.text", "kotlin.text.jdk8", "kotlin.time", - "kotlin.time.jdk8" + "kotlin.time.jdk8", + "kotlin.uuid" + ], + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm": [ + "_COROUTINE", + "kotlinx.coroutines", + "kotlinx.coroutines.channels", + "kotlinx.coroutines.debug", + "kotlinx.coroutines.debug.internal", + "kotlinx.coroutines.flow", + "kotlinx.coroutines.flow.internal", + "kotlinx.coroutines.future", + "kotlinx.coroutines.internal", + "kotlinx.coroutines.intrinsics", + "kotlinx.coroutines.scheduling", + "kotlinx.coroutines.selects", + "kotlinx.coroutines.stream", + "kotlinx.coroutines.sync", + "kotlinx.coroutines.time" ], "org.jetbrains.kotlinx:kotlinx-metadata-jvm": [ "kotlinx.metadata", @@ -3594,10 +4319,91 @@ "org.intellij.lang.annotations", "org.jetbrains.annotations" ], + "org.jspecify:jspecify": [ + "org.jspecify.annotations" + ], "org.jvnet.staxex:stax-ex": [ "org.jvnet.staxex", "org.jvnet.staxex.util" ], + "org.mockito:mockito-core": [ + "org.mockito", + "org.mockito.codegen", + "org.mockito.configuration", + "org.mockito.creation.instance", + "org.mockito.exceptions.base", + "org.mockito.exceptions.misusing", + "org.mockito.exceptions.stacktrace", + "org.mockito.exceptions.verification", + "org.mockito.exceptions.verification.junit", + "org.mockito.exceptions.verification.opentest4j", + "org.mockito.hamcrest", + "org.mockito.internal", + "org.mockito.internal.configuration", + "org.mockito.internal.configuration.injection", + "org.mockito.internal.configuration.injection.filter", + "org.mockito.internal.configuration.injection.scanner", + "org.mockito.internal.configuration.plugins", + "org.mockito.internal.creation", + "org.mockito.internal.creation.bytebuddy", + "org.mockito.internal.creation.instance", + "org.mockito.internal.creation.proxy", + "org.mockito.internal.creation.settings", + "org.mockito.internal.creation.util", + "org.mockito.internal.debugging", + "org.mockito.internal.exceptions", + "org.mockito.internal.exceptions.stacktrace", + "org.mockito.internal.exceptions.util", + "org.mockito.internal.framework", + "org.mockito.internal.hamcrest", + "org.mockito.internal.handler", + "org.mockito.internal.invocation", + "org.mockito.internal.invocation.finder", + "org.mockito.internal.invocation.mockref", + "org.mockito.internal.junit", + "org.mockito.internal.listeners", + "org.mockito.internal.matchers", + "org.mockito.internal.matchers.apachecommons", + "org.mockito.internal.matchers.text", + "org.mockito.internal.progress", + "org.mockito.internal.reporting", + "org.mockito.internal.runners", + "org.mockito.internal.runners.util", + "org.mockito.internal.session", + "org.mockito.internal.stubbing", + "org.mockito.internal.stubbing.answers", + "org.mockito.internal.stubbing.defaultanswers", + "org.mockito.internal.util", + "org.mockito.internal.util.collections", + "org.mockito.internal.util.concurrent", + "org.mockito.internal.util.io", + "org.mockito.internal.util.reflection", + "org.mockito.internal.verification", + "org.mockito.internal.verification.api", + "org.mockito.internal.verification.argumentmatching", + "org.mockito.internal.verification.checkers", + "org.mockito.invocation", + "org.mockito.junit", + "org.mockito.listeners", + "org.mockito.mock", + "org.mockito.plugins", + "org.mockito.quality", + "org.mockito.session", + "org.mockito.stubbing", + "org.mockito.verification" + ], + "org.objenesis:objenesis": [ + "org.objenesis", + "org.objenesis.instantiator", + "org.objenesis.instantiator.android", + "org.objenesis.instantiator.annotations", + "org.objenesis.instantiator.basic", + "org.objenesis.instantiator.gcj", + "org.objenesis.instantiator.perc", + "org.objenesis.instantiator.sun", + "org.objenesis.instantiator.util", + "org.objenesis.strategy" + ], "org.ow2.asm:asm": [ "org.objectweb.asm", "org.objectweb.asm.signature" @@ -3614,11 +4420,15 @@ "org.ow2.asm:asm-util": [ "org.objectweb.asm.util" ], + "org.pcollections:pcollections": [ + "org.pcollections" + ], "org.robolectric:annotations": [ "org.robolectric.annotation", "org.robolectric.annotation.experimental", "org.robolectric.annotation.internal", - "org.robolectric.shadow.api" + "org.robolectric.shadow.api", + "org.robolectric.versioning" ], "org.robolectric:junit": [ "org.robolectric.internal" @@ -3651,7 +4461,7 @@ "org.robolectric.internal.dependency", "org.robolectric.junit.rules", "org.robolectric.plugins", - "org.robolectric.util" + "org.robolectric.plugins.config" ], "org.robolectric:sandbox": [ "org.robolectric.config", @@ -3698,86 +4508,50 @@ "org.tensorflow.lite.support.metadata", "org.tensorflow.lite.support.metadata.schema" ], - "xerces:xercesImpl": [ - "org.apache.html.dom", - "org.apache.wml", - "org.apache.wml.dom", - "org.apache.xerces.dom", - "org.apache.xerces.dom.events", - "org.apache.xerces.dom3.as", - "org.apache.xerces.impl", - "org.apache.xerces.impl.dtd", - "org.apache.xerces.impl.dtd.models", - "org.apache.xerces.impl.dv", - "org.apache.xerces.impl.dv.dtd", - "org.apache.xerces.impl.dv.util", - "org.apache.xerces.impl.dv.xs", - "org.apache.xerces.impl.io", - "org.apache.xerces.impl.msg", - "org.apache.xerces.impl.validation", - "org.apache.xerces.impl.xpath", - "org.apache.xerces.impl.xpath.regex", - "org.apache.xerces.impl.xs", - "org.apache.xerces.impl.xs.identity", - "org.apache.xerces.impl.xs.models", - "org.apache.xerces.impl.xs.opti", - "org.apache.xerces.impl.xs.traversers", - "org.apache.xerces.impl.xs.util", - "org.apache.xerces.jaxp", - "org.apache.xerces.jaxp.datatype", - "org.apache.xerces.jaxp.validation", - "org.apache.xerces.parsers", - "org.apache.xerces.stax", - "org.apache.xerces.stax.events", - "org.apache.xerces.util", - "org.apache.xerces.xinclude", - "org.apache.xerces.xni", - "org.apache.xerces.xni.grammars", - "org.apache.xerces.xni.parser", - "org.apache.xerces.xpointer", - "org.apache.xerces.xs", - "org.apache.xerces.xs.datatypes", - "org.apache.xml.serialize", - "org.w3c.dom.html" - ], - "xml-apis:xml-apis": [ - "javax.xml", - "javax.xml.datatype", - "javax.xml.namespace", - "javax.xml.parsers", - "javax.xml.stream", - "javax.xml.stream.events", - "javax.xml.stream.util", - "javax.xml.transform", - "javax.xml.transform.dom", - "javax.xml.transform.sax", - "javax.xml.transform.stax", - "javax.xml.transform.stream", - "javax.xml.validation", - "javax.xml.xpath", - "org.apache.xmlcommons", - "org.w3c.dom", - "org.w3c.dom.bootstrap", - "org.w3c.dom.css", - "org.w3c.dom.events", - "org.w3c.dom.html", - "org.w3c.dom.ls", - "org.w3c.dom.ranges", - "org.w3c.dom.stylesheets", - "org.w3c.dom.traversal", - "org.w3c.dom.views", - "org.w3c.dom.xpath", - "org.xml.sax", - "org.xml.sax.ext", - "org.xml.sax.helpers" + "org.xerial:sqlite-jdbc": [ + "org.sqlite", + "org.sqlite.core", + "org.sqlite.date", + "org.sqlite.javax", + "org.sqlite.jdbc3", + "org.sqlite.jdbc4", + "org.sqlite.nativeimage", + "org.sqlite.util" + ], + "org.yaml:snakeyaml": [ + "org.yaml.snakeyaml", + "org.yaml.snakeyaml.comments", + "org.yaml.snakeyaml.composer", + "org.yaml.snakeyaml.constructor", + "org.yaml.snakeyaml.emitter", + "org.yaml.snakeyaml.env", + "org.yaml.snakeyaml.error", + "org.yaml.snakeyaml.events", + "org.yaml.snakeyaml.extensions.compactnotation", + "org.yaml.snakeyaml.external.biz.base64Coder", + "org.yaml.snakeyaml.external.com.google.gdata.util.common.base", + "org.yaml.snakeyaml.inspector", + "org.yaml.snakeyaml.internal", + "org.yaml.snakeyaml.introspector", + "org.yaml.snakeyaml.nodes", + "org.yaml.snakeyaml.parser", + "org.yaml.snakeyaml.reader", + "org.yaml.snakeyaml.representer", + "org.yaml.snakeyaml.resolver", + "org.yaml.snakeyaml.scanner", + "org.yaml.snakeyaml.serializer", + "org.yaml.snakeyaml.tokens", + "org.yaml.snakeyaml.util" ] }, "repositories": { "https://maven.google.com/": [ "androidx.annotation:annotation", "androidx.annotation:annotation-experimental:aar", + "androidx.annotation:annotation-jvm", "androidx.concurrent:concurrent-futures", "androidx.databinding:databinding-common", + "androidx.databinding:databinding-compiler", "androidx.databinding:databinding-compiler-common", "androidx.lifecycle:lifecycle-common", "androidx.privacysandbox.tools:tools", @@ -3793,10 +4567,14 @@ "androidx.tracing:tracing:aar", "com.almworks.sqlite4java:sqlite4java", "com.android.databinding:baseLibrary", + "com.android.tools.adblib:adblib", + "com.android.tools.adblib:adblib-tools", "com.android.tools.analytics-library:crash", "com.android.tools.analytics-library:protos", "com.android.tools.analytics-library:shared", "com.android.tools.analytics-library:tracker", + "com.android.tools.apkdeployer:apkdeployer", + "com.android.tools.apkparser:binary-resources", "com.android.tools.build.jetifier:jetifier-core", "com.android.tools.build.jetifier:jetifier-processor", "com.android.tools.build:aapt2-proto", @@ -3818,6 +4596,7 @@ "com.android.tools.lint:lint-typedef-remover", "com.android.tools.utp:android-device-provider-ddmlib-proto", "com.android.tools.utp:android-device-provider-gradle-proto", + "com.android.tools.utp:android-device-provider-profile-proto", "com.android.tools.utp:android-test-plugin-host-additional-test-output-proto", "com.android.tools.utp:android-test-plugin-host-apk-installer-proto", "com.android.tools.utp:android-test-plugin-host-coverage-proto", @@ -3827,33 +4606,54 @@ "com.android.tools.utp:android-test-plugin-result-listener-gradle-proto", "com.android.tools:annotations", "com.android.tools:common", + "com.android.tools:desugar_jdk_libs_configuration", "com.android.tools:desugar_jdk_libs_configuration_minimal", "com.android.tools:desugar_jdk_libs_configuration_nio", "com.android.tools:desugar_jdk_libs_minimal", "com.android.tools:desugar_jdk_libs_nio", "com.android.tools:dvlib", + "com.android.tools:r8", "com.android.tools:repository", "com.android.tools:sdk-common", "com.android.tools:sdklib", "com.android:signflinger", "com.android:zipflinger", + "com.beust:jcommander", + "com.github.ben-manes.caffeine:caffeine", + "com.github.kevinstern:software-and-algorithms", "com.google.android:annotations", "com.google.api.grpc:proto-google-common-protos", + "com.google.auto.service:auto-service", + "com.google.auto.service:auto-service-annotations", + "com.google.auto.value:auto-value", "com.google.auto.value:auto-value-annotations", + "com.google.auto:auto-common", "com.google.code.findbugs:jsr305", "com.google.code.gson:gson", "com.google.crypto.tink:tink", "com.google.dagger:dagger", + "com.google.errorprone:error_prone_annotation", "com.google.errorprone:error_prone_annotations", + "com.google.errorprone:error_prone_check_api", + "com.google.errorprone:error_prone_core", + "com.google.errorprone:error_prone_type_annotations", "com.google.flatbuffers:flatbuffers-java", + "com.google.flogger:flogger", + "com.google.flogger:flogger-system-backend", "com.google.guava:failureaccess", "com.google.guava:guava", + "com.google.guava:guava-testlib", "com.google.guava:listenablefuture", "com.google.j2objc:j2objc-annotations", "com.google.jimfs:jimfs", "com.google.protobuf:protobuf-java", "com.google.protobuf:protobuf-java-util", + "com.google.testing.compile:compile-testing", "com.google.testing.platform:core-proto", + "com.google.testparameterinjector:test-parameter-injector", + "com.google.truth.extensions:truth-java8-extension", + "com.google.truth.extensions:truth-liteproto-extension", + "com.google.truth.extensions:truth-proto-extension", "com.google.truth:truth", "com.googlecode.juniversalchardet:juniversalchardet", "com.ibm.icu:icu4j", @@ -3867,6 +4667,8 @@ "commons-io:commons-io", "commons-logging:commons-logging", "info.picocli:picocli", + "io.github.eisop:dataflow-errorprone", + "io.github.java-diff-utils:java-diff-utils", "io.grpc:grpc-api", "io.grpc:grpc-context", "io.grpc:grpc-core", @@ -3883,14 +4685,17 @@ "io.netty:netty-handler", "io.netty:netty-handler-proxy", "io.netty:netty-resolver", - "io.netty:netty-tcnative-classes", "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common", "io.perfmark:perfmark-api", "jakarta.activation:jakarta.activation-api", + "jakarta.inject:jakarta.inject-api", "jakarta.xml.bind:jakarta.xml.bind-api", "javax.annotation:javax.annotation-api", "javax.inject:javax.inject", "junit:junit", + "net.bytebuddy:byte-buddy", + "net.bytebuddy:byte-buddy-agent", "net.java.dev.jna:jna", "net.java.dev.jna:jna-platform", "net.sf.jopt-simple:jopt-simple", @@ -3900,9 +4705,10 @@ "org.apache.httpcomponents:httpcore", "org.apache.httpcomponents:httpmime", "org.bitbucket.b_c:jose4j", - "org.bouncycastle:bcpkix-jdk15on", - "org.bouncycastle:bcprov-jdk15on", + "org.bouncycastle:bcpkix-jdk18on", "org.bouncycastle:bcprov-jdk18on", + "org.bouncycastle:bcutil-jdk18on", + "org.checkerframework:checker-compat-qual", "org.checkerframework:checker-qual", "org.codehaus.mojo:animal-sniffer-annotations", "org.conscrypt:conscrypt-openjdk-uber", @@ -3911,20 +4717,24 @@ "org.hamcrest:hamcrest", "org.hamcrest:hamcrest-core", "org.jdom:jdom2", - "org.jetbrains.intellij.deps:trove4j", "org.jetbrains.kotlin:kotlin-reflect", "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common", "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "org.jetbrains.kotlin:kotlin-stdlib-jdk8", + "org.jetbrains.kotlinx:kotlinx-coroutines-core", + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", "org.jetbrains.kotlinx:kotlinx-metadata-jvm", "org.jetbrains:annotations", + "org.jspecify:jspecify", "org.jvnet.staxex:stax-ex", + "org.mockito:mockito-core", + "org.objenesis:objenesis", "org.ow2.asm:asm", "org.ow2.asm:asm-analysis", "org.ow2.asm:asm-commons", "org.ow2.asm:asm-tree", "org.ow2.asm:asm-util", + "org.pcollections:pcollections", "org.robolectric:annotations", "org.robolectric:junit", "org.robolectric:nativeruntime", @@ -3940,14 +4750,16 @@ "org.robolectric:utils-reflector", "org.slf4j:slf4j-api", "org.tensorflow:tensorflow-lite-metadata", - "xerces:xercesImpl", - "xml-apis:xml-apis" + "org.xerial:sqlite-jdbc", + "org.yaml:snakeyaml" ], "https://repo1.maven.org/maven2/": [ "androidx.annotation:annotation", "androidx.annotation:annotation-experimental:aar", + "androidx.annotation:annotation-jvm", "androidx.concurrent:concurrent-futures", "androidx.databinding:databinding-common", + "androidx.databinding:databinding-compiler", "androidx.databinding:databinding-compiler-common", "androidx.lifecycle:lifecycle-common", "androidx.privacysandbox.tools:tools", @@ -3963,10 +4775,14 @@ "androidx.tracing:tracing:aar", "com.almworks.sqlite4java:sqlite4java", "com.android.databinding:baseLibrary", + "com.android.tools.adblib:adblib", + "com.android.tools.adblib:adblib-tools", "com.android.tools.analytics-library:crash", "com.android.tools.analytics-library:protos", "com.android.tools.analytics-library:shared", "com.android.tools.analytics-library:tracker", + "com.android.tools.apkdeployer:apkdeployer", + "com.android.tools.apkparser:binary-resources", "com.android.tools.build.jetifier:jetifier-core", "com.android.tools.build.jetifier:jetifier-processor", "com.android.tools.build:aapt2-proto", @@ -3988,6 +4804,7 @@ "com.android.tools.lint:lint-typedef-remover", "com.android.tools.utp:android-device-provider-ddmlib-proto", "com.android.tools.utp:android-device-provider-gradle-proto", + "com.android.tools.utp:android-device-provider-profile-proto", "com.android.tools.utp:android-test-plugin-host-additional-test-output-proto", "com.android.tools.utp:android-test-plugin-host-apk-installer-proto", "com.android.tools.utp:android-test-plugin-host-coverage-proto", @@ -3997,33 +4814,54 @@ "com.android.tools.utp:android-test-plugin-result-listener-gradle-proto", "com.android.tools:annotations", "com.android.tools:common", + "com.android.tools:desugar_jdk_libs_configuration", "com.android.tools:desugar_jdk_libs_configuration_minimal", "com.android.tools:desugar_jdk_libs_configuration_nio", "com.android.tools:desugar_jdk_libs_minimal", "com.android.tools:desugar_jdk_libs_nio", "com.android.tools:dvlib", + "com.android.tools:r8", "com.android.tools:repository", "com.android.tools:sdk-common", "com.android.tools:sdklib", "com.android:signflinger", "com.android:zipflinger", + "com.beust:jcommander", + "com.github.ben-manes.caffeine:caffeine", + "com.github.kevinstern:software-and-algorithms", "com.google.android:annotations", "com.google.api.grpc:proto-google-common-protos", + "com.google.auto.service:auto-service", + "com.google.auto.service:auto-service-annotations", + "com.google.auto.value:auto-value", "com.google.auto.value:auto-value-annotations", + "com.google.auto:auto-common", "com.google.code.findbugs:jsr305", "com.google.code.gson:gson", "com.google.crypto.tink:tink", "com.google.dagger:dagger", + "com.google.errorprone:error_prone_annotation", "com.google.errorprone:error_prone_annotations", + "com.google.errorprone:error_prone_check_api", + "com.google.errorprone:error_prone_core", + "com.google.errorprone:error_prone_type_annotations", "com.google.flatbuffers:flatbuffers-java", + "com.google.flogger:flogger", + "com.google.flogger:flogger-system-backend", "com.google.guava:failureaccess", "com.google.guava:guava", + "com.google.guava:guava-testlib", "com.google.guava:listenablefuture", "com.google.j2objc:j2objc-annotations", "com.google.jimfs:jimfs", "com.google.protobuf:protobuf-java", "com.google.protobuf:protobuf-java-util", + "com.google.testing.compile:compile-testing", "com.google.testing.platform:core-proto", + "com.google.testparameterinjector:test-parameter-injector", + "com.google.truth.extensions:truth-java8-extension", + "com.google.truth.extensions:truth-liteproto-extension", + "com.google.truth.extensions:truth-proto-extension", "com.google.truth:truth", "com.googlecode.juniversalchardet:juniversalchardet", "com.ibm.icu:icu4j", @@ -4037,6 +4875,8 @@ "commons-io:commons-io", "commons-logging:commons-logging", "info.picocli:picocli", + "io.github.eisop:dataflow-errorprone", + "io.github.java-diff-utils:java-diff-utils", "io.grpc:grpc-api", "io.grpc:grpc-context", "io.grpc:grpc-core", @@ -4053,14 +4893,17 @@ "io.netty:netty-handler", "io.netty:netty-handler-proxy", "io.netty:netty-resolver", - "io.netty:netty-tcnative-classes", "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common", "io.perfmark:perfmark-api", "jakarta.activation:jakarta.activation-api", + "jakarta.inject:jakarta.inject-api", "jakarta.xml.bind:jakarta.xml.bind-api", "javax.annotation:javax.annotation-api", "javax.inject:javax.inject", "junit:junit", + "net.bytebuddy:byte-buddy", + "net.bytebuddy:byte-buddy-agent", "net.java.dev.jna:jna", "net.java.dev.jna:jna-platform", "net.sf.jopt-simple:jopt-simple", @@ -4070,9 +4913,10 @@ "org.apache.httpcomponents:httpcore", "org.apache.httpcomponents:httpmime", "org.bitbucket.b_c:jose4j", - "org.bouncycastle:bcpkix-jdk15on", - "org.bouncycastle:bcprov-jdk15on", + "org.bouncycastle:bcpkix-jdk18on", "org.bouncycastle:bcprov-jdk18on", + "org.bouncycastle:bcutil-jdk18on", + "org.checkerframework:checker-compat-qual", "org.checkerframework:checker-qual", "org.codehaus.mojo:animal-sniffer-annotations", "org.conscrypt:conscrypt-openjdk-uber", @@ -4081,20 +4925,24 @@ "org.hamcrest:hamcrest", "org.hamcrest:hamcrest-core", "org.jdom:jdom2", - "org.jetbrains.intellij.deps:trove4j", "org.jetbrains.kotlin:kotlin-reflect", "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common", "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "org.jetbrains.kotlin:kotlin-stdlib-jdk8", + "org.jetbrains.kotlinx:kotlinx-coroutines-core", + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", "org.jetbrains.kotlinx:kotlinx-metadata-jvm", "org.jetbrains:annotations", + "org.jspecify:jspecify", "org.jvnet.staxex:stax-ex", + "org.mockito:mockito-core", + "org.objenesis:objenesis", "org.ow2.asm:asm", "org.ow2.asm:asm-analysis", "org.ow2.asm:asm-commons", "org.ow2.asm:asm-tree", "org.ow2.asm:asm-util", + "org.pcollections:pcollections", "org.robolectric:annotations", "org.robolectric:junit", "org.robolectric:nativeruntime", @@ -4110,14 +4958,19 @@ "org.robolectric:utils-reflector", "org.slf4j:slf4j-api", "org.tensorflow:tensorflow-lite-metadata", - "xerces:xercesImpl", - "xml-apis:xml-apis" + "org.xerial:sqlite-jdbc", + "org.yaml:snakeyaml" ] }, "services": { + "androidx.databinding:databinding-compiler": { + "javax.annotation.processing.Processor": [ + "android.databinding.annotationprocessor.ProcessDataBinding" + ] + }, "com.android.tools.build:builder": { - "com.android.tools.r8.internal.XE": [ - "com.android.tools.r8.internal.Ku" + "com.android.tools.r8.internal.OU": [ + "com.android.tools.r8.internal.fK" ] }, "com.android.tools.build:bundletool": { @@ -4130,6 +4983,42 @@ "com.android.build.api.variant.impl.BuiltArtifactsLoaderImpl" ] }, + "com.android.tools:r8": { + "com.android.tools.r8.internal.VV": [ + "com.android.tools.r8.internal.gL" + ] + }, + "com.google.auto.service:auto-service": { + "javax.annotation.processing.Processor": [ + "com.google.auto.service.processor.AutoServiceProcessor" + ] + }, + "com.google.auto.value:auto-value": { + "com.google.auto.value.extension.AutoValueExtension": [ + "com.google.auto.value.extension.memoized.processor.MemoizeExtension", + "com.google.auto.value.extension.serializable.processor.SerializableAutoValueExtension", + "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringExtension" + ], + "com.google.auto.value.extension.serializable.serializer.interfaces.SerializerExtension": [ + "com.google.auto.value.extension.serializable.serializer.impl.ImmutableListSerializerExtension", + "com.google.auto.value.extension.serializable.serializer.impl.ImmutableMapSerializerExtension", + "com.google.auto.value.extension.serializable.serializer.impl.OptionalSerializerExtension" + ], + "javax.annotation.processing.Processor": [ + "com.google.auto.value.extension.memoized.processor.MemoizedValidator", + "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringValidator", + "com.google.auto.value.processor.AutoAnnotationProcessor", + "com.google.auto.value.processor.AutoBuilderProcessor", + "com.google.auto.value.processor.AutoOneOfProcessor", + "com.google.auto.value.processor.AutoValueBuilderProcessor", + "com.google.auto.value.processor.AutoValueProcessor" + ] + }, + "com.google.errorprone:error_prone_core": { + "com.sun.source.util.Plugin": [ + "com.google.errorprone.ErrorProneJavacPlugin" + ] + }, "com.google.jimfs:jimfs": { "java.nio.file.spi.FileSystemProvider": [ "com.google.common.jimfs.SystemJimfsFileSystemProvider" @@ -4138,6 +5027,7 @@ "io.grpc:grpc-core": { "io.grpc.LoadBalancerProvider": [ "io.grpc.internal.PickFirstLoadBalancerProvider", + "io.grpc.util.OutlierDetectionLoadBalancerProvider", "io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider" ], "io.grpc.NameResolverProvider": [ @@ -4146,7 +5036,11 @@ }, "io.grpc:grpc-netty": { "io.grpc.ManagedChannelProvider": [ - "io.grpc.netty.NettyChannelProvider" + "io.grpc.netty.NettyChannelProvider", + "io.grpc.netty.UdsNettyChannelProvider" + ], + "io.grpc.NameResolverProvider": [ + "io.grpc.netty.UdsNameResolverProvider" ], "io.grpc.ServerProvider": [ "io.grpc.netty.NettyServerProvider" @@ -4162,12 +5056,6 @@ "org.kxml2.io.KXmlParser,org.kxml2.io.KXmlSerializer" ] }, - "org.bouncycastle:bcprov-jdk15on": { - "java.security.Provider": [ - "org.bouncycastle.jce.provider.BouncyCastleProvider", - "org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider" - ] - }, "org.bouncycastle:bcprov-jdk18on": { "java.security.Provider": [ "org.bouncycastle.jce.provider.BouncyCastleProvider", @@ -4201,7 +5089,7 @@ }, "org.robolectric:robolectric": { "androidx.test.internal.platform.ThreadChecker": [ - "org.robolectric.android.internal.NoOpThreadChecker" + "org.robolectric.android.internal.RobolectricThreadChecker" ], "androidx.test.internal.platform.app.ActivityInvoker": [ "org.robolectric.android.internal.LocalActivityInvoker" @@ -4234,6 +5122,7 @@ "org.robolectric.plugins.GraphicsModeConfigurer", "org.robolectric.plugins.LazyApplicationConfigurer", "org.robolectric.plugins.LooperModeConfigurer", + "org.robolectric.plugins.ResourcesModeConfigurer", "org.robolectric.plugins.SQLiteModeConfigurer", "org.robolectric.plugins.TextLayoutModeConfigurer" ], @@ -4254,27 +5143,9 @@ "org.robolectric.Shadows" ] }, - "xerces:xercesImpl": { - "javax.xml.datatype.DatatypeFactory": [ - "org.apache.xerces.jaxp.datatype.DatatypeFactoryImpl" - ], - "javax.xml.parsers.DocumentBuilderFactory": [ - "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl" - ], - "javax.xml.parsers.SAXParserFactory": [ - "org.apache.xerces.jaxp.SAXParserFactoryImpl" - ], - "javax.xml.stream.XMLEventFactory": [ - "org.apache.xerces.stax.XMLEventFactoryImpl" - ], - "javax.xml.validation.SchemaFactory": [ - "org.apache.xerces.jaxp.validation.XMLSchemaFactory" - ], - "org.w3c.dom.DOMImplementationSourceList": [ - "org.apache.xerces.dom.DOMXSImplementationSourceImpl" - ], - "org.xml.sax.driver": [ - "org.apache.xerces.parsers.SAXParser" + "org.xerial:sqlite-jdbc": { + "java.sql.Driver": [ + "org.sqlite.JDBC" ] } }, diff --git a/src/java/com/example/sampleapp/BUILD b/src/java/com/example/sampleapp/BUILD index 0e248017b..1ba04447c 100644 --- a/src/java/com/example/sampleapp/BUILD +++ b/src/java/com/example/sampleapp/BUILD @@ -1,5 +1,6 @@ # Sample app to demonstrate proper rule structuring and mobile-install usage. +load("@rules_cc//cc:cc_library.bzl", "cc_library") load("//rules:rules.bzl", "android_binary", "android_library") package(default_visibility = ["//src:__subpackages__"]) diff --git a/src/tools/javatests/com/google/devtools/build/android/r8/testdata/naming001/Reflect.java b/src/tools/javatests/com/google/devtools/build/android/r8/testdata/naming001/Reflect.java index 141c58c24..53632e086 100644 --- a/src/tools/javatests/com/google/devtools/build/android/r8/testdata/naming001/Reflect.java +++ b/src/tools/javatests/com/google/devtools/build/android/r8/testdata/naming001/Reflect.java @@ -23,7 +23,7 @@ * testing in the R8 repo. The class was actually there for testing some R8 renaming, and * CompatDexBuilderTest just happened to piggy-bag on this class. */ -@SuppressWarnings({"PrivateConstructorForUtilityClass", "ClassCanBeStatic"}) +@SuppressWarnings({"PrivateConstructorForUtilityClass", "ClassCanBeStatic", "ReturnValueIgnored"}) public class Reflect { void keep() throws ClassNotFoundException { Class.forName("naming001.Reflect2"); diff --git a/test/rules/android_binary/AndroidManifest.xml b/test/rules/android_binary/AndroidManifest.xml index 4b5e84915..459b892aa 100644 --- a/test/rules/android_binary/AndroidManifest.xml +++ b/test/rules/android_binary/AndroidManifest.xml @@ -6,6 +6,5 @@ android:targetSdkVersion="24" /> + android:value="bar" /> diff --git a/test/rules/android_binary/BUILD b/test/rules/android_binary/BUILD index 5cc48d946..1d37d42d4 100644 --- a/test/rules/android_binary/BUILD +++ b/test/rules/android_binary/BUILD @@ -1,5 +1,6 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("@rules_cc//cc/toolchains:cc_toolchain.bzl", "cc_toolchain") load("@rules_java//java:java_library.bzl", "java_library") load("//rules:rules.bzl", "android_binary", "android_library") load(":test.bzl", "fake_cc_toolchain_config", "multiple_android_platforms_test") diff --git a/test/rules/android_binary/test.bzl b/test/rules/android_binary/test.bzl index 7a0814651..35439d056 100644 --- a/test/rules/android_binary/test.bzl +++ b/test/rules/android_binary/test.bzl @@ -13,6 +13,8 @@ # limitations under the License. """Tests for android_binary.""" +load("@rules_cc//cc:defs.bzl", "CcToolchainConfigInfo") +load("@rules_cc//cc/common:cc_common.bzl", "cc_common") load("//rules:visibility.bzl", "PROJECT_VISIBILITY") load( "//test/utils:lib.bzl", diff --git a/test/rules/resources/BUILD b/test/rules/resources/BUILD index df9e1aa2e..1c82d05d9 100644 --- a/test/rules/resources/BUILD +++ b/test/rules/resources/BUILD @@ -1257,31 +1257,11 @@ starlark_process_test( ], ), inspect_actions = dict( + # Use path suffixes that work across platforms (k8-fastbuild vs darwin_arm64-fastbuild). + # The _is_suffix_sublist check uses .endswith(), so we match the end of the full arg string. PackageAndroidResources = [ - "--data", - ":".join([ - "", - "", - "bazel-out/k8-fastbuild/bin/test/rules/resources/manifest_without_resources_processed_manifest/AndroidManifest.xml", - "bazel-out/k8-fastbuild/bin/test/rules/resources/manifest_without_resources_symbols/R.aapt2.txt", - "bazel-out/k8-fastbuild/bin/test/rules/resources/manifest_without_resources_symbols/symbols.zip", - ]), - "--directData", - ":".join([ - "", - "", - "bazel-out/k8-fastbuild/bin/test/rules/resources/manifest_without_resources_processed_manifest/AndroidManifest.xml", - "bazel-out/k8-fastbuild/bin/test/rules/resources/manifest_without_resources_symbols/R.aapt2.txt", - "bazel-out/k8-fastbuild/bin/test/rules/resources/manifest_without_resources_symbols/symbols.zip", - ]), "--primaryData", - ":".join([ - "", - "", - "bazel-out/k8-fastbuild/bin/test/rules/resources/_generated/exports_manifest_without_resources/AndroidManifest.xml", - "", - "", - ]), + "_generated/exports_manifest_without_resources/AndroidManifest.xml::", ], ), target_under_test = ":exports_manifest_without_resources", diff --git a/test/rules/resources/test.bzl b/test/rules/resources/test.bzl index 23f319e7e..1cabb2ea4 100644 --- a/test/rules/resources/test.bzl +++ b/test/rules/resources/test.bzl @@ -178,7 +178,7 @@ def _starlark_process_test_impl(ctx): ) runfiles = r_java.runtime_output_jars + [ctx.executable._r_class_check] java = ctx.attr._host_javabase[java_common.JavaRuntimeInfo] - args["java"] = java.java_executable_exec_path + args["java"] = java.java_executable_runfiles_path elif ctx.attr.expected_r_class_fields: fail("Expected a R.java file but none was generated") diff --git a/test/utils/asserts.bzl b/test/utils/asserts.bzl index 751b6c47c..bdbd28463 100644 --- a/test/utils/asserts.bzl +++ b/test/utils/asserts.bzl @@ -132,15 +132,18 @@ def ExpectedStarlarkAndroidResourcesInfo( name = (str(direct_resources_nodes) + str(transitive_resources_nodes) + str(transitive_assets) + str(transitive_assets_symbols) + str(transitive_compiled_resources)) name = ":_data_" + str(hash(name)) - _expected_starlark_android_resources_info( - name = name[1:], - direct_resources_nodes = direct_resources_nodes, - transitive_resources_nodes = transitive_resources_nodes, - transitive_assets = transitive_assets, - transitive_assets_symbols = transitive_assets_symbols, - transitive_compiled_resources = transitive_compiled_resources, - packages_to_r_txts = packages_to_r_txts, - ) + + # Allow multiple tests to share the same expected info by checking if rule exists + if not native.existing_rule(name[1:]): + _expected_starlark_android_resources_info( + name = name[1:], + direct_resources_nodes = direct_resources_nodes, + transitive_resources_nodes = transitive_resources_nodes, + transitive_assets = transitive_assets, + transitive_assets_symbols = transitive_assets_symbols, + transitive_compiled_resources = transitive_compiled_resources, + packages_to_r_txts = packages_to_r_txts, + ) return name def _build_expected_resources_node_info(string):