Skip to content

Commit 6ef15c1

Browse files
authored
Merge pull request #199 from joreilly/update_dependencies
update dependencies
2 parents 551b2bf + a65c161 commit 6ef15c1

File tree

4 files changed

+9
-26
lines changed

4 files changed

+9
-26
lines changed

common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
alias(libs.plugins.kmpNativeCoroutines)
77
//alias(libs.plugins.realm.kotlin)
88
id(libs.plugins.realm.kotlin.get().pluginId)
9-
id("io.github.luca992.multiplatform-swiftpackage") version "2.2.0"
9+
id("io.github.luca992.multiplatform-swiftpackage") version "2.2.2"
1010
}
1111

1212

common/src/commonMain/kotlin/dev/johnoreilly/common/repository/CityBikesRepository.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class CityBikesRepository: KoinComponent {
3434

3535
private val mainScope: CoroutineScope = MainScope()
3636

37-
val groupedNetworkList: StateFlow<Map<String,List<Network>>>
38-
field = MutableStateFlow<Map<String,List<Network>>>(emptyMap())
37+
val groupedNetworkList: StateFlow<Map<String,List<Network>>>
38+
field = MutableStateFlow<Map<String,List<Network>>>(emptyMap())
3939

4040
private val _networkList = MutableStateFlow<List<Network>>(emptyList())
4141

compose-desktop/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
dependencies {
99
implementation(compose.desktop.currentOs)
10-
implementation("org.jxmapviewer:jxmapviewer2:2.6")
10+
implementation("org.jxmapviewer:jxmapviewer2:2.8")
1111
implementation(project(":common"))
1212
}
1313

gradle/libs.versions.toml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
kotlin = "2.0.0"
3-
ksp = "2.0.0-1.0.21"
3+
ksp = "2.0.0-1.0.22"
44

55
coroutines = "1.8.1"
66
kotlinxSerialization = "1.6.3"
@@ -11,27 +11,19 @@ koin = "3.6.0-Beta4"
1111
koin-android-compose = "3.6.0-Beta4"
1212
koin-compose-multiplatform = "1.2.0-Beta4"
1313
ktor = "2.3.11"
14-
slf4j = "2.0.12"
14+
slf4j = "2.0.13"
1515
realm = "2.0.0"
1616
kmpNativeCoroutines = "1.0.0-ALPHA-31"
1717
kmpObservableViewModel = "1.0.0-BETA-3"
1818

19-
compose-multiplatform = "1.6.10"
19+
compose-multiplatform = "1.6.11"
2020
androidxActivity = "1.9.0"
21-
androidxComposeBom = "2024.05.00"
21+
androidxComposeBom = "2024.06.00"
2222
androidxNavigationCompose = "2.7.7"
23-
androidxLifecycle = "2.8.0"
23+
androidxLifecycle = "2.8.2"
2424
glance = "1.0.0"
25-
26-
accompanist = "0.32.0"
27-
coilCompose = "2.6.0"
28-
image-loader = "1.7.8"
29-
3025
junit = "4.13.2"
3126

32-
multiplatformSettings = "1.1.1"
33-
kermit = "2.0.3"
34-
3527
minSdk = "24"
3628
targetSdk = "34"
3729
compileSdk = "34"
@@ -40,7 +32,6 @@ compileSdk = "34"
4032
[libraries]
4133
kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
4234
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
43-
kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDateTime" }
4435
kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerialization" }
4536

4637
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" }
@@ -61,10 +52,6 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose
6152
androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycle" }
6253
androidx-glance = { module = "androidx.glance:glance-appwidget", version.ref = "glance" }
6354

64-
coilCompose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coilCompose" }
65-
accompanist-placeholder = { group = "com.google.accompanist", name = "accompanist-placeholder-material3", version.ref = "accompanist" }
66-
image-loader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "image-loader" }
67-
6855
koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
6956
koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin-android-compose" }
7057
koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
@@ -85,13 +72,9 @@ kmpObservableViewModel = { module = "com.rickclephas.kmp:kmp-observableviewmodel
8572
realm = { group = "io.realm.kotlin", name = "library-base", version.ref = "realm" }
8673
realm-plugin = { group = "io.realm.kotlin", name = "gradle-plugin" ,version.ref = "realm"}
8774

88-
multiplatform-settings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatformSettings" }
89-
multiplatform-settings-coroutines = { module = "com.russhwolf:multiplatform-settings-coroutines", version.ref = "multiplatformSettings" }
90-
kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
9175
junit = { module = "junit:junit", version.ref = "junit" }
9276

9377
[bundles]
94-
multiplatformSettings = ["multiplatform-settings", "multiplatform-settings-coroutines"]
9578
ktor-common = ["ktor-client-core", "ktor-client-json", "ktor-client-logging", "ktor-client-serialization", "ktor-client-content-negotiation", "ktor-serialization-kotlinx-json"]
9679

9780

0 commit comments

Comments
 (0)