Skip to content

Commit 04b0559

Browse files
authored
Merge pull request #149 from joreilly/dep_updates
dependency updates
2 parents 095093c + 3dec0b7 commit 04b0559

File tree

6 files changed

+23
-20
lines changed

6 files changed

+23
-20
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MortyCompose
22

3-
![kotlin-version](https://img.shields.io/badge/kotlin-2.0.0-blue?logo=kotlin)
3+
![kotlin-version](https://img.shields.io/badge/kotlin-2.2.0-blue?logo=kotlin)
44

55

66
Kotlin Multiplatform sample that demonstrates use of GraphQL + Jetpack Compose and SwiftUI (based on https://github.com/Dimillian/MortyUI SwiftUI project).

gradle/libs.versions.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
[versions]
2-
kotlin = "2.0.21"
3-
ksp = "2.0.21-1.0.25"
4-
kotlinx-coroutines = "1.9.0"
2+
kotlin = "2.2.0"
3+
ksp = "2.2.0-2.0.2"
4+
kotlinx-coroutines = "1.10.2"
55

6-
androidGradlePlugin = "8.7.1"
7-
koin = "4.0.0"
8-
koinCompose = "4.0.0"
9-
apollo = "4.0.1"
10-
kmpNativeCoroutines = "1.0.0-ALPHA-37"
11-
kmpObservableViewModel = "1.0.0-BETA-7"
6+
androidGradlePlugin = "8.11.0"
7+
koin = "4.1.0"
8+
koinCompose = "4.1.0"
9+
apollo = "4.3.1"
10+
kmpNativeCoroutines = "1.0.0-ALPHA-45"
11+
kmpObservableViewModel = "1.0.0-BETA-12"
1212

13-
androidxActivity = "1.9.3"
14-
androidxComposeBom = "2024.10.00"
15-
androidxPaging = "3.3.2"
16-
androidxNavigationCompose = "2.8.3"
13+
androidxActivity = "1.10.1"
14+
androidxComposeBom = "2025.06.01"
15+
androidxPaging = "3.3.6"
16+
androidxNavigationCompose = "2.9.1"
1717
accompanist = "0.30.1"
1818
coilCompose = "2.7.0"
1919

2020
junit = "4.13.2"
2121

2222
minSdk = "24"
23-
targetSdk = "34"
24-
compileSdk = "34"
23+
targetSdk = "36"
24+
compileSdk = "36"
2525

2626

2727

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

shared/src/commonMain/kotlin/dev/johnoreilly/mortycomposekmm/shared/viewmodel/CharactersViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import dev.johnoreilly.mortycomposekmm.fragment.CharacterDetail
1515
import dev.johnoreilly.mortycomposekmm.shared.MortyRepository
1616
import dev.johnoreilly.mortycomposekmm.shared.paging.CharactersDataSource
1717
import kotlinx.coroutines.flow.Flow
18+
import kotlinx.coroutines.flow.MutableStateFlow
1819
import kotlinx.coroutines.flow.collectLatest
1920
import kotlinx.coroutines.launch
2021
import org.koin.core.component.KoinComponent
@@ -36,7 +37,7 @@ open class CharactersViewModel(): ViewModel(), KoinComponent {
3637
}
3738

3839
@NativeCoroutinesState
39-
val charactersSnapshotList = MutableStateFlow<ItemSnapshotList<CharacterDetail>>(viewModelScope, charactersPagingDataPresenter.snapshot())
40+
val charactersSnapshotList: MutableStateFlow<ItemSnapshotList<CharacterDetail>> = MutableStateFlow<ItemSnapshotList<CharacterDetail>>(viewModelScope, charactersPagingDataPresenter.snapshot())
4041

4142
init {
4243
viewModelScope.coroutineScope.launch {

shared/src/commonMain/kotlin/dev/johnoreilly/mortycomposekmm/shared/viewmodel/EpisodesViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import dev.johnoreilly.mortycomposekmm.fragment.EpisodeDetail
1515
import dev.johnoreilly.mortycomposekmm.shared.MortyRepository
1616
import dev.johnoreilly.mortycomposekmm.shared.paging.EpisodesDataSource
1717
import kotlinx.coroutines.flow.Flow
18+
import kotlinx.coroutines.flow.MutableStateFlow
1819
import kotlinx.coroutines.flow.collectLatest
1920
import kotlinx.coroutines.launch
2021
import org.koin.core.component.KoinComponent
@@ -36,7 +37,7 @@ open class EpisodesViewModel(): ViewModel(), KoinComponent {
3637
}
3738

3839
@NativeCoroutinesState
39-
val episodesSnapshotList = MutableStateFlow<ItemSnapshotList<EpisodeDetail>>(viewModelScope, episodesPagingDataPresenter.snapshot())
40+
val episodesSnapshotList: MutableStateFlow<ItemSnapshotList<EpisodeDetail>> = MutableStateFlow<ItemSnapshotList<EpisodeDetail>>(viewModelScope, episodesPagingDataPresenter.snapshot())
4041

4142
init {
4243
viewModelScope.coroutineScope.launch {

shared/src/commonMain/kotlin/dev/johnoreilly/mortycomposekmm/shared/viewmodel/LocationsViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import dev.johnoreilly.mortycomposekmm.fragment.LocationDetail
1515
import dev.johnoreilly.mortycomposekmm.shared.MortyRepository
1616
import dev.johnoreilly.mortycomposekmm.shared.paging.LocationsDataSource
1717
import kotlinx.coroutines.flow.Flow
18+
import kotlinx.coroutines.flow.MutableStateFlow
1819
import kotlinx.coroutines.flow.collectLatest
1920
import kotlinx.coroutines.launch
2021
import org.koin.core.component.KoinComponent
@@ -36,7 +37,7 @@ open class LocationsViewModel(): ViewModel(), KoinComponent {
3637
}
3738

3839
@NativeCoroutinesState
39-
val locationsSnapshotList = MutableStateFlow<ItemSnapshotList<LocationDetail>>(viewModelScope, locationsPagingDataPresenter.snapshot())
40+
val locationsSnapshotList: MutableStateFlow<ItemSnapshotList<LocationDetail>> = MutableStateFlow<ItemSnapshotList<LocationDetail>>(viewModelScope, locationsPagingDataPresenter.snapshot())
4041

4142
init {
4243
viewModelScope.coroutineScope.launch {

0 commit comments

Comments
 (0)