Switch to R8 dev releases (#1986)

5 files changed, 40 insertions, 4 deletions

diff --git a/build-logic/android-plugins/build.gradle.kts b/build-logic/android-plugins/build.gradle.kts
index ae6121b0..c30723c7 100644
--- a/build-logic/android-plugins/build.gradle.kts
+++ b/build-logic/android-plugins/build.gradle.kts
@@ -56,6 +56,7 @@ gradlePlugin {
 dependencies {
   implementation(libs.build.agp)
   implementation(libs.build.mavenpublish)
+  implementation(libs.build.r8)
   implementation(libs.build.semver)
   implementation(libs.build.sentry)
 }
diff --git a/build-logic/kotlin-plugins/build.gradle.kts b/build-logic/kotlin-plugins/build.gradle.kts
index 78359ea6..393c6c8a 100644
--- a/build-logic/kotlin-plugins/build.gradle.kts
+++ b/build-logic/kotlin-plugins/build.gradle.kts
@@ -61,6 +61,7 @@ dependencies {
   implementation(libs.build.agp)
   implementation(libs.build.binarycompat)
   implementation(libs.build.kotlin)
+  implementation(libs.build.r8)
   implementation(libs.build.spotless)
   implementation(libs.build.vcu)
   implementation(libs.build.versions)
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index f4d7dc57..7641736c 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -13,7 +13,6 @@ dependencyResolutionManagement {
       filter {
         includeGroup("androidx.databinding")
         includeGroup("com.android")
-        includeGroup("com.android.tools")
         includeGroup("com.android.tools.analytics-library")
         includeGroup("com.android.tools.build")
         includeGroup("com.android.tools.build.jetifier")
@@ -23,12 +22,24 @@ dependencyResolutionManagement {
         includeGroup("com.android.tools.lint")
         includeGroup("com.android.tools.utp")
         includeGroup("com.google.testing.platform")
+        includeModule("com.android.tools", "annotations")
+        includeModule("com.android.tools", "common")
+        includeModule("com.android.tools", "desugar_jdk_libs")
+        includeModule("com.android.tools", "desugar_jdk_libs_configuration")
+        includeModule("com.android.tools", "dvlib")
+        includeModule("com.android.tools", "repository")
+        includeModule("com.android.tools", "sdklib")
+        includeModule("com.android.tools", "sdk-common")
       }
     }
     exclusiveContent {
       forRepository(::gradlePluginPortal)
       filter { includeModule("com.github.ben-manes", "gradle-versions-plugin") }
     }
+    exclusiveContent {
+      forRepository { maven("https://storage.googleapis.com/r8-releases/raw") }
+      filter { includeModule("com.android.tools", "r8") }
+    }
     mavenCentral()
   }
   versionCatalogs {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 10cf30b6..00e5566f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ leakcanary = "2.9.1"
 lifecycle = "2.6.0-alpha01"
 
 [libraries]
-android-desugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5"
+android-desugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.2.0"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx_activity" }
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx_activity" }
 androidx-annotation = "androidx.annotation:annotation:1.4.0-beta01"
@@ -41,6 +41,7 @@ build-download = "de.undercouch:gradle-download-task:5.1.0"
 build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.20.0"
 build-okhttp = "com.squareup.okhttp3:okhttp:4.10.0"
+build-r8 = "com.android.tools:r8:4.0.17-dev"
 build-semver = "com.vdurmont:semver4j:3.1.0"
 build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin:3.1.2"
 build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.8.0"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4fb29edc..b397c3fb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,6 @@ pluginManagement {
       filter {
         includeGroup("androidx.databinding")
         includeGroup("com.android")
-        includeGroup("com.android.tools")
         includeGroup("com.android.tools.analytics-library")
         includeGroup("com.android.tools.build")
         includeGroup("com.android.tools.build.jetifier")
@@ -25,6 +24,14 @@ pluginManagement {
         includeGroup("com.android.tools.lint")
         includeGroup("com.android.tools.utp")
         includeGroup("com.google.testing.platform")
+        includeModule("com.android.tools", "annotations")
+        includeModule("com.android.tools", "common")
+        includeModule("com.android.tools", "desugar_jdk_libs")
+        includeModule("com.android.tools", "desugar_jdk_libs_configuration")
+        includeModule("com.android.tools", "dvlib")
+        includeModule("com.android.tools", "repository")
+        includeModule("com.android.tools", "sdklib")
+        includeModule("com.android.tools", "sdk-common")
       }
     }
     exclusiveContent {
@@ -35,6 +42,10 @@ pluginManagement {
         includeModule("com.gradle.enterprise", "com.gradle.enterprise.gradle.plugin")
       }
     }
+    exclusiveContent {
+      forRepository { maven("https://storage.googleapis.com/r8-releases/raw") }
+      filter { includeModule("com.android.tools", "r8") }
+    }
     mavenCentral()
   }
 }
@@ -56,7 +67,6 @@ dependencyResolutionManagement {
       forRepository(::google)
       filter {
         includeGroup("com.android")
-        includeGroup("com.android.tools")
         includeGroup("com.android.tools.analytics-library")
         includeGroup("com.android.tools.build")
         includeGroup("com.android.tools.ddms")
@@ -65,6 +75,14 @@ dependencyResolutionManagement {
         includeGroup("com.android.tools.layoutlib")
         includeGroup("com.android.tools.lint")
         includeGroup("com.google.android.gms")
+        includeModule("com.android.tools", "annotations")
+        includeModule("com.android.tools", "common")
+        includeModule("com.android.tools", "desugar_jdk_libs")
+        includeModule("com.android.tools", "desugar_jdk_libs_configuration")
+        includeModule("com.android.tools", "dvlib")
+        includeModule("com.android.tools", "repository")
+        includeModule("com.android.tools", "sdklib")
+        includeModule("com.android.tools", "sdk-common")
         includeModule("com.google.android.material", "material")
         includeGroupByRegex("androidx.*")
       }
@@ -76,6 +94,10 @@ dependencyResolutionManagement {
         includeModule("com.github.open-keychain.open-keychain", "sshauthentication-api")
       }
     }
+    exclusiveContent {
+      forRepository { maven("https://storage.googleapis.com/r8-releases/raw") }
+      filter { includeModule("com.android.tools", "r8") }
+    }
     mavenCentral()
   }
 }