Remove explicit R8 version

alexvanyo · Dec 28, 2024 · 0a97cdb · 0a97cdb
1 parent 0019910
commit 0a97cdb
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -60,7 +60,6 @@ detekt {
 }
 
 dependencies {
-    implementation(libs.android.r8)
     implementation(libs.android.gradlePlugin)
     implementation(libs.android.tools.common)
     implementation(libs.dependencyGuard.gradlePlugin)

diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationTestingConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationTestingConventionPlugin.kt
@@ -23,9 +23,7 @@ import com.android.build.gradle.TestedExtension
 import com.slack.keeper.KeeperExtension
 import com.slack.keeper.optInToKeeper
 import org.gradle.api.GradleException
-import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
 
 class AndroidApplicationTestingConventionPlugin : ConventionPlugin({
@@ -45,8 +43,6 @@ class AndroidApplicationTestingConventionPlugin : ConventionPlugin({
         apply("com.android.application")
     }
 
-    val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
-
     extensions.configure<ApplicationExtension> {
         defaultConfig {
             val testBuildTypeProperty =
@@ -80,10 +76,6 @@ class AndroidApplicationTestingConventionPlugin : ConventionPlugin({
             automaticR8RepoManagement.set(false)
             traceReferences {}
         }
-
-        dependencies {
-            add("keeperR8", libs.findLibrary("android.r8").get())
-        }
     }
 })
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,8 +5,6 @@ androidDesugarJdkLibs = "2.1.3"
 androidGradlePlugin = "8.7.3"
 #androidTools
 androidTools = "31.7.3"
-#androidR8
-androidR8 = "8.6.15"
 #androidxActivity
 androidxActivity = "1.10.0-rc01"
 #androidxAnnotation
@@ -126,7 +124,6 @@ wire = "5.1.0"
 
 [libraries]
 android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
-android-r8 = { group = "com.android.tools", name = "r8", version.ref = "androidR8" }
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" }
 androidx-activityCompose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }