Skip to content

Commit aaa8b88

Browse files
LennoardLennoard
committed
refactor: update dependencies and streamline build configuration
(cherry picked from commit f1ef4e1)
1 parent 56db030 commit aaa8b88

File tree

4 files changed

+54
-59
lines changed

4 files changed

+54
-59
lines changed

‎app/build.gradle.kts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,20 @@ dependencies {
108108
implementation(libs.kotlin.stdlib)
109109
implementation(libs.kotlinx.coroutines.android)
110110

111+
implementation(libs.androidx.appcompat)
111112
implementation(libs.androidx.activity.compose)
112113
implementation(libs.androidx.core.ktx)
113114
implementation(libs.androidx.core.splashscreen)
114-
implementation(libs.androidx.appcompat)
115-
implementation(libs.androidx.material)
116115
implementation(libs.androidx.glance.appwidget)
116+
implementation(libs.androidx.multidex)
117117
implementation(libs.androidx.navigation.compose)
118118
implementation(libs.androidx.window)
119119
implementation(libs.androidx.work.runtime.ktx)
120-
implementation(libs.androidx.multidex)
121120

122121
// Lifecycle
123122
implementation(libs.androidx.lifecycle.runtime.ktx)
124123
implementation(libs.androidx.lifecycle.runtime.compose)
125124
implementation(libs.androidx.lifecycle.viewmodel.ktx)
126-
implementation(libs.androidx.lifecycle.viewmodel.navigation3)
127125
implementation(libs.androidx.lifecycle.viewmodel.compose)
128126
implementation(libs.androidx.lifecycle.viewmodel.savedstate)
129127
//ksp(libs.androidx.lifecycle.compiler)

‎common/design/build.gradle.kts‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,22 @@ dependencies {
4545
implementation(libs.androidx.core.splashscreen)
4646

4747
api(platform(libs.androidx.compose.bom))
48-
api(libs.androidx.ui)
49-
api(libs.androidx.ui.graphics)
50-
api(libs.androidx.ui.tooling.preview)
51-
api(libs.androidx.material3)
48+
api(libs.androidx.compose.ui)
49+
api(libs.androidx.compose.ui.graphics)
50+
api(libs.androidx.compose.ui.tooling.preview)
51+
api(libs.androidx.compose.material3)
5252
api(libs.androidx.material.icons.core)
5353
api(libs.androidx.window)
5454

5555
api(libs.material)
5656

5757
androidTestApi(platform(libs.androidx.compose.bom))
58-
debugApi(libs.androidx.ui.tooling)
59-
debugApi(libs.androidx.ui.test.manifest)
60-
}
6158

59+
if (AppConfig.devCycle) {
60+
api(libs.androidx.compose.ui.tooling)
61+
api(libs.androidx.ui.test.manifest)
62+
} else {
63+
debugApi(libs.androidx.compose.ui.tooling)
64+
debugApi(libs.androidx.ui.test.manifest)
65+
}
66+
}

‎common/utils/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@ dependencies {
4040
implementation(libs.androidx.lifecycle.viewmodel.savedstate)
4141

4242
testImplementation(libs.junit)
43-
androidTestImplementation(libs.androidx.junit)
4443
}

‎gradle/libs.versions.toml‎

Lines changed: 40 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,72 @@
11
[versions]
2+
activityCompose = "1.11.0"
23
agp = "8.12.0"
4+
appcompat = "1.7.1"
5+
composeBom = "2025.09.00"
6+
composeMaterial3 = "1.5.0-alpha04"
7+
coreKtx = "1.17.0"
38
coreSplashscreen = "1.0.1"
4-
composeMaterial = "1.8.3"
5-
libsu = "6.0.0"
6-
jsoup = "1.21.1"
9+
glanceAppwidget = "1.1.1"
10+
jsoup = "1.21.2"
11+
junit = "4.13.2"
12+
koin = "4.1.1"
713
kotlin = "2.2.0"
814
kotlinxCoroutinesAndroid = "1.10.2"
15+
kotlinxSerializationCore = "1.9.0"
916
ksp = "2.2.0-2.0.2"
10-
coreKtx = "1.16.0"
11-
junit = "4.13.2"
12-
junitVersion = "1.3.0"
13-
ktor = "3.2.3"
14-
lifecycle = "2.9.2"
15-
activityCompose = "1.10.1"
16-
composeBom = "2025.07.00"
17-
appcompat = "1.7.1"
17+
ktor = "3.3.0"
18+
libsu = "6.0.0"
19+
lifecycle = "2.9.4"
20+
material = "1.13.0"
1821
materialIconsCoreCompose = "1.7.8"
19-
material = "1.12.0"
2022
mockkAndroid = "1.14.5"
2123
multidex = "2.0.1"
22-
navigationCompose = "2.9.3"
24+
navigationCompose = "2.9.4"
2325
preference = "1.2.1"
24-
room = "2.7.2"
25-
nav3Lifecycle = "1.0.0-alpha03"
26-
material3 = "1.5.0-alpha01"
27-
kotlinxSerializationCore = "1.9.0"
28-
koin = "4.1.0"
26+
room = "2.8.0"
2927
window = "1.4.0"
30-
workRuntimeKtx = "2.10.3"
31-
glanceAppwidget = "1.1.1"
28+
workRuntimeKtx = "2.10.4"
3229

3330
[libraries]
31+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
32+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
33+
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
34+
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "composeMaterial3" }
35+
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
36+
androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
37+
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
38+
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
3439
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
3540
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
36-
androidx-material = { module = "androidx.compose.material:material", version.ref = "composeMaterial" }
41+
androidx-glance-appwidget = { group = "androidx.glance", name = "glance-appwidget", version.ref = "glanceAppwidget" }
42+
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" }
43+
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
44+
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
45+
androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
46+
androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "lifecycle" }
3747
androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCoreCompose" }
3848
androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
3949
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
4050
androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" }
51+
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
52+
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
53+
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
54+
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
4155
androidx-window = { module = "androidx.window:window", version.ref = "window" }
4256
androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
43-
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesAndroid" }
44-
libsu-core = { module = "com.github.topjohnwu.libsu:core", version.ref = "libsu" }
45-
libsu-nio = { module = "com.github.topjohnwu.libsu:nio", version.ref = "libsu" }
4657
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
4758
junit = { group = "junit", name = "junit", version.ref = "junit" }
48-
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
49-
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
50-
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" }
51-
androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
52-
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
53-
androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "nav3Lifecycle" }
54-
androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "lifecycle" }
55-
androidx-lifecycle-compiler = { group = "androidx.lifecycle", name = "lifecycle-compiler", version.ref = "lifecycle" }
56-
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
57-
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
58-
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
59-
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
60-
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
61-
androidx-glance-appwidget = { group = "androidx.glance", name = "glance-appwidget", version.ref = "glanceAppwidget" }
62-
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
63-
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
64-
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
65-
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
66-
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
67-
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
68-
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
59+
koin = { module = "io.insert-koin:koin-android", version.ref = "koin" }
60+
koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
6961
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
7062
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
63+
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesAndroid" }
7164
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationCore" }
72-
koin = { module = "io.insert-koin:koin-android", version.ref = "koin" }
73-
koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
7465
ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" }
7566
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
7667
ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
68+
libsu-core = { module = "com.github.topjohnwu.libsu:core", version.ref = "libsu" }
69+
libsu-nio = { module = "com.github.topjohnwu.libsu:nio", version.ref = "libsu" }
7770
material = { module = "com.google.android.material:material", version.ref = "material" }
7871
mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockkAndroid" }
7972

0 commit comments

Comments
 (0)