Skip to content

Commit 7a2e1e9

Browse files
joreillyjoreilly
authored
Merge pull request #78 from joreilly/kmp-observableviewmodel
migrate to kmp-observableviewmodel
2 parents c6d2e37 + 2ba4b60 commit 7a2e1e9

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

‎composeApp/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ kotlin {
7575

7676
implementation(libs.voyager)
7777

78-
implementation(libs.kmmViewModel)
78+
implementation(libs.kmpObservableViewModel)
7979

8080
implementation(libs.koalaplot)
8181
implementation(libs.treemap.chart)

‎composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/viewmodel/ClimateTraceViewModel.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package dev.johnoreilly.climatetrace.viewmodel
22

3-
import com.rickclephas.kmm.viewmodel.KMMViewModel
4-
import com.rickclephas.kmm.viewmodel.MutableStateFlow
5-
import com.rickclephas.kmm.viewmodel.coroutineScope
63
import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
4+
import com.rickclephas.kmp.observableviewmodel.MutableStateFlow
5+
import com.rickclephas.kmp.observableviewmodel.ViewModel
6+
import com.rickclephas.kmp.observableviewmodel.coroutineScope
77
import dev.johnoreilly.climatetrace.data.ClimateTraceRepository
88
import dev.johnoreilly.climatetrace.remote.ClimateTraceApi
99
import dev.johnoreilly.climatetrace.remote.Country
@@ -14,7 +14,7 @@ import kotlinx.coroutines.launch
1414
import org.koin.core.component.KoinComponent
1515
import org.koin.core.component.inject
1616

17-
open class ClimateTraceViewModel : KMMViewModel(), KoinComponent {
17+
open class ClimateTraceViewModel : ViewModel(), KoinComponent {
1818
private val climateTraceApi: ClimateTraceApi by inject()
1919
private val climateTraceRepository: ClimateTraceRepository by inject()
2020

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ koin = "3.6.0-alpha3"
1313
koinCompose = "1.2.0-alpha3"
1414
kotlin = "2.0.0-RC2"
1515
kotlinx-coroutines = "1.8.0"
16-
kmpNativeCoroutines = "1.0.0-ALPHA-28-kotlin-2.0.0-RC1"
17-
kmmViewModel = "1.0.0-ALPHA-20-kotlin-2.0.0-RC1"
16+
kmpNativeCoroutines = "1.0.0-ALPHA-28-kotlin-2.0.0-RC2"
17+
kmpObservableViewModel = "1.0.0-BETA-1-kotlin-2.0.0-RC2"
1818
ksp = "2.0.0-RC2-1.0.20"
1919
kstore = "0.8.0-SNAPSHOT"
2020
ktor = "3.0.0-wasm2"
@@ -35,7 +35,7 @@ koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
3535

3636

3737
kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
38-
kmmViewModel = { group = "com.rickclephas.kmm", name = "kmm-viewmodel-core", version.ref = "kmmViewModel" }
38+
kmpObservableViewModel = { module = "com.rickclephas.kmp:kmp-observableviewmodel-core", version.ref = "kmpObservableViewModel" }
3939

4040
kstore = { module = "io.github.xxfast:kstore", version.ref = "kstore" }
4141
kstore-file = { module = "io.github.xxfast:kstore-file", version.ref = "kstore" }

‎iosApp/iosApp.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
1111
058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
1212
1A64543E2B45D93900204F96 /* KMMViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A64543D2B45D93900204F96 /* KMMViewModel.swift */; };
13-
1AADBC052B44CA5F006E275D /* KMMViewModelCore in Frameworks */ = {isa = PBXBuildFile; productRef = 1AADBC042B44CA5F006E275D /* KMMViewModelCore */; };
14-
1AADBC072B44CA5F006E275D /* KMMViewModelSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 1AADBC062B44CA5F006E275D /* KMMViewModelSwiftUI */; };
13+
1AA509B02BEF5CAD0081137F /* KMPObservableViewModelCore in Frameworks */ = {isa = PBXBuildFile; productRef = 1AA509AF2BEF5CAD0081137F /* KMPObservableViewModelCore */; };
14+
1AA509B22BEF5CAD0081137F /* KMPObservableViewModelSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 1AA509B12BEF5CAD0081137F /* KMPObservableViewModelSwiftUI */; };
1515
2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
1616
7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
1717
/* End PBXBuildFile section */
@@ -32,8 +32,8 @@
3232
isa = PBXFrameworksBuildPhase;
3333
buildActionMask = 2147483647;
3434
files = (
35-
1AADBC052B44CA5F006E275D /* KMMViewModelCore in Frameworks */,
36-
1AADBC072B44CA5F006E275D /* KMMViewModelSwiftUI in Frameworks */,
35+
1AA509B02BEF5CAD0081137F /* KMPObservableViewModelCore in Frameworks */,
36+
1AA509B22BEF5CAD0081137F /* KMPObservableViewModelSwiftUI in Frameworks */,
3737
);
3838
runOnlyForDeploymentPostprocessing = 0;
3939
};
@@ -112,8 +112,8 @@
112112
);
113113
name = iosApp;
114114
packageProductDependencies = (
115-
1AADBC042B44CA5F006E275D /* KMMViewModelCore */,
116-
1AADBC062B44CA5F006E275D /* KMMViewModelSwiftUI */,
115+
1AA509AF2BEF5CAD0081137F /* KMPObservableViewModelCore */,
116+
1AA509B12BEF5CAD0081137F /* KMPObservableViewModelSwiftUI */,
117117
);
118118
productName = iosApp;
119119
productReference = 7555FF7B242A565900829871 /* ClimateTraceKMP.app */;
@@ -144,7 +144,7 @@
144144
);
145145
mainGroup = 7555FF72242A565900829871;
146146
packageReferences = (
147-
1AADBC032B44CA5F006E275D /* XCRemoteSwiftPackageReference "KMM-ViewModel" */,
147+
1AA509AE2BEF5CAD0081137F /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */,
148148
);
149149
productRefGroup = 7555FF7C242A565900829871 /* Products */;
150150
projectDirPath = "";
@@ -406,26 +406,26 @@
406406
/* End XCConfigurationList section */
407407

408408
/* Begin XCRemoteSwiftPackageReference section */
409-
1AADBC032B44CA5F006E275D /* XCRemoteSwiftPackageReference "KMM-ViewModel" */ = {
409+
1AA509AE2BEF5CAD0081137F /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */ = {
410410
isa = XCRemoteSwiftPackageReference;
411-
repositoryURL = "https://github.com/rickclephas/KMM-ViewModel";
411+
repositoryURL = "https://github.com/rickclephas/KMP-ObservableViewModel.git";
412412
requirement = {
413-
branch = master;
414-
kind = branch;
413+
kind = exactVersion;
414+
version = "1.0.0-BETA-1";
415415
};
416416
};
417417
/* End XCRemoteSwiftPackageReference section */
418418

419419
/* Begin XCSwiftPackageProductDependency section */
420-
1AADBC042B44CA5F006E275D /* KMMViewModelCore */ = {
420+
1AA509AF2BEF5CAD0081137F /* KMPObservableViewModelCore */ = {
421421
isa = XCSwiftPackageProductDependency;
422-
package = 1AADBC032B44CA5F006E275D /* XCRemoteSwiftPackageReference "KMM-ViewModel" */;
423-
productName = KMMViewModelCore;
422+
package = 1AA509AE2BEF5CAD0081137F /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */;
423+
productName = KMPObservableViewModelCore;
424424
};
425-
1AADBC062B44CA5F006E275D /* KMMViewModelSwiftUI */ = {
425+
1AA509B12BEF5CAD0081137F /* KMPObservableViewModelSwiftUI */ = {
426426
isa = XCSwiftPackageProductDependency;
427-
package = 1AADBC032B44CA5F006E275D /* XCRemoteSwiftPackageReference "KMM-ViewModel" */;
428-
productName = KMMViewModelSwiftUI;
427+
package = 1AA509AE2BEF5CAD0081137F /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */;
428+
productName = KMPObservableViewModelSwiftUI;
429429
};
430430
/* End XCSwiftPackageProductDependency section */
431431
};

‎iosApp/iosApp/ContentView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import UIKit
22
import SwiftUI
33
import ComposeApp
4-
import KMMViewModelCore
5-
import KMMViewModelSwiftUI
4+
import KMPObservableViewModelCore
5+
import KMPObservableViewModelSwiftUI
66

77

88
struct ContentView: View {

‎iosApp/iosApp/KMMViewModel.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import KMMViewModelCore
21
import ComposeApp
2+
import KMPObservableViewModelCore
33

4-
extension Kmm_viewmodel_coreKMMViewModel: KMMViewModel { }
4+
extension Kmp_observableviewmodel_coreViewModel: ViewModel { }

0 commit comments

Comments
 (0)