Skip to content

Commit 2528eb5

Browse files
committed
Merge branch 'master' into feature/kotlin-2.0.20
2 parents a7b5092 + 795e4ca commit 2528eb5

6 files changed

+15
-14
lines changed

KMPObservableViewModelCore.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'KMPObservableViewModelCore'
3-
s.version = '1.0.0-BETA-3'
3+
s.version = '1.0.0-BETA-4'
44
s.summary = 'Library to share Kotlin ViewModels with Swift'
55

66
s.homepage = 'https://github.com/rickclephas/KMP-ObservableViewModel'

KMPObservableViewModelCoreObjC.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'KMPObservableViewModelCoreObjC'
3-
s.version = '1.0.0-BETA-3'
3+
s.version = '1.0.0-BETA-4'
44
s.summary = 'Library to share Kotlin ViewModels with Swift'
55

66
s.homepage = 'https://github.com/rickclephas/KMP-ObservableViewModel'

KMPObservableViewModelSwiftUI.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'KMPObservableViewModelSwiftUI'
3-
s.version = '1.0.0-BETA-3'
3+
s.version = '1.0.0-BETA-4'
44
s.summary = 'Library to share Kotlin ViewModels with SwiftUI'
55

66
s.homepage = 'https://github.com/rickclephas/KMP-ObservableViewModel'

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ but not all targets support AndroidX and/or SwiftUI interop:
2121
| JS || - | - |
2222
| Wasm || - | - |
2323

24-
The latest version of the library uses Kotlin version `2.0.0`.
24+
The latest version of the library uses Kotlin version `2.0.10`.
2525
Compatibility versions for older and/or preview Kotlin versions are also available:
2626

27-
| Version | Version suffix | Kotlin | Coroutines | AndroidX Lifecycle |
28-
|--------------|----------------------|:------------:|:----------:|:------------------:|
29-
| _latest_ | -kotlin-2.0.20-Beta1 | 2.0.20-Beta1 | 1.9.0-RC | 2.8.0 |
30-
| **_latest_** | **_no suffix_** | **2.0.0** | **1.8.1** | **2.8.0** |
31-
| 1.0.0-BETA-2 | _no suffix_ | 1.9.24 | 1.8.1 | 2.8.0 |
27+
| Version | Version suffix | Kotlin | Coroutines | AndroidX Lifecycle |
28+
|--------------|-------------------|:----------:|:----------:|:------------------:|
29+
| _latest_ | -kotlin-2.0.20-RC | 2.0.20-RC | 1.9.0-RC | 2.8.0 |
30+
| **_latest_** | **_no suffix_** | **2.0.10** | **1.8.1** | **2.8.4** |
31+
| 1.0.0-BETA-3 | _no suffix_ | 2.0.0 | 1.8.1 | 2.8.0 |
32+
| 1.0.0-BETA-2 | _no suffix_ | 1.9.24 | 1.8.1 | 2.8.0 |
3233

3334
## Kotlin
3435

@@ -41,7 +42,7 @@ kotlin {
4142
}
4243
commonMain {
4344
dependencies {
44-
api("com.rickclephas.kmp:kmp-observableviewmodel-core:1.0.0-BETA-3")
45+
api("com.rickclephas.kmp:kmp-observableviewmodel-core:1.0.0-BETA-4")
4546
}
4647
}
4748
}
@@ -148,7 +149,7 @@ After you have configured your `shared` Kotlin module and created a ViewModel it
148149
Start by adding the Swift package to your `Package.swift` file:
149150
```swift
150151
dependencies: [
151-
.package(url: "https://github.com/rickclephas/KMP-ObservableViewModel.git", from: "1.0.0-BETA-3")
152+
.package(url: "https://github.com/rickclephas/KMP-ObservableViewModel.git", from: "1.0.0-BETA-4")
152153
]
153154
```
154155

@@ -160,7 +161,7 @@ Or add it in Xcode by going to `File` > `Add Packages...` and providing the URL:
160161

161162
If you like you can also use CocoaPods instead of SPM:
162163
```ruby
163-
pod 'KMPObservableViewModelSwiftUI', '1.0.0-BETA-3'
164+
pod 'KMPObservableViewModelSwiftUI', '1.0.0-BETA-4'
164165
```
165166
</p>
166167
</details>

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121

2222
allprojects {
2323
group = "com.rickclephas.kmp"
24-
version = "1.0.0-BETA-3-kotlin-2.0.20-RC"
24+
version = "1.0.0-BETA-4"
2525

2626
repositories {
2727
mavenCentral()

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kotlin = "2.0.20-RC2"
33
kotlinx-coroutines = "1.9.0-RC.2"
44
android = "8.2.0"
5-
androidx-lifecycle = "2.8.0"
5+
androidx-lifecycle = "2.8.4"
66
atomicfu = "0.24.0"
77

88
# Sample versions

0 commit comments

Comments
 (0)