Skip to content

Commit 497c3f0

Browse files
JavernautJavernaut
committed
Unifying the dependencies naming
1 parent d74ab45 commit 497c3f0

File tree

3 files changed

+66
-56
lines changed

3 files changed

+66
-56
lines changed

‎app/build.gradle.kts

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
alias(libs.plugins.androidApplication)
3-
alias(libs.plugins.jetbrainsKotlinAndroid)
2+
alias(libs.plugins.android.application)
3+
alias(libs.plugins.kotlin.android)
44
alias(libs.plugins.detekt)
5-
alias(libs.plugins.googleKsp)
6-
alias(libs.plugins.hilt)
5+
alias(libs.plugins.google.ksp)
6+
alias(libs.plugins.google.hilt)
77
}
88

99
android {
@@ -129,25 +129,23 @@ dependencies {
129129
ksp(libs.dagger.hilt.compiler)
130130
implementation(libs.dagger.hilt.android)
131131

132-
implementation(platform(libs.androidx.compose.bom))
133-
implementation(libs.bundles.compose)
134-
135-
implementation(libs.mediafile)
136-
137-
implementation(libs.bundles.coroutines)
138-
139-
implementation(libs.material)
132+
implementation(libs.bundles.kotlinx.coroutines)
140133

141-
implementation(libs.bundles.lifecycle)
134+
implementation(platform(libs.androidx.compose.bom))
135+
implementation(libs.bundles.androidx.compose)
142136

137+
implementation(libs.bundles.androidx.lifecycle)
143138
implementation(libs.androidx.appcompat)
144-
implementation(libs.palette)
145-
implementation(libs.savedstate)
146-
implementation(libs.viewpager2)
147-
implementation(libs.browser)
148-
implementation(libs.window)
139+
implementation(libs.androidx.palette)
140+
implementation(libs.androidx.savedstate)
141+
implementation(libs.androidx.viewpager2)
142+
implementation(libs.androidx.browser)
143+
implementation(libs.androidx.window)
149144
implementation(libs.androidx.navigation.compose)
150145

146+
implementation(libs.mediafile)
147+
implementation(libs.material)
148+
151149
// TODO replace with own implementation
152150
implementation(libs.liveevent)
153151
}

‎build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
apply(from = "${rootDir}/scripts/read-arguments.gradle")
44

55
plugins {
6-
alias(libs.plugins.androidApplication) apply false
7-
alias(libs.plugins.jetbrainsKotlinAndroid) apply false
6+
alias(libs.plugins.android.application) apply false
7+
alias(libs.plugins.kotlin.android) apply false
88
alias(libs.plugins.detekt) apply false
9-
alias(libs.plugins.googleKsp) apply false
10-
alias(libs.plugins.hilt) apply false
9+
alias(libs.plugins.google.ksp) apply false
10+
alias(libs.plugins.google.hilt) apply false
1111
}

‎gradle/libs.versions.toml

Lines changed: 46 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
11
[versions]
2-
gradleplugin = "8.3.1"
3-
detektplugin = "1.23.5"
4-
kotlin = "1.9.23"
5-
ksp = "1.9.23-1.0.19"
6-
coroutines = "1.8.0"
7-
lifecycle = "2.7.0"
8-
window = "1.2.0"
9-
navigation = "2.7.7"
2+
androidGradlePlugin = "8.3.1"
103

11-
dagger = "2.51.1"
4+
kotlin = "1.9.23"
5+
kotlinx-coroutines = "1.8.0"
126

7+
androidx-lifecycle = "2.7.0"
8+
androidx-window = "1.2.0"
9+
androidx-navigation = "2.7.7"
1310
androidx-activity-compose = "1.8.2"
1411
androidx-compose-bom = "2024.03.00"
1512
androidx-compose-compiler = "1.5.11"
1613

17-
[libraries]
18-
mediafile = "io.github.javernaut:mediafile:1.1.0"
14+
google-ksp = "1.9.23-1.0.19"
15+
google-dagger = "2.51.1"
1916

20-
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
21-
coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
17+
detekt = "1.23.5"
2218

19+
[libraries]
20+
mediafile = "io.github.javernaut:mediafile:1.1.0"
2321
material = "com.google.android.material:material:1.11.0"
22+
liveevent = "com.github.hadilq.liveevent:liveevent:1.2.0"
2423

25-
lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
26-
lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
27-
lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "lifecycle" }
24+
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
25+
coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
2826

29-
window = { module = "androidx.window:window", version.ref = "window" }
27+
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
28+
androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" }
29+
androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" }
3030

31-
liveevent = "com.github.hadilq.liveevent:liveevent:1.2.0"
32-
palette = "androidx.palette:palette-ktx:1.0.0"
33-
savedstate = "androidx.savedstate:savedstate:1.2.1"
34-
viewpager2 = "androidx.viewpager2:viewpager2:1.0.0"
35-
browser = "androidx.browser:browser:1.8.0"
31+
androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }
32+
33+
androidx-palette = "androidx.palette:palette-ktx:1.0.0"
34+
androidx-savedstate = "androidx.savedstate:savedstate:1.2.1"
35+
androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.0.0"
36+
androidx-browser = "androidx.browser:browser:1.8.0"
3637
androidx-appcompat = "androidx.appcompat:appcompat:1.6.1"
3738

3839
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
@@ -47,20 +48,31 @@ androidx-compose-material = { module = "androidx.compose.material:material" }
4748
androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
4849
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
4950

50-
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
51+
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
5152

52-
dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
53-
dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" }
54-
dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }
53+
dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "google-dagger" }
54+
dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "google-dagger" }
55+
dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "google-dagger" }
5556

5657
[bundles]
57-
coroutines = ["coroutines-core", "coroutines-android"]
58-
lifecycle = ["lifecycle-viewmodel-ktx", "lifecycle-livedata-ktx", "lifecycle-viewmodel-savedstate"]
59-
compose = ["androidx-compose-runtime", "androidx-compose-ui", "androidx-compose-foundation", "androidx-compose-foundation-layout", "androidx-compose-material", "androidx-compose-material-icons-extended", "androidx-compose-runtime-livedata", "androidx-compose-ui-tooling", "androidx-activity-compose", "androidx-compose-material3"]
58+
kotlinx-coroutines = ["coroutines-core", "coroutines-android"]
59+
androidx-lifecycle = ["androidx-lifecycle-viewmodel-ktx", "androidx-lifecycle-livedata-ktx", "androidx-lifecycle-viewmodel-savedstate"]
60+
androidx-compose = [
61+
"androidx-compose-runtime",
62+
"androidx-compose-ui",
63+
"androidx-compose-foundation",
64+
"androidx-compose-foundation-layout",
65+
"androidx-compose-material",
66+
"androidx-compose-material-icons-extended",
67+
"androidx-compose-runtime-livedata",
68+
"androidx-compose-ui-tooling",
69+
"androidx-activity-compose",
70+
"androidx-compose-material3"
71+
]
6072

6173
[plugins]
62-
androidApplication = { id = "com.android.application", version.ref = "gradleplugin" }
63-
jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
64-
googleKsp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
65-
hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
66-
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektplugin" }
74+
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
75+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
76+
google-ksp = { id = "com.google.devtools.ksp", version.ref = "google-ksp" }
77+
google-hilt = { id = "com.google.dagger.hilt.android", version.ref = "google-dagger" }
78+
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }

0 commit comments

Comments
 (0)