From 741e82a4251e1e2319c347da65dac9fdfe492167 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 16 Nov 2023 01:04:25 +0530 Subject: [PATCH] fix(build): remove use of custom R8 build In AGP we trust...? --- .github/renovate.json5 | 1 - build-logic/build.gradle.kts | 1 - build-logic/settings.gradle.kts | 4 ---- gradle/libs.versions.toml | 1 - settings.gradle.kts | 6 ------ 5 files changed, 13 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 418f755a..53e8797a 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -46,7 +46,6 @@ }, { "matchPackageNames": [ - "com.android.tools:r8", "com.squareup.anvil", "dev.chrisbanes.compose:compose-bom", ], diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 0562eaa0..0fc91bde 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -65,7 +65,6 @@ dependencies { implementation(libs.build.agp) implementation(libs.build.cachefix) implementation(libs.build.kotlin.gradle) - implementation(libs.build.r8) implementation(libs.build.semver) implementation(libs.build.sentry) implementation(libs.build.spotless) diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index b35e1750..c8106a76 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -43,10 +43,6 @@ dependencyResolutionManagement { includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin") } } - exclusiveContent { - forRepository { maven("https://storage.googleapis.com/r8-releases/raw/main") } - filter { includeModule("com.android.tools", "r8") } - } mavenCentral() } versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e6ddbc77..34f388cd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -51,7 +51,6 @@ androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = " build-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" } build-cachefix = "org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin:3.0" build-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -build-r8 = "com.android.tools:r8:c765114c30df8ed3e5d1a84868d3ed1037549e85" build-semver = "com.vdurmont:semver4j:3.1.0" build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin:3.14.0" build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.22.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index 2f5cbd1c..3fe7ed2d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -52,12 +52,6 @@ pluginManagement { includeModule("com.jraska.module.graph.assertion", "plugin") } } - exclusiveContent { - forRepository { - maven("https://storage.googleapis.com/r8-releases/raw/main") { name = "R8 mainline" } - } - filter { includeModule("com.android.tools", "r8") } - } includeBuild("build-logic") mavenCentral() maven("https://oss.sonatype.org/content/repositories/snapshots/") {