diff --git a/settings.gradle.kts b/settings.gradle.kts index 898bbf6c..bdf6efb3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,6 +9,13 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { mavenCentral() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } } } diff --git a/tools/r8.jar b/tools/r8.jar deleted file mode 100644 index d4ac9a5b..00000000 Binary files a/tools/r8.jar and /dev/null differ diff --git a/vgo/build.gradle.kts b/vgo/build.gradle.kts index 71f4bf12..8f050faf 100644 --- a/vgo/build.gradle.kts +++ b/vgo/build.gradle.kts @@ -15,6 +15,8 @@ sourceSets { } } +val r8: Configuration by configurations.creating + dependencies { implementation(project(":vgo-core")) @@ -22,6 +24,8 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + + r8("com.android.tools:r8:8.3.37") } tasks { @@ -112,7 +116,7 @@ tasks { val javaHome = System.getProperty("java.home") - classpath("$rootDir/tools/r8.jar") + classpath(r8) mainClass = "com.android.tools.r8.R8" args(