Skip to content

Commit 3816aa7

Browse files
committed
refactor gradle
1 parent 8c5b33b commit 3816aa7

File tree

4 files changed

+2
-56
lines changed

4 files changed

+2
-56
lines changed

androidApp/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ kotlin {
4545

4646
// Koin Android
4747
implementation(libs.koin.android)
48-
implementation(libs.koin.androidx.compose)
4948
}
5049
}
5150
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradle/libs.versions.toml

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -20,43 +20,25 @@ android-target = "34"
2020
android-compile = "34"
2121
androidx-appcompat = "1.6.1"
2222
androidx-activity = "1.8.2"
23-
androidx-annotations = "1.7.1"
24-
androidx-compose-compiler = "1.5.8"
2523
androidx-core = "1.12.0"
26-
androidx-lifecycle = "2.7.0"
27-
androidx-fragment = "1.6.2"
28-
androidx-navigation = "2.7.6"
29-
androidx-savedstate = "1.2.1"
3024

3125
ktor = "2.3.8"
3226

3327
arrow-kt = "1.2.1"
3428
kamel-image = "0.8.3"
3529
napier = "2.7.1"
36-
uri = "0.0.16"
3730
flow-ext = "0.7.5"
38-
koin-androidx-compose = "3.5.3"
3931
koin-annotations = "1.3.1"
4032
koin-core = "3.5.3"
4133
koin-compose = "1.1.2"
42-
uuid = "0.8.2"
4334

4435
kmp-viewmodel = "0.6.2"
45-
khonshu = "0.20.0"
4636
solivagant = "0.0.1"
4737

48-
inject = "1"
49-
dagger = "2.50"
5038
ksp = "1.9.22-1.0.16"
5139

52-
junit = "4.13.2"
53-
truth = "1.2.0"
54-
turbine = "1.0.0"
55-
kotlin-compile-testing = "0.4.0"
56-
5740
[libraries]
5841
koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinVersion" }
59-
koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin-androidx-compose" }
6042
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
6143
kotlin-parcelize = { module = "org.jetbrains.kotlin:kotlin-parcelize-runtime", version.ref = "kotlin" }
6244
kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
@@ -75,29 +57,8 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
7557
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
7658

7759
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
78-
androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
7960
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
80-
androidx-annotations = { module = "androidx.annotation:annotation", version.ref = "androidx-annotations" }
81-
androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidx-compose-compiler" }
82-
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
83-
androidx-compose-runtime-saveable = { module = "androidx.compose.runtime:runtime-saveable" }
84-
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
85-
androidx-compose-animation = { module = "androidx.compose.animation:animation" }
8661
androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
87-
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
88-
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
89-
androidx-lifecycle-testing = { module = "androidx.lifecycle:lifecycle-runtime-testing", version.ref = "androidx-lifecycle" }
90-
androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
91-
androidx-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
92-
androidx-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
93-
androidx-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" }
94-
androidx-navigation-common = { module = "androidx.navigation:navigation-common", version.ref = "androidx-navigation" }
95-
androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidx-navigation" }
96-
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
97-
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "androidx-navigation" }
98-
androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidx-fragment" }
99-
androidx-savedstate = { module = "androidx.savedstate:savedstate", version.ref = "androidx-savedstate" }
100-
androidx-viewbinding = { module = "androidx.databinding:viewbinding", version.ref = "android-gradle" }
10162

10263
ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
10364
ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
@@ -113,31 +74,18 @@ arrow-fx-coroutines = { module = "io.arrow-kt:arrow-fx-coroutines", version.ref
11374
arrow-core = { module = "io.arrow-kt:arrow-core", version.ref = "arrow-kt" }
11475
kamel-image = { module = "media.kamel:kamel-image", version.ref = "kamel-image" }
11576
napier = { module = "io.github.aakira:napier", version.ref = "napier" }
116-
uri = { module = "com.eygraber:uri-kmp-android", version.ref = "uri" }
11777
flow-ext = { module = "io.github.hoc081098:FlowExt", version.ref = "flow-ext" }
11878
koin-annotations = { module = "io.insert-koin:koin-annotations", version.ref = "koin-annotations" }
11979
koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin-core" }
12080
koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin-compose" }
12181
koin-ksp-compiler = { module = "io.insert-koin:koin-ksp-compiler", version.ref = "koin-annotations" }
122-
uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
12382

12483
kmp-viewmodel = { module = "io.github.hoc081098:kmp-viewmodel", version.ref = "kmp-viewmodel" }
12584
kmp-viewmodel-savedstate = { module = "io.github.hoc081098:kmp-viewmodel-savedstate", version.ref = "kmp-viewmodel" }
12685
kmp-viewmodel-compose = { module = "io.github.hoc081098:kmp-viewmodel-compose", version.ref = "kmp-viewmodel" }
12786
kmp-viewmodel-koin-compose = { module = "io.github.hoc081098:kmp-viewmodel-koin-compose", version.ref = "kmp-viewmodel" }
128-
khonshu-navigation-compose = { module = "com.freeletics.khonshu:navigation-compose", version.ref = "khonshu" }
12987
solivagant-navigation = { module = "io.github.hoc081098:solivagant-navigation", version.ref = "solivagant" }
13088

131-
inject = { module = "javax.inject:javax.inject", version.ref = "inject" }
132-
dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
133-
dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
134-
135-
junit = { module = "junit:junit", version.ref = "junit" }
136-
truth = { module = "com.google.truth:truth", version.ref = "truth" }
137-
turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
138-
kotlin-compile-testing = { module = "dev.zacsweers.kctfork:core", version.ref = "kotlin-compile-testing" }
139-
kotlin-compile-testing-ksp = { module = "dev.zacsweers.kctfork:ksp", version.ref = "kotlin-compile-testing" }
140-
14189
[plugins]
14290
android-library = { id = "com.android.library", version.ref = "android-gradle" }
14391
android-app = { id = "com.android.application", version.ref = "android-gradle" }
@@ -151,6 +99,5 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
15199
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
152100

153101
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
154-
poko = { id = "dev.drewhamilton.poko", version = "0.15.2" }
155102
buildkonfig = { id = "com.codingfeline.buildkonfig", version = "0.15.1" }
156103
spotless = { id = "com.diffplug.gradle.spotless", version = "6.25.0" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)