From dd5b3fc22f89f15e2e964394e1f769fa65962e26 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 17 Dec 2022 17:19:51 +0800 Subject: [PATCH 1/4] Bump R8 to 4.0.47 --- settings.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index 901bee7f4..9a7312746 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,13 @@ pluginManagement { repositories { google() gradlePluginPortal() + maven("https://storage.googleapis.com/r8-releases/raw") + } + buildscript { + dependencies { + // https://issuetracker.google.com/issues/262661471 + classpath("com.android.tools:r8:4.0.47") + } } } From 92134fd6f6b90458027dac726e7d6eb04ffe1bf7 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 17 Dec 2022 17:38:04 +0800 Subject: [PATCH 2/4] Log R8 version in `allprojects` https://stackoverflow.com/questions/65194964/how-to-get-version-of-r8-that-is-being-used-by-the-android-gradle-plugin --- build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 476c40dfc..4d655248e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -67,6 +67,9 @@ allprojects { } } } + + // https://stackoverflow.com/questions/65194964/how-to-get-version-of-r8-that-is-being-used-by-the-android-gradle-plugin + throw GradleException("R8 version: ${com.android.tools.r8.Version.getVersionString()}") } tasks { From dbe8790cadd5a236fb9a221eb1fe61b591ae51c9 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 17 Dec 2022 17:41:25 +0800 Subject: [PATCH 3/4] Revert "Bump R8 to 4.0.47" This reverts commit dd5b3fc22f89f15e2e964394e1f769fa65962e26. --- settings.gradle.kts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9a7312746..901bee7f4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,13 +2,6 @@ pluginManagement { repositories { google() gradlePluginPortal() - maven("https://storage.googleapis.com/r8-releases/raw") - } - buildscript { - dependencies { - // https://issuetracker.google.com/issues/262661471 - classpath("com.android.tools:r8:4.0.47") - } } } From d5b6d926e2d4aa9681bde90cdd46b5a9b07a2bf3 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 17 Dec 2022 17:42:12 +0800 Subject: [PATCH 4/4] Revert "Log R8 version in `allprojects`" This reverts commit 92134fd6f6b90458027dac726e7d6eb04ffe1bf7. --- build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4d655248e..476c40dfc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -67,9 +67,6 @@ allprojects { } } } - - // https://stackoverflow.com/questions/65194964/how-to-get-version-of-r8-that-is-being-used-by-the-android-gradle-plugin - throw GradleException("R8 version: ${com.android.tools.r8.Version.getVersionString()}") } tasks {