Skip to content

Commit 3f2ae54

Browse files
committed
Merge branch 'master' into feature/GH-42-swift-to-kotlin-wrappers
2 parents 5941817 + 4e9d04b commit 3f2ae54

8 files changed

+17
-17
lines changed

.idea/kotlinc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

KMPNativeCoroutinesAsync.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'KMPNativeCoroutinesAsync'
3-
s.version = '1.0.0-ALPHA-33'
3+
s.version = '1.0.0-ALPHA-34'
44
s.summary = 'Swift library for Kotlin Coroutines with Swift Async/Await'
55

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

KMPNativeCoroutinesCombine.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'KMPNativeCoroutinesCombine'
3-
s.version = '1.0.0-ALPHA-33'
3+
s.version = '1.0.0-ALPHA-34'
44
s.summary = 'Swift library for Kotlin Coroutines with Combine'
55

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

KMPNativeCoroutinesCore.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'KMPNativeCoroutinesCore'
3-
s.version = '1.0.0-ALPHA-33'
3+
s.version = '1.0.0-ALPHA-34'
44
s.summary = 'Swift library for Kotlin Coroutines'
55

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

KMPNativeCoroutinesRxSwift.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'KMPNativeCoroutinesRxSwift'
3-
s.version = '1.0.0-ALPHA-33'
3+
s.version = '1.0.0-ALPHA-34'
44
s.summary = 'Swift library for Kotlin Coroutines with RxSwift'
55

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

README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ This library solves both of these limitations 😄.
2323

2424
## Compatibility
2525

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

2929
| Version | Version suffix | Kotlin | KSP | Coroutines |
3030
|----------------|--------------------|:----------:|:----------:|:----------:|
3131
| _latest_ | -kotlin-2.0.20-RC | 2.0.20-RC | 1.0.24 | 1.9.0-RC |
32-
| _latest_ | -kotlin-2.0.10-RC2 | 2.0.10-RC2 | 1.0.24 | 1.9.0-RC |
33-
| **_latest_** | **_no suffix_** | **2.0.0** | **1.0.24** | **1.8.1** |
32+
| **_latest_** | **_no suffix_** | **2.0.10** | **1.0.24** | **1.8.1** |
33+
| 1.0.0-ALPHA-33 | _no suffix_ | 2.0.0 | 1.0.24 | 1.8.1 |
3434
| 1.0.0-ALPHA-30 | _no suffix_ | 1.9.24 | 1.0.20 | 1.8.1 |
3535
| 1.0.0-ALPHA-28 | _no suffix_ | 1.9.23 | 1.0.20 | 1.8.0 |
3636
| 1.0.0-ALPHA-25 | _no suffix_ | 1.9.22 | 1.0.17 | 1.8.0 |
@@ -64,8 +64,8 @@ Make sure to always use the same versions for all the libraries!
6464
For Kotlin just add the plugin to your `build.gradle.kts`:
6565
```kotlin
6666
plugins {
67-
id("com.google.devtools.ksp") version "2.0.0-1.0.24"
68-
id("com.rickclephas.kmp.nativecoroutines") version "1.0.0-ALPHA-33"
67+
id("com.google.devtools.ksp") version "2.0.10-1.0.24"
68+
id("com.rickclephas.kmp.nativecoroutines") version "1.0.0-ALPHA-34"
6969
}
7070
```
7171
and make sure to opt in to the experimental `@ObjCName` annotation:
@@ -81,7 +81,7 @@ The Swift implementations are available via the Swift Package Manager.
8181
Just add it to your `Package.swift` file:
8282
```swift
8383
dependencies: [
84-
.package(url: "https://github.com/rickclephas/KMP-NativeCoroutines.git", exact: "1.0.0-ALPHA-33")
84+
.package(url: "https://github.com/rickclephas/KMP-NativeCoroutines.git", exact: "1.0.0-ALPHA-34")
8585
],
8686
targets: [
8787
.target(
@@ -113,9 +113,9 @@ Or add it in Xcode by going to `File` > `Add Packages...` and providing the URL:
113113

114114
If you use CocoaPods add one or more of the following libraries to your `Podfile`:
115115
```ruby
116-
pod 'KMPNativeCoroutinesAsync', '1.0.0-ALPHA-33' # Swift Concurrency implementation
117-
pod 'KMPNativeCoroutinesCombine', '1.0.0-ALPHA-33' # Combine implementation
118-
pod 'KMPNativeCoroutinesRxSwift', '1.0.0-ALPHA-33' # RxSwift implementation
116+
pod 'KMPNativeCoroutinesAsync', '1.0.0-ALPHA-34' # Swift Concurrency implementation
117+
pod 'KMPNativeCoroutinesCombine', '1.0.0-ALPHA-34' # Combine implementation
118+
pod 'KMPNativeCoroutinesRxSwift', '1.0.0-ALPHA-34' # RxSwift implementation
119119
```
120120
> [!NOTE]
121121
> The version for CocoaPods should not contain the Kotlin version suffix (e.g. `-new-mm` or `-kotlin-1.6.0`).

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818

1919
allprojects {
2020
group = "com.rickclephas.kmp"
21-
version = "1.0.0-ALPHA-33"
21+
version = "1.0.0-ALPHA-34"
2222

2323
repositories {
2424
mavenCentral()

gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
kotlin = "2.0.0"
2+
kotlin = "2.0.10"
33
kotlinx-coroutines = "1.8.1"
44
kotlinx-binary-compatibility-validator = "0.15.0-Beta.2"
5-
ksp = "2.0.0-1.0.24"
5+
ksp = "2.0.10-1.0.24"
66
kotlinpoet = "1.18.1"
77
junit = "5.9.1"
88

0 commit comments

Comments
 (0)