Skip to content

Commit

Permalink
Update D8/R8 dependency in bazel to 8.0.40
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 520331100
Change-Id: Ia150c637747c980fc5cdfa07c80edd3a9e30e04b
  • Loading branch information
Googler authored and copybara-github committed Mar 29, 2023
1 parent cee754c commit c89ca0d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
20 changes: 10 additions & 10 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,20 @@ distdir_tar(
archives = [
"android_tools_pkg-0.28.0.tar",
# for android_gmaven_r8
"r8-8.0.34.jar",
"r8-8.0.40.jar",
],
dirname = "derived/distdir",
dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "additional_distfiles" in attrs["used_in"]},
sha256 = {
"android_tools_pkg-0.28.0.tar": "db3b02421ae974e0b33573f3e4f658d5f89cc9a0b42baae0ba2ac08e25c0720a",
"r8-8.0.34.jar": "805b16bbcee90c35fcba76a1b8cfe1771ef1e16d95bc83aa9e371208e43ffc8b",
"r8-8.0.40.jar": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
},
urls = {
"android_tools_pkg-0.28.0.tar": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.28.0.tar",
],
"r8-8.0.34.jar": [
"https://maven.google.com/com/android/tools/r8/8.0.34/r8-8.0.34.jar",
"r8-8.0.40.jar": [
"https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
],
},
)
Expand Down Expand Up @@ -290,20 +290,20 @@ distdir_tar(
name = "test_WORKSPACE_files",
archives = [
"android_tools_pkg-0.28.0.tar",
"r8-8.0.34.jar",
"r8-8.0.40.jar",
],
dirname = "test_WORKSPACE/distdir",
dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "test_WORKSPACE_files" in attrs["used_in"]},
sha256 = {
"android_tools_pkg-0.28.0.tar": "db3b02421ae974e0b33573f3e4f658d5f89cc9a0b42baae0ba2ac08e25c0720a",
"r8-8.0.34.jar": "805b16bbcee90c35fcba76a1b8cfe1771ef1e16d95bc83aa9e371208e43ffc8b",
"r8-8.0.40.jar": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
},
urls = {
"android_tools_pkg-0.28.0.tar": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.28.0.tar",
],
"r8-8.0.34.jar": [
"https://maven.google.com/com/android/tools/r8/8.0.34/r8-8.0.34.jar",
"r8-8.0.40.jar": [
"https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
],
},
)
Expand All @@ -330,8 +330,8 @@ http_archive(
# and tools/android/android_extensions.bzl
http_jar(
name = "android_gmaven_r8_for_testing",
sha256 = "805b16bbcee90c35fcba76a1b8cfe1771ef1e16d95bc83aa9e371208e43ffc8b",
url = "https://maven.google.com/com/android/tools/r8/8.0.34/r8-8.0.34.jar",
sha256 = "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
url = "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
)

dist_http_archive(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ maybe(
maybe(
http_jar,
name = "android_gmaven_r8",
sha256 = "805b16bbcee90c35fcba76a1b8cfe1771ef1e16d95bc83aa9e371208e43ffc8b",
url = "https://maven.google.com/com/android/tools/r8/8.0.34/r8-8.0.34.jar",
sha256 = "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
url = "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
)
4 changes: 2 additions & 2 deletions tools/android/android_extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ def _remote_android_tools_extensions_impl(_ctx):
)
http_jar(
name = "android_gmaven_r8",
sha256 = "805b16bbcee90c35fcba76a1b8cfe1771ef1e16d95bc83aa9e371208e43ffc8b",
url = "https://maven.google.com/com/android/tools/r8/8.0.34/r8-8.0.34.jar",
sha256 = "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
url = "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
)

remote_android_tools_extensions = module_extension(
Expand Down

0 comments on commit c89ca0d

Please sign in to comment.