Skip to content

Commit 7593df9

Browse files
committed
Merge branch 'master' into feature/kotlin-2.3.20
2 parents 34c7dd5 + b88e4fa commit 7593df9

File tree

6 files changed

+31
-24
lines changed

6 files changed

+31
-24
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.1'
3+
s.version = '1.0.2'
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.1'
3+
s.version = '1.0.2'
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.1'
3+
s.version = '1.0.2'
44
s.summary = 'Library to share Kotlin ViewModels with SwiftUI'
55

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

README.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,22 @@ 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.3.0`.
24+
The latest version of the library uses Kotlin version `2.3.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_** | **_no suffix_** | **2.3.0** | **1.10.1** | **2.8.7** |
30-
| 1.0.0 | _no suffix_ | 2.2.21 | 1.10.1 | 2.8.7 |
31-
| 1.0.0-BETA-13 | _no suffix_ | 2.2.10 | 1.10.1 | 2.8.7 |
32-
| 1.0.0-BETA-12 | _no suffix_ | 2.2.0 | 1.10.1 | 2.8.7 |
33-
| 1.0.0-BETA-11 | _no suffix_ | 2.1.21 | 1.10.1 | 2.8.7 |
34-
| 1.0.0-BETA-9 | _no suffix_ | 2.1.10 | 1.10.1 | 2.8.7 |
35-
| 1.0.0-BETA-8 | _no suffix_ | 2.1.0 | 1.9.0 | 2.8.4 |
36-
| 1.0.0-BETA-7 | _no suffix_ | 2.0.21 | 1.9.0 | 2.8.4 |
37-
| 1.0.0-BETA-4 | _no suffix_ | 2.0.10 | 1.8.1 | 2.8.4 |
38-
| 1.0.0-BETA-3 | _no suffix_ | 2.0.0 | 1.8.1 | 2.8.0 |
27+
| Version | Version suffix | Kotlin | Coroutines | AndroidX Lifecycle |
28+
|---------------|-----------------|:----------:|:----------:|:------------------:|
29+
| **_latest_** | **_no suffix_** | **2.3.10** | **1.10.1** | **2.8.7** |
30+
| 1.0.1 | _no suffix_ | 2.3.0 | 1.10.1 | 2.8.7 |
31+
| 1.0.0 | _no suffix_ | 2.2.21 | 1.10.1 | 2.8.7 |
32+
| 1.0.0-BETA-13 | _no suffix_ | 2.2.10 | 1.10.1 | 2.8.7 |
33+
| 1.0.0-BETA-12 | _no suffix_ | 2.2.0 | 1.10.1 | 2.8.7 |
34+
| 1.0.0-BETA-11 | _no suffix_ | 2.1.21 | 1.10.1 | 2.8.7 |
35+
| 1.0.0-BETA-9 | _no suffix_ | 2.1.10 | 1.10.1 | 2.8.7 |
36+
| 1.0.0-BETA-8 | _no suffix_ | 2.1.0 | 1.9.0 | 2.8.4 |
37+
| 1.0.0-BETA-7 | _no suffix_ | 2.0.21 | 1.9.0 | 2.8.4 |
38+
| 1.0.0-BETA-4 | _no suffix_ | 2.0.10 | 1.8.1 | 2.8.4 |
39+
| 1.0.0-BETA-3 | _no suffix_ | 2.0.0 | 1.8.1 | 2.8.0 |
3940

4041
## Kotlin
4142

@@ -48,7 +49,7 @@ kotlin {
4849
}
4950
commonMain {
5051
dependencies {
51-
api("com.rickclephas.kmp:kmp-observableviewmodel-core:1.0.1")
52+
api("com.rickclephas.kmp:kmp-observableviewmodel-core:1.0.2")
5253
}
5354
}
5455
}
@@ -155,7 +156,7 @@ After you have configured your `shared` Kotlin module and created a ViewModel it
155156
Start by adding the Swift package to your `Package.swift` file:
156157
```swift
157158
dependencies: [
158-
.package(url: "https://github.com/rickclephas/KMP-ObservableViewModel.git", from: "1.0.1")
159+
.package(url: "https://github.com/rickclephas/KMP-ObservableViewModel.git", from: "1.0.2")
159160
]
160161
```
161162

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

168169
If you like you can also use CocoaPods instead of SPM:
169170
```ruby
170-
pod 'KMPObservableViewModelSwiftUI', '1.0.1'
171+
pod 'KMPObservableViewModelSwiftUI', '1.0.2'
171172
```
172173
</p>
173174
</details>

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ buildscript {
88

99
allprojects {
1010
group = "com.rickclephas.kmp"
11-
version = "1.0.1-kotlin-2.3.20-Beta2"
11+
version = "1.0.2"
1212
}

kotlin-js-store/yarn.lock

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,11 @@ is-number@^7.0.0:
10831083
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
10841084
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
10851085

1086+
is-path-inside@^3.0.3:
1087+
version "3.0.3"
1088+
resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
1089+
integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
1090+
10861091
is-plain-obj@^2.1.0:
10871092
version "2.1.0"
10881093
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -1334,10 +1339,10 @@ mkdirp@^0.5.5:
13341339
dependencies:
13351340
minimist "^1.2.6"
13361341

1337-
mocha@11.7.2:
1338-
version "11.7.2"
1339-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.2.tgz#3c0079fe5cc2f8ea86d99124debcc42bb1ab22b5"
1340-
integrity sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==
1342+
mocha@11.7.5:
1343+
version "11.7.5"
1344+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.5.tgz#58f5bbfa5e0211ce7e5ee6128107cefc2515a627"
1345+
integrity sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==
13411346
dependencies:
13421347
browser-stdout "^1.3.1"
13431348
chokidar "^4.0.1"
@@ -1347,6 +1352,7 @@ mocha@11.7.2:
13471352
find-up "^5.0.0"
13481353
glob "^10.4.5"
13491354
he "^1.2.0"
1355+
is-path-inside "^3.0.3"
13501356
js-yaml "^4.1.0"
13511357
log-symbols "^4.1.0"
13521358
minimatch "^9.0.5"

0 commit comments

Comments
 (0)