Skip to content

Commit 8a5836d

Browse files
authored
Merge pull request #20 from jarroyoesp/feature/update-deps
Task: Update Kotlin Multiplatform to 1.7.3 and deps
2 parents 106cb27 + 9e4641f commit 8a5836d

File tree

9 files changed

+3222
-3348
lines changed

9 files changed

+3222
-3348
lines changed

app/versions/dependencies/debugAndroidTestRuntimeClasspathDependencies.txt

Lines changed: 271 additions & 265 deletions
Large diffs are not rendered by default.

app/versions/dependencies/debugRuntimeClasspathDependencies.txt

Lines changed: 757 additions & 787 deletions
Large diffs are not rendered by default.

app/versions/dependencies/debugUnitTestRuntimeClasspathDependencies.txt

Lines changed: 741 additions & 771 deletions
Large diffs are not rendered by default.

app/versions/dependencies/releaseRuntimeClasspathDependencies.txt

Lines changed: 721 additions & 751 deletions
Large diffs are not rendered by default.

app/versions/dependencies/releaseUnitTestRuntimeClasspathDependencies.txt

Lines changed: 705 additions & 735 deletions
Large diffs are not rendered by default.
-38.1 KB
Binary file not shown.

gradle/libs.versions.toml

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,48 @@
22
# https://docs.gradle.org/current/userguide/platforms.html
33

44
[versions]
5-
aboutlibraries = "11.2.3"
6-
accompanist = "0.36.0"
5+
aboutlibraries = "11.4.0"
6+
accompanist = "0.37.0"
77
agp = "8.1.4"
88
androidCompileSdk = "34"
9-
androidx-compose = "1.7.5"
10-
androidx-datastore = "1.1.1"
9+
androidx-compose = "1.7.6"
10+
androidx-datastore = "1.1.2"
1111
androidx-lifecycle = "2.8.7"
12-
androidx-navigation = "2.8.4"
12+
androidx-navigation = "2.8.5"
1313
androidx-room = "2.6.1"
1414
apollo = "4.1.0"
15-
coil3 = "3.0.3"
16-
coroutines = "1.9.0"
15+
coil3 = "3.0.4"
16+
coroutines = "1.10.1"
1717
detekt = "1.23.7"
1818
diktat = "1.2.5"
1919
gradle = "8.1.1"
2020
greclipse = "4.19.0"
21-
hilt = "2.52"
22-
jetbrains-lifecycle = "2.8.3"
21+
hilt = "2.55"
22+
jetbrains-lifecycle = "2.8.4"
2323
jetbrains-navigation = "2.8.0-alpha10"
2424
junit = "1.2.1"
2525
koin = "4.0.0"
2626
koin-ksp = "1.4.0"
27-
kotlin = "2.0.21"
27+
kotlin = "2.1.0"
2828
kotlinpoet = "1.18.1"
2929
kotlin-multiplatform = "1.7.1"
30-
kotlin-result = "2.0.0"
30+
kotlin-result = "2.0.1"
3131
kotlinx-datetime="0.6.0"
32-
ksp = "2.0.21-1.0.26"
32+
ksp = "2.1.0-1.0.29"
3333
ktlint = "0.43.0"
34-
ktor = "3.0.0"
35-
mockk = "1.13.13"
34+
ktor = "3.0.1"
35+
mockk = "1.13.16"
3636
okhttp = "4.12.0"
3737
prettier = "2.7.1"
3838
sqlDelight = "2.0.2"
3939

4040
[libraries]
4141
aboutlibraries = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutlibraries" }
4242
aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "aboutlibraries" }
43-
accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
44-
accompanist-insets-ui = { module = "com.google.accompanist:accompanist-insets-ui", version.ref = "accompanist" }
45-
accompanist-navigation-material = { module = "com.google.accompanist:accompanist-navigation-material", version.ref = "accompanist" }
46-
accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" }
47-
accompanist-pager-indicators = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "accompanist" }
43+
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
4844
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
49-
accompanist-placeholder = { module = "com.google.accompanist:accompanist-placeholder-material", version.ref = "accompanist" }
50-
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
5145
android-maps-utils = { module = "com.google.maps.android:android-maps-utils", version = "3.9.0" }
52-
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.3" }
46+
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.10.0" }
5347
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
5448
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }
5549
androidx-compose-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose" }
@@ -79,7 +73,7 @@ androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecy
7973
androidx-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "jetbrains-navigation" }
8074
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
8175
androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }
82-
androidx-paging = { module = "androidx.paging:paging-compose", version = "3.3.4" }
76+
androidx-paging = { module = "androidx.paging:paging-compose", version = "3.3.5" }
8377
androidx-palette = { module = "androidx.palette:palette", version = "1.0.0" }
8478
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
8579
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidx-room" }
@@ -109,7 +103,7 @@ coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-androi
109103
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
110104
coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
111105
coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
112-
desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.3" }
106+
desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.4" }
113107
detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
114108
detekt-rules-compose = { module = "ru.kode:detekt-rules-compose", version = "1.4.0" }
115109
detekt-twitter-compose-rules = { module = "com.twitter.compose.rules:detekt", version = "0.0.26" }
@@ -125,7 +119,7 @@ koin-compose-viewmodel = {module = "io.insert-koin:koin-compose-viewmodel", vers
125119
koin-compiler = {module = "io.insert-koin:koin-ksp-compiler", version = "koin-ksp"}
126120
koin-compose = {module = "io.insert-koin:koin-compose", version = "koin"}
127121
koin-core = {module = "io.insert-koin:koin-core", version.ref = "koin"}
128-
konfetti = { module = "nl.dionsegijn:konfetti-compose", version = "2.0.4" }
122+
konfetti = { module = "nl.dionsegijn:konfetti-compose", version = "2.0.5" }
129123
kotlin-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
130124
kotlin-extensions = { module = "org.jetbrains.kotlin:kotlin-android-extensions", version.ref = "kotlin" }
131125
kotlin-result = { module = "com.michael-bull.kotlin-result:kotlin-result", version.ref = "kotlin-result" }
@@ -136,7 +130,7 @@ kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version
136130
kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
137131
kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" }
138132
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.8" }
139-
kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.7.3" }
133+
kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.8.0" }
140134
ksp-symbol-processing-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
141135
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
142136
ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" }
@@ -145,9 +139,9 @@ ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
145139
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
146140
ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
147141
leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version = "2.14" }
148-
lottie-compose = { module = "com.airbnb.android:lottie-compose", version = "6.5.2" }
142+
lottie-compose = { module = "com.airbnb.android:lottie-compose", version = "6.6.2" }
149143
maps = { module = "com.google.maps.android:maps-ktx", version = "5.1.1" }
150-
maps-compose = { module = "com.google.maps.android:maps-compose", version = "6.1.2" }
144+
maps-compose = { module = "com.google.maps.android:maps-compose", version = "6.4.1" }
151145
maps-utils-ktx = { module = "com.google.maps.android:maps-utils-ktx", version = "5.1.1" }
152146
material = { module = "com.google.android.material:material", version = "1.12.0" }
153147
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
@@ -159,7 +153,7 @@ okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version
159153
play-core-ktx = { module = "com.google.android.play:core-ktx", version = "1.8.1" }
160154
play-services-maps = { module = "com.google.android.gms:play-services-maps", version = "19.0.0" }
161155
process-phoenix = { module = "com.jakewharton:process-phoenix", version = "3.0.0" }
162-
robolectric = { module = "org.robolectric:robolectric", version = "4.13" }
156+
robolectric = { module = "org.robolectric:robolectric", version = "4.14.1" }
163157
seismic = { module = "com.squareup:seismic", version = "1.0.3" }
164158
speeddial = { module = "com.leinardi.android:speed-dial.compose", version = "2.0.0-alpha01" }
165159
sqldelight-androidDriver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqlDelight" }
@@ -168,11 +162,11 @@ sqldelight-nativeDriver = { module = "app.cash.sqldelight:native-driver", versio
168162
sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqlDelight" }
169163
sqldelight-webDriver = { module = "app.cash.sqldelight:web-worker-driver", version.ref = "sqlDelight" }
170164
timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
171-
tink = { module = "com.google.crypto.tink:tink-android", version = "1.15.0" }
165+
tink = { module = "com.google.crypto.tink:tink-android", version = "1.16.0" }
172166

173167
# plugins
174168
plugin-aboutlibraries = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlibraries" }
175-
plugin-android-gradle = { module = "com.android.tools.build:gradle", version = "8.7.2" }
169+
plugin-android-gradle = { module = "com.android.tools.build:gradle", version = "8.8.0" }
176170
plugin-androidcachefix = { module = "gradle.plugin.org.gradle.android:android-cache-fix-gradle-plugin", version = "3.0" }
177171
plugin-androidx-navigation-safeargs = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "androidx-navigation" }
178172
plugin-appversioning = { module = "io.github.reactivecircus.appversioning:app-versioning-gradle-plugin", version = "1.3.2" }
@@ -199,5 +193,5 @@ kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", vers
199193
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
200194
multiplatform = { id = "org.jetbrains.compose", version.ref = "kotlin-multiplatform" }
201195
sqldelight = { id = "app.cash.sqldelight", version = "2.0.1" }
202-
tripletplay = { id = "com.github.triplet.play", version = "3.11.0" }
196+
tripletplay = { id = "com.github.triplet.play", version = "3.12.1" }
203197
com-android-application = { id = "com.android.application", version.ref = "agp" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Oct 13 15:47:24 CEST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

modules/library-ui/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ android {
3434

3535
dependencies {
3636
implementation (projects.modules.libraryNavigationApi)
37-
api (libs.accompanist.flowlayout)
38-
api (libs.accompanist.navigation.material)
39-
api (libs.accompanist.pager)
40-
api (libs.accompanist.pager.indicators)
41-
api (libs.accompanist.placeholder)
42-
api (libs.accompanist.systemuicontroller)
4337
api (libs.androidx.appcompat)
4438
api (libs.androidx.compose.material) // Still needed for stuff missing in M3, like ModalBottomSheetLayout
4539
api (libs.androidx.compose.material3)

0 commit comments

Comments
 (0)