Skip to content

Commit 9b04fee

Browse files
jpbarbaudjpbarbaud
authored
Merge pull request #363 from Spendesk/chore/clean_dependencies
build(gradle) Clean version catalog
2 parents d0fdab6 + e6614fd commit 9b04fee

File tree

4 files changed

+77
-75
lines changed

4 files changed

+77
-75
lines changed

‎gradle/libs.versions.toml

+65-63
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,93 @@
11
[versions]
22
grapes-version = '1.22.0'
3+
androidGradlePlugin = "8.3.2"
4+
5+
# [ANDROID]
6+
androidCompileSdk = "34"
37
androidMinSdk = "23"
48
androidTargetSdk = "34"
5-
androidCompileSdk = "34"
69

7-
kotlin = "1.9.21"
8-
gradle = "8.3.2"
9-
firebase-app-distrib = "4.0.1"
10-
ksp = "1.9.21-1.0.16"
10+
# [PLUGINS]
11+
12+
## Firebase
13+
firebaseAppdistributionPlugin = "4.0.1"
14+
15+
# [LIBRARIES]
1116
detekt = "1.23.6"
1217
detektFormatting = "1.23.6"
18+
glide = "4.16.0"
1319

14-
# Dagger
15-
hilt = "2.50"
16-
17-
# Androidx
18-
androidx-lifecycle-ktx = "2.6.2"
19-
androidx-fragment-ktx = "1.6.2"
20-
androidx-core-ktx = "1.12.0"
21-
androidx-constraintlayout = "2.1.4"
22-
androidx-appcompat = "1.6.1"
23-
android-material-version = '1.9.0'
24-
androidx-test-junit = "1.1.5"
20+
## AndroidX
21+
androidxAppcompat = "1.6.1"
22+
androidxComposeBom = "2024.02.00"
23+
androidxComposeCompiler = "1.5.7"
24+
androidxConstraintlayout = "2.1.4"
25+
androidxCore = "1.12.0"
26+
androidxEspresso = "3.5.1"
27+
androidxFragment = "1.6.2"
28+
androidxLifecycle = "2.7.0"
29+
androidxTestJunit = "1.1.5"
2530

26-
# Compose
27-
compose-bom = "2024.02.00"
28-
compose-kotlin-compiler = "1.5.7"
31+
## Google
32+
hilt = "2.50"
33+
ksp = "1.9.21-1.0.16"
34+
material = '1.11.0'
2935

30-
# Image
31-
glide = "4.16.0"
36+
## Jetbrains
37+
kotlin = "1.9.21"
3238

33-
# Tests
39+
## Tests
3440
junit4 = "4.13.2"
35-
espresso-core = "3.5.1"
3641

3742
[libraries]
38-
# Androidx
39-
androidx-lifecycle-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-ktx" }
40-
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
41-
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" }
42-
material = { group = "com.google.android.material", name = "material", version.ref = "android-material-version" }
43-
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
44-
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment-ktx" }
45-
46-
# Hilt
47-
hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
48-
hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
4943

50-
# Compose
51-
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
52-
compose-ui = { group = "androidx.compose.ui", name = "ui" }
53-
compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
54-
compose-ui-util = { module = "androidx.compose.ui:ui-util" }
55-
compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
56-
compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
57-
compose-material = { group = "androidx.compose.material", name = "material" }
58-
compose-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core" }
59-
compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
60-
compose-material3 = { group = "androidx.compose.material3", name = "material3" }
61-
compose-tests-ui = { group = "androidx.compose.ui", name = "ui-test-junit4" }
62-
63-
# Image
64-
glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
65-
glide-compiler = { group = "com.github.bumptech.glide", name = "ksp", version.ref = "glide" }
44+
# [ANDROIDX]
45+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppcompat" }
46+
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
47+
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
48+
androidx-compose-material = { group = "androidx.compose.material", name = "material" }
49+
androidx-compose-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core" }
50+
androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
51+
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
52+
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
53+
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
54+
androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }
55+
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
56+
androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" }
57+
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintlayout" }
58+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
59+
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" }
60+
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidxFragment" }
61+
androidx-lifecycle-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
62+
androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxTestJunit" }
6663

67-
# Misc
68-
reflection = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
64+
# [GOOGLE]
65+
google-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
66+
hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
67+
hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
6968

70-
# Tests
69+
# [TESTS]
7170
junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
72-
junit-android = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" }
73-
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
7471

75-
# Detekt
72+
# [TOOLS]
73+
kotlinx-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
74+
75+
# [OTHERS]
7676
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detektFormatting" }
77+
glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
78+
glide-compiler = { group = "com.github.bumptech.glide", name = "ksp", version.ref = "glide" }
7779

7880
[bundles]
79-
compose = ["compose-ui", "compose-ui-tooling", "compose-ui-util", "compose-runtime", "compose-foundation", "compose-material", "compose-material-icons-core", "compose-material-icons-extended", "compose-material3"]
81+
androidxcompose = ["androidx-compose-ui", "androidx-compose-ui-tooling", "androidx-compose-ui-util", "androidx-compose-runtime", "androidx-compose-foundation", "androidx-compose-material", "androidx-compose-material-icons-core", "androidx-compose-material-icons-extended", "androidx-compose-material3"]
8082

8183
[plugins]
82-
android-application = { id = "com.android.application", version.ref = "gradle" }
83-
android-library = { id = "com.android.library", version.ref = "gradle" }
84+
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
85+
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
86+
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
87+
firebase-appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppdistributionPlugin" }
88+
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
8489
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
85-
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
8690
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
91+
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
8792
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
88-
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
89-
firebase-appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebase-app-distrib" }
9093
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
91-
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }

‎library-compose/build.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
composeOptions {
27-
kotlinCompilerExtensionVersion = grapesLibs.versions.compose.kotlin.compiler.get()
27+
kotlinCompilerExtensionVersion = grapesLibs.versions.androidxComposeCompiler.get()
2828
}
2929

3030
compileOptions {
@@ -81,17 +81,17 @@ tasks.withType<DetektCreateBaselineTask>().configureEach {
8181

8282
dependencies {
8383
testImplementation(grapesLibs.junit4)
84-
androidTestImplementation(grapesLibs.junit.android)
85-
androidTestImplementation(grapesLibs.espresso.core)
84+
androidTestImplementation(grapesLibs.androidx.test.junit)
85+
androidTestImplementation(grapesLibs.androidx.espresso.core)
8686

8787
api(grapesLibs.androidx.lifecycle.ktx)
8888

8989
// Compose
90-
api(platform(grapesLibs.compose.bom))
91-
api(grapesLibs.bundles.compose)
90+
api(platform(grapesLibs.androidx.compose.bom))
91+
api(grapesLibs.bundles.androidxcompose)
9292

9393
// UI Tests
94-
androidTestImplementation(grapesLibs.compose.tests.ui)
94+
androidTestImplementation(grapesLibs.androidx.compose.ui.test)
9595
}
9696

9797
afterEvaluate {

‎library/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ dependencies {
5353

5454
implementation(grapesLibs.androidx.core.ktx)
5555
implementation(grapesLibs.androidx.appcompat)
56-
implementation(grapesLibs.material)
56+
implementation(grapesLibs.google.material)
5757
implementation(grapesLibs.androidx.constraintlayout)
5858

5959
implementation(grapesLibs.glide)

‎sample/build.gradle.kts

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
}
3939

4040
composeOptions {
41-
kotlinCompilerExtensionVersion = grapesLibs.versions.compose.kotlin.compiler.get()
41+
kotlinCompilerExtensionVersion = grapesLibs.versions.androidxComposeCompiler.get()
4242
}
4343

4444
signingConfigs {
@@ -91,17 +91,17 @@ dependencies {
9191
implementation(grapesLibs.androidx.core.ktx)
9292
implementation(grapesLibs.androidx.fragment.ktx)
9393

94-
implementation(grapesLibs.material)
94+
implementation(grapesLibs.google.material)
9595

9696
// JUNIT
9797
testImplementation(grapesLibs.junit4)
98-
androidTestImplementation(grapesLibs.junit.android)
99-
androidTestImplementation(grapesLibs.espresso.core)
98+
androidTestImplementation(grapesLibs.androidx.test.junit)
99+
androidTestImplementation(grapesLibs.androidx.espresso.core)
100100

101101
// HILT
102102
implementation(grapesLibs.hilt.android)
103103
ksp(grapesLibs.hilt.compiler)
104104

105105
// REFLECTION
106-
implementation(grapesLibs.reflection)
106+
implementation(grapesLibs.kotlinx.reflect)
107107
}

0 commit comments

Comments
 (0)