Skip to content

Commit 2201f2f

Browse files
jpbarbaudjpbarbaud
committed
Rename libraries names
1 parent d40c6ce commit 2201f2f

File tree

4 files changed

+37
-35
lines changed

4 files changed

+37
-35
lines changed

‎gradle/libs.versions.toml

+27-25
Original file line numberDiff line numberDiff line change
@@ -45,48 +45,50 @@ glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "gl
4545
glide-compiler = { group = "com.github.bumptech.glide", name = "ksp", version.ref = "glide" }
4646

4747
# [ANDROIDX]
48-
androidx-lifecycle-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
49-
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
5048
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppcompat" }
49+
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
50+
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
51+
androidx-compose-material = { group = "androidx.compose.material", name = "material" }
52+
androidx-compose-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core" }
53+
androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
54+
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
55+
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
56+
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
57+
androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }
58+
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
59+
androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" }
5160
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintlayout" }
61+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
62+
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" }
5263
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidxFragment" }
53-
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
54-
compose-ui = { group = "androidx.compose.ui", name = "ui" }
55-
compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
56-
compose-ui-util = { module = "androidx.compose.ui:ui-util" }
57-
compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
58-
compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
59-
compose-material = { group = "androidx.compose.material", name = "material" }
60-
compose-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core" }
61-
compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
62-
compose-material3 = { group = "androidx.compose.material3", name = "material3" }
63-
compose-tests-ui = { group = "androidx.compose.ui", name = "ui-test-junit4" }
64-
junit-android = { group = "androidx.test.ext", name = "junit", version.ref = "androidxTestJunit" }
65-
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" }
64+
androidx-lifecycle-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
65+
androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxTestJunit" }
6666

6767
# [GOOGLE]
68-
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
68+
google-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
6969
hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
7070
hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
7171

72-
# [TOOLS]
73-
reflection = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
74-
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detektFormatting" }
75-
7672
# [TESTS]
7773
junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
7874

75+
# [TOOLS]
76+
kotlinx-reflection = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
77+
78+
# [OTHERS]
79+
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detektFormatting" }
80+
7981
[bundles]
80-
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"]
82+
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"]
8183

8284
[plugins]
8385
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
8486
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
87+
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
88+
firebase-appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppdistributionPlugin" }
89+
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
8590
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
86-
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
8791
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
92+
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
8893
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
89-
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
90-
firebase-appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppdistributionPlugin" }
9194
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
92-
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }

‎library-compose/build.gradle.kts

+5-5
Original file line numberDiff line numberDiff line change
@@ -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

+4-4
Original file line numberDiff line numberDiff line change
@@ -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.reflection)
107107
}

0 commit comments

Comments
 (0)