Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 600e208

Browse files
committed
refactor(build): simplify repository declarations
1 parent 262c50e commit 600e208

File tree

2 files changed

+8
-119
lines changed

2 files changed

+8
-119
lines changed

build-logic/settings.gradle.kts

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,11 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
1010

1111
dependencyResolutionManagement {
1212
repositories {
13-
exclusiveContent {
14-
forRepository { google() }
15-
filter {
13+
google {
14+
content {
1615
includeGroup("androidx.databinding")
17-
includeGroup("com.android")
18-
includeGroup("com.android.tools.analytics-library")
19-
includeGroup("com.android.tools.build")
20-
includeGroup("com.android.tools.build.jetifier")
21-
includeGroup("com.android.databinding")
22-
includeGroup("com.android.tools.ddms")
23-
includeGroup("com.android.tools.layoutlib")
24-
includeGroup("com.android.tools.lint")
25-
includeGroup("com.android.tools.utp")
16+
includeGroupByRegex("com.android.*")
2617
includeGroup("com.google.testing.platform")
27-
includeModule("com.android.tools", "annotations")
28-
includeModule("com.android.tools", "common")
29-
includeModule("com.android.tools", "desugar_jdk_libs")
30-
includeModule("com.android.tools", "desugar_jdk_libs_configuration")
31-
includeModule("com.android.tools", "dvlib")
32-
includeModule("com.android.tools", "play-sdk-proto")
33-
includeModule("com.android.tools", "repository")
34-
includeModule("com.android.tools", "sdklib")
35-
includeModule("com.android.tools", "sdk-common")
36-
includeModule("com.android.tools.metalava", "metalava")
3718
}
3819
}
3920
exclusiveContent {

settings.gradle.kts

Lines changed: 5 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,11 @@ rootProject.name = "APS"
1010
pluginManagement {
1111
repositories {
1212
includeBuild("build-logic")
13-
exclusiveContent {
14-
forRepository { google() }
15-
filter {
13+
google {
14+
content {
1615
includeGroup("androidx.databinding")
17-
includeGroup("com.android")
18-
includeGroup("com.android.tools.analytics-library")
19-
includeGroup("com.android.tools.build")
20-
includeGroup("com.android.tools.build.jetifier")
21-
includeGroup("com.android.databinding")
22-
includeGroup("com.android.tools.ddms")
23-
includeGroup("com.android.tools.layoutlib")
24-
includeGroup("com.android.tools.lint")
25-
includeGroup("com.android.tools.utp")
16+
includeGroupByRegex("com.android.*")
2617
includeGroup("com.google.testing.platform")
27-
includeModule("com.android.tools", "annotations")
28-
includeModule("com.android.tools", "common")
29-
includeModule("com.android.tools", "desugar_jdk_libs")
30-
includeModule("com.android.tools", "desugar_jdk_libs_configuration")
31-
includeModule("com.android.tools", "dvlib")
32-
includeModule("com.android.tools", "play-sdk-proto")
33-
includeModule("com.android.tools", "repository")
34-
includeModule("com.android.tools", "sdklib")
35-
includeModule("com.android.tools", "sdk-common")
3618
}
3719
}
3820
exclusiveContent {
@@ -77,83 +59,9 @@ dependencyResolutionManagement {
7759
exclusiveContent {
7860
forRepository { google() }
7961
filter {
80-
includeGroup("androidx.activity")
81-
includeGroup("androidx.appcompat")
82-
includeGroup("androidx.annotation")
83-
includeGroup("androidx.arch.core")
84-
includeGroup("androidx.autofill")
85-
includeGroup("androidx.biometric")
86-
includeGroup("androidx.browser")
87-
includeGroup("androidx.cardview")
88-
includeGroup("androidx.collection")
89-
includeGroup("androidx.compose.animation")
90-
includeGroup("androidx.compose.compiler")
91-
includeGroup("androidx.compose.foundation")
92-
includeGroup("androidx.compose.material")
93-
includeGroup("androidx.compose.material3")
94-
includeGroup("androidx.compose.runtime")
95-
includeGroup("androidx.compose.ui")
96-
includeGroup("androidx.concurrent")
97-
includeGroup("androidx.constraintlayout")
98-
includeGroup("androidx.coordinatorlayout")
99-
includeGroup("androidx.core")
100-
includeGroup("androidx.cursoradapter")
101-
includeGroup("androidx.customview")
102-
includeGroup("androidx.databinding")
103-
includeGroup("androidx.documentfile")
104-
includeGroup("androidx.drawerlayout")
105-
includeGroup("androidx.dynamicanimation")
106-
includeGroup("androidx.emoji2")
107-
includeGroup("androidx.exifinterface")
108-
includeGroup("androidx.fragment")
109-
includeGroup("androidx.hilt")
110-
includeGroup("androidx.interpolator")
111-
includeGroup("androidx.legacy")
112-
includeGroup("androidx.lifecycle")
113-
includeGroup("androidx.loader")
114-
includeGroup("androidx.localbroadcastmanager")
115-
includeGroup("androidx.preference")
116-
includeGroup("androidx.print")
117-
includeGroup("androidx.privacysandbox.tools")
118-
includeGroup("androidx.profileinstaller")
119-
includeGroup("androidx.recyclerview")
120-
includeGroup("androidx.resourceinspection")
121-
includeGroup("androidx.room")
122-
includeGroup("androidx.savedstate")
123-
includeGroup("androidx.security")
124-
includeGroup("androidx.slidingpanelayout")
125-
includeGroup("androidx.startup")
126-
includeGroup("androidx.sqlite")
127-
includeGroup("androidx.swiperefreshlayout")
128-
includeGroup("androidx.test")
129-
includeGroup("androidx.test.espresso")
130-
includeGroup("androidx.tracing")
131-
includeGroup("androidx.transition")
132-
includeGroup("androidx.vectordrawable")
133-
includeGroup("androidx.versionedparcelable")
134-
includeGroup("androidx.viewpager")
135-
includeGroup("androidx.viewpager2")
136-
includeGroup("androidx.window")
137-
includeGroup("com.android")
138-
includeGroup("com.android.tools.analytics-library")
139-
includeGroup("com.android.tools.build")
140-
includeGroup("com.android.tools.ddms")
141-
includeGroup("com.android.tools.external.com-intellij")
142-
includeGroup("com.android.tools.external.org-jetbrains")
143-
includeGroup("com.android.tools.layoutlib")
144-
includeGroup("com.android.tools.lint")
62+
includeGroupByRegex("androidx.*")
63+
includeGroupByRegex("com.android.*")
14564
includeGroup("com.google.android.gms")
146-
includeModule("androidx.compose", "compose-bom")
147-
includeModule("com.android.tools", "annotations")
148-
includeModule("com.android.tools", "common")
149-
includeModule("com.android.tools", "desugar_jdk_libs")
150-
includeModule("com.android.tools", "desugar_jdk_libs_configuration")
151-
includeModule("com.android.tools", "dvlib")
152-
includeModule("com.android.tools", "play-sdk-proto")
153-
includeModule("com.android.tools", "repository")
154-
includeModule("com.android.tools", "sdklib")
155-
includeModule("com.android.tools", "sdk-common")
156-
includeModule("com.android.tools.metalava", "metalava")
15765
includeModule("com.google.android.material", "material")
15866
}
15967
}

0 commit comments

Comments
 (0)