From dfe108d13e30480bac9f50604dac45d8e68c24fd Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 25 May 2023 23:37:04 +0530 Subject: [PATCH] fix(deps): use an unreleased R8 build with verifier crash fix --- build-logic/settings.gradle.kts | 4 ++-- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 3d7425f3..b35e1750 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright © 2022 Harsh Shandilya. + * Copyright © 2022-2023 Harsh Shandilya. * Use of this source code is governed by an MIT-style * license that can be found in the LICENSE file or at * https://opensource.org/licenses/MIT. @@ -44,7 +44,7 @@ dependencyResolutionManagement { } } exclusiveContent { - forRepository { maven("https://storage.googleapis.com/r8-releases/raw") } + forRepository { maven("https://storage.googleapis.com/r8-releases/raw/main") } filter { includeModule("com.android.tools", "r8") } } mavenCentral() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2f6e47a3..94165434 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -48,7 +48,7 @@ androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version 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:2.7.1" build-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -build-r8 = "com.android.tools:r8:8.2.8-dev" +build-r8 = "com.android.tools:r8:b412982bd9e35e8784bd3b33d3497551b7cdbcd4" build-semver = "com.vdurmont:semver4j:3.1.0" build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin:3.7.0" build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.19.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index 76db08b5..240dafac 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -49,7 +49,7 @@ pluginManagement { filter { includeGroup("dev.msfjarvis.whetstone") } } exclusiveContent { - forRepository { maven("https://storage.googleapis.com/r8-releases/raw") } + forRepository { maven("https://storage.googleapis.com/r8-releases/raw/main") } filter { includeModule("com.android.tools", "r8") } } includeBuild("build-logic")