Skip to content

Task: Update Kotlin Multiplatform to 1.7.3 and deps #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jarroyoesp merged 1 commit into from
Jan 22, 2025
Merged

Task: Update Kotlin Multiplatform to 1.7.3 and deps #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
536 changes: 271 additions & 265 deletions app/versions/dependencies/debugAndroidTestRuntimeClasspathDependencies.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,544 changes: 757 additions & 787 deletions app/versions/dependencies/debugRuntimeClasspathDependencies.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,512 changes: 741 additions & 771 deletions app/versions/dependencies/debugUnitTestRuntimeClasspathDependencies.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,472 changes: 721 additions & 751 deletions app/versions/dependencies/releaseRuntimeClasspathDependencies.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,440 changes: 705 additions & 735 deletions app/versions/dependencies/releaseUnitTestRuntimeClasspathDependencies.txt
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified build-conventions/build/libs/build-conventions.jar
View file
Open in desktop
Binary file not shown.
58 changes: 26 additions & 32 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,48 @@
# https://docs.gradle.org/current/userguide/platforms.html

[versions]
aboutlibraries = "11.2.3"
accompanist = "0.36.0"
aboutlibraries = "11.4.0"
accompanist = "0.37.0"
agp = "8.1.4"
androidCompileSdk = "34"
androidx-compose = "1.7.5"
androidx-datastore = "1.1.1"
androidx-compose = "1.7.6"
androidx-datastore = "1.1.2"
androidx-lifecycle = "2.8.7"
androidx-navigation = "2.8.4"
androidx-navigation = "2.8.5"
androidx-room = "2.6.1"
apollo = "4.1.0"
coil3 = "3.0.3"
coroutines = "1.9.0"
coil3 = "3.0.4"
coroutines = "1.10.1"
detekt = "1.23.7"
diktat = "1.2.5"
gradle = "8.1.1"
greclipse = "4.19.0"
hilt = "2.52"
jetbrains-lifecycle = "2.8.3"
hilt = "2.55"
jetbrains-lifecycle = "2.8.4"
jetbrains-navigation = "2.8.0-alpha10"
junit = "1.2.1"
koin = "4.0.0"
koin-ksp = "1.4.0"
kotlin = "2.0.21"
kotlin = "2.1.0"
kotlinpoet = "1.18.1"
kotlin-multiplatform = "1.7.1"
kotlin-result = "2.0.0"
kotlin-result = "2.0.1"
kotlinx-datetime="0.6.0"
ksp = "2.0.21-1.0.26"
ksp = "2.1.0-1.0.29"
ktlint = "0.43.0"
ktor = "3.0.0"
mockk = "1.13.13"
ktor = "3.0.1"
mockk = "1.13.16"
okhttp = "4.12.0"
prettier = "2.7.1"
sqlDelight = "2.0.2"

[libraries]
aboutlibraries = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutlibraries" }
aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "aboutlibraries" }
accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
accompanist-insets-ui = { module = "com.google.accompanist:accompanist-insets-ui", version.ref = "accompanist" }
accompanist-navigation-material = { module = "com.google.accompanist:accompanist-navigation-material", version.ref = "accompanist" }
accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" }
accompanist-pager-indicators = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "accompanist" }
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
accompanist-placeholder = { module = "com.google.accompanist:accompanist-placeholder-material", version.ref = "accompanist" }
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
android-maps-utils = { module = "com.google.maps.android:android-maps-utils", version = "3.9.0" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.3" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.10.0" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }
androidx-compose-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose" }
Expand Down Expand Up @@ -79,7 +73,7 @@ androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecy
androidx-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "jetbrains-navigation" }
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }
androidx-paging = { module = "androidx.paging:paging-compose", version = "3.3.4" }
androidx-paging = { module = "androidx.paging:paging-compose", version = "3.3.5" }
androidx-palette = { module = "androidx.palette:palette", version = "1.0.0" }
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidx-room" }
Expand Down Expand Up @@ -109,7 +103,7 @@ coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-androi
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.3" }
desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.4" }
detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
detekt-rules-compose = { module = "ru.kode:detekt-rules-compose", version = "1.4.0" }
detekt-twitter-compose-rules = { module = "com.twitter.compose.rules:detekt", version = "0.0.26" }
Expand All @@ -125,7 +119,7 @@ koin-compose-viewmodel = {module = "io.insert-koin:koin-compose-viewmodel", vers
koin-compiler = {module = "io.insert-koin:koin-ksp-compiler", version = "koin-ksp"}
koin-compose = {module = "io.insert-koin:koin-compose", version = "koin"}
koin-core = {module = "io.insert-koin:koin-core", version.ref = "koin"}
konfetti = { module = "nl.dionsegijn:konfetti-compose", version = "2.0.4" }
konfetti = { module = "nl.dionsegijn:konfetti-compose", version = "2.0.5" }
kotlin-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
kotlin-extensions = { module = "org.jetbrains.kotlin:kotlin-android-extensions", version.ref = "kotlin" }
kotlin-result = { module = "com.michael-bull.kotlin-result:kotlin-result", version.ref = "kotlin-result" }
Expand All @@ -136,7 +130,7 @@ kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version
kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.8" }
kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.7.3" }
kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.8.0" }
ksp-symbol-processing-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" }
Expand All @@ -145,9 +139,9 @@ ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version = "2.14" }
lottie-compose = { module = "com.airbnb.android:lottie-compose", version = "6.5.2" }
lottie-compose = { module = "com.airbnb.android:lottie-compose", version = "6.6.2" }
maps = { module = "com.google.maps.android:maps-ktx", version = "5.1.1" }
maps-compose = { module = "com.google.maps.android:maps-compose", version = "6.1.2" }
maps-compose = { module = "com.google.maps.android:maps-compose", version = "6.4.1" }
maps-utils-ktx = { module = "com.google.maps.android:maps-utils-ktx", version = "5.1.1" }
material = { module = "com.google.android.material:material", version = "1.12.0" }
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
Expand All @@ -159,7 +153,7 @@ okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version
play-core-ktx = { module = "com.google.android.play:core-ktx", version = "1.8.1" }
play-services-maps = { module = "com.google.android.gms:play-services-maps", version = "19.0.0" }
process-phoenix = { module = "com.jakewharton:process-phoenix", version = "3.0.0" }
robolectric = { module = "org.robolectric:robolectric", version = "4.13" }
robolectric = { module = "org.robolectric:robolectric", version = "4.14.1" }
seismic = { module = "com.squareup:seismic", version = "1.0.3" }
speeddial = { module = "com.leinardi.android:speed-dial.compose", version = "2.0.0-alpha01" }
sqldelight-androidDriver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqlDelight" }
Expand All @@ -168,11 +162,11 @@ sqldelight-nativeDriver = { module = "app.cash.sqldelight:native-driver", versio
sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqlDelight" }
sqldelight-webDriver = { module = "app.cash.sqldelight:web-worker-driver", version.ref = "sqlDelight" }
timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
tink = { module = "com.google.crypto.tink:tink-android", version = "1.15.0" }
tink = { module = "com.google.crypto.tink:tink-android", version = "1.16.0" }

# plugins
plugin-aboutlibraries = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlibraries" }
plugin-android-gradle = { module = "com.android.tools.build:gradle", version = "8.7.2" }
plugin-android-gradle = { module = "com.android.tools.build:gradle", version = "8.8.0" }
plugin-androidcachefix = { module = "gradle.plugin.org.gradle.android:android-cache-fix-gradle-plugin", version = "3.0" }
plugin-androidx-navigation-safeargs = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "androidx-navigation" }
plugin-appversioning = { module = "io.github.reactivecircus.appversioning:app-versioning-gradle-plugin", version = "1.3.2" }
Expand All @@ -199,5 +193,5 @@ kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", vers
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
multiplatform = { id = "org.jetbrains.compose", version.ref = "kotlin-multiplatform" }
sqldelight = { id = "app.cash.sqldelight", version = "2.0.1" }
tripletplay = { id = "com.github.triplet.play", version = "3.11.0" }
tripletplay = { id = "com.github.triplet.play", version = "3.12.1" }
com-android-application = { id = "com.android.application", version.ref = "agp" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Oct 13 15:47:24 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
6 changes: 0 additions & 6 deletions modules/library-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ android {

dependencies {
implementation (projects.modules.libraryNavigationApi)
api (libs.accompanist.flowlayout)
api (libs.accompanist.navigation.material)
api (libs.accompanist.pager)
api (libs.accompanist.pager.indicators)
api (libs.accompanist.placeholder)
api (libs.accompanist.systemuicontroller)
api (libs.androidx.appcompat)
api (libs.androidx.compose.material) // Still needed for stuff missing in M3, like ModalBottomSheetLayout
api (libs.androidx.compose.material3)
Expand Down
Loading