From 786ee94a9ee5c1990b5f8333e0a3cddddba58be6 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 7 Jul 2022 14:28:45 +0530 Subject: Switch to R8 dev releases (#1986) --- settings.gradle.kts | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'settings.gradle.kts') 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() } } -- cgit v1.2.3