diff options
| -rw-r--r-- | build-logic/settings.gradle.kts | 25 | ||||
| -rw-r--r-- | settings.gradle.kts | 102 |
2 files changed, 8 insertions, 119 deletions
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index da93ea61..02dd079d 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -10,30 +10,11 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" dependencyResolutionManagement { repositories { - exclusiveContent { - forRepository { google() } - filter { + google { + content { includeGroup("androidx.databinding") - includeGroup("com.android") - includeGroup("com.android.tools.analytics-library") - includeGroup("com.android.tools.build") - includeGroup("com.android.tools.build.jetifier") - includeGroup("com.android.databinding") - includeGroup("com.android.tools.ddms") - includeGroup("com.android.tools.layoutlib") - includeGroup("com.android.tools.lint") - includeGroup("com.android.tools.utp") + includeGroupByRegex("com.android.*") 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", "play-sdk-proto") - includeModule("com.android.tools", "repository") - includeModule("com.android.tools", "sdklib") - includeModule("com.android.tools", "sdk-common") - includeModule("com.android.tools.metalava", "metalava") } } exclusiveContent { diff --git a/settings.gradle.kts b/settings.gradle.kts index 1c24ddac..8f471d78 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,29 +10,11 @@ rootProject.name = "APS" pluginManagement { repositories { includeBuild("build-logic") - exclusiveContent { - forRepository { google() } - filter { + google { + content { includeGroup("androidx.databinding") - includeGroup("com.android") - includeGroup("com.android.tools.analytics-library") - includeGroup("com.android.tools.build") - includeGroup("com.android.tools.build.jetifier") - includeGroup("com.android.databinding") - includeGroup("com.android.tools.ddms") - includeGroup("com.android.tools.layoutlib") - includeGroup("com.android.tools.lint") - includeGroup("com.android.tools.utp") + includeGroupByRegex("com.android.*") 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", "play-sdk-proto") - includeModule("com.android.tools", "repository") - includeModule("com.android.tools", "sdklib") - includeModule("com.android.tools", "sdk-common") } } exclusiveContent { @@ -77,83 +59,9 @@ dependencyResolutionManagement { exclusiveContent { forRepository { google() } filter { - includeGroup("androidx.activity") - includeGroup("androidx.appcompat") - includeGroup("androidx.annotation") - includeGroup("androidx.arch.core") - includeGroup("androidx.autofill") - includeGroup("androidx.biometric") - includeGroup("androidx.browser") - includeGroup("androidx.cardview") - includeGroup("androidx.collection") - includeGroup("androidx.compose.animation") - includeGroup("androidx.compose.compiler") - includeGroup("androidx.compose.foundation") - includeGroup("androidx.compose.material") - includeGroup("androidx.compose.material3") - includeGroup("androidx.compose.runtime") - includeGroup("androidx.compose.ui") - includeGroup("androidx.concurrent") - includeGroup("androidx.constraintlayout") - includeGroup("androidx.coordinatorlayout") - includeGroup("androidx.core") - includeGroup("androidx.cursoradapter") - includeGroup("androidx.customview") - includeGroup("androidx.databinding") - includeGroup("androidx.documentfile") - includeGroup("androidx.drawerlayout") - includeGroup("androidx.dynamicanimation") - includeGroup("androidx.emoji2") - includeGroup("androidx.exifinterface") - includeGroup("androidx.fragment") - includeGroup("androidx.hilt") - includeGroup("androidx.interpolator") - includeGroup("androidx.legacy") - includeGroup("androidx.lifecycle") - includeGroup("androidx.loader") - includeGroup("androidx.localbroadcastmanager") - includeGroup("androidx.preference") - includeGroup("androidx.print") - includeGroup("androidx.privacysandbox.tools") - includeGroup("androidx.profileinstaller") - includeGroup("androidx.recyclerview") - includeGroup("androidx.resourceinspection") - includeGroup("androidx.room") - includeGroup("androidx.savedstate") - includeGroup("androidx.security") - includeGroup("androidx.slidingpanelayout") - includeGroup("androidx.startup") - includeGroup("androidx.sqlite") - includeGroup("androidx.swiperefreshlayout") - includeGroup("androidx.test") - includeGroup("androidx.test.espresso") - includeGroup("androidx.tracing") - includeGroup("androidx.transition") - includeGroup("androidx.vectordrawable") - includeGroup("androidx.versionedparcelable") - includeGroup("androidx.viewpager") - includeGroup("androidx.viewpager2") - includeGroup("androidx.window") - includeGroup("com.android") - includeGroup("com.android.tools.analytics-library") - includeGroup("com.android.tools.build") - includeGroup("com.android.tools.ddms") - includeGroup("com.android.tools.external.com-intellij") - includeGroup("com.android.tools.external.org-jetbrains") - includeGroup("com.android.tools.layoutlib") - includeGroup("com.android.tools.lint") + includeGroupByRegex("androidx.*") + includeGroupByRegex("com.android.*") includeGroup("com.google.android.gms") - includeModule("androidx.compose", "compose-bom") - 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", "play-sdk-proto") - includeModule("com.android.tools", "repository") - includeModule("com.android.tools", "sdklib") - includeModule("com.android.tools", "sdk-common") - includeModule("com.android.tools.metalava", "metalava") includeModule("com.google.android.material", "material") } } |