Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade R8 from 8.0.40 to 8.1.56 #19212

Closed
wants to merge 3 commits into from
Closed

Upgrade R8 from 8.0.40 to 8.1.56 #19212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c06c50
Upgrade R8 from 8.0.40 to 8.1.56
Bencodes Aug 9, 2023
c7d7ddf
Revert formatting changes
Bencodes Aug 9, 2023
f18e213
Fix URL
Bencodes Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,20 @@ distdir_tar(
archives = [
"android_tools_pkg-0.29.0.tar",
# for android_gmaven_r8
"r8-8.0.40.jar",
"r8-8.1.56.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.29.0.tar": "d7223664ca5b0de490f2a918c31f35cdf4f23a1446fe261d7470b8a22bd7bcf1",
"r8-8.0.40.jar": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
"r8-8.1.56.jar": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d",
},
urls = {
"android_tools_pkg-0.29.0.tar": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.29.0.tar",
],
"r8-8.0.40.jar": [
"https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
"r8-8.1.56.jar": [
"https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar",
],
},
)
Expand Down
6 changes: 3 additions & 3 deletions distdir_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,10 @@ DIST_DEPS = {
#
###################################################
"android_gmaven_r8": {
"archive": "r8-8.0.40.jar",
"sha256": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
"archive": "r8-8.1.56.jar",
"sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d",
"urls": [
"https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
"https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar",
],
"used_in": [
],
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
View file
Open in desktop
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 = "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
url = "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
sha256 = "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d",
url = "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar",
)
4 changes: 2 additions & 2 deletions tools/android/android_extensions.bzl
View file
Open in desktop
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 = "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
url = "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
sha256 = "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d",
url = "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar",
)

remote_android_tools_extensions = module_extension(
Expand Down
Loading