Merge branch 'master' into feature/kotlin-2.0.0

rickclephas · Nov 18, 2023 · b101a01 · b101a01
2 parents 82d974a + 22d8245
commit b101a01
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 21 deletions.
diff --git a/KMPNativeCoroutinesAsync.podspec b/KMPNativeCoroutinesAsync.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name       = 'KMPNativeCoroutinesAsync'
-  s.version    = '1.0.0-ALPHA-20'
+  s.version    = '1.0.0-ALPHA-21'
   s.summary    = 'Swift library for Kotlin Coroutines with Swift Async/Await'
 
   s.homepage   = 'https://github.com/rickclephas/KMP-NativeCoroutines'

diff --git a/KMPNativeCoroutinesCombine.podspec b/KMPNativeCoroutinesCombine.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name       = 'KMPNativeCoroutinesCombine'
-  s.version    = '1.0.0-ALPHA-20'
+  s.version    = '1.0.0-ALPHA-21'
   s.summary    = 'Swift library for Kotlin Coroutines with Combine'
 
   s.homepage   = 'https://github.com/rickclephas/KMP-NativeCoroutines'

diff --git a/KMPNativeCoroutinesCore.podspec b/KMPNativeCoroutinesCore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name       = 'KMPNativeCoroutinesCore'
-  s.version    = '1.0.0-ALPHA-20'
+  s.version    = '1.0.0-ALPHA-21'
   s.summary    = 'Swift library for Kotlin Coroutines'
 
   s.homepage   = 'https://github.com/rickclephas/KMP-NativeCoroutines'

diff --git a/KMPNativeCoroutinesRxSwift.podspec b/KMPNativeCoroutinesRxSwift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name       = 'KMPNativeCoroutinesRxSwift'
-  s.version    = '1.0.0-ALPHA-20'
+  s.version    = '1.0.0-ALPHA-21'
   s.summary    = 'Swift library for Kotlin Coroutines with RxSwift'
 
   s.homepage   = 'https://github.com/rickclephas/KMP-NativeCoroutines'

diff --git a/README.md b/README.md
@@ -29,17 +29,18 @@ This library solves both of these limitations 😄.
 The latest version of the library uses Kotlin version `1.9.20`.  
 Compatibility versions for older and/or preview Kotlin versions are also available:
 
-| Version        | Version suffix       |   Kotlin   |    KSP     | Coroutines |
-|----------------|----------------------|:----------:|:----------:|:----------:|
-| **_latest_**   | **_no suffix_**      | **1.9.20** | **1.0.14** | **1.7.3**  |
-| 1.0.0-ALPHA-19 | _no suffix_          |   1.9.20   |   1.0.13   |   1.7.3    |
-| 1.0.0-ALPHA-18 | _no suffix_          |   1.9.10   |   1.0.13   |   1.7.3    |
-| 1.0.0-ALPHA-17 | _no suffix_          |   1.9.0    |   1.0.12   |   1.7.3    |
-| 1.0.0-ALPHA-13 | _no suffix_          |   1.9.0    |   1.0.11   |   1.7.2    |
-| 1.0.0-ALPHA-12 | _no suffix_          |   1.8.22   |   1.0.11   |   1.7.2    |
-| 1.0.0-ALPHA-10 | _no suffix_          |   1.8.21   |   1.0.11   |   1.7.1    |
-| 1.0.0-ALPHA-8  | _no suffix_          |   1.8.21   |   1.0.11   |   1.6.4    |
-| 1.0.0-ALPHA-7  | _no suffix_          |   1.8.20   |   1.0.10   |   1.6.4    |
+| Version        | Version suffix      |   Kotlin    |    KSP     | Coroutines |
+|----------------|---------------------|:-----------:|:----------:|:----------:|
+| _latest_       | -kotlin-2.0.0-Beta1 | 2.0.0-Beta1 |   1.0.14   |   1.7.3    |
+| **_latest_**   | **_no suffix_**     | **1.9.20**  | **1.0.14** | **1.7.3**  |
+| 1.0.0-ALPHA-19 | _no suffix_         |   1.9.20    |   1.0.13   |   1.7.3    |
+| 1.0.0-ALPHA-18 | _no suffix_         |   1.9.10    |   1.0.13   |   1.7.3    |
+| 1.0.0-ALPHA-17 | _no suffix_         |    1.9.0    |   1.0.12   |   1.7.3    |
+| 1.0.0-ALPHA-13 | _no suffix_         |    1.9.0    |   1.0.11   |   1.7.2    |
+| 1.0.0-ALPHA-12 | _no suffix_         |   1.8.22    |   1.0.11   |   1.7.2    |
+| 1.0.0-ALPHA-10 | _no suffix_         |   1.8.21    |   1.0.11   |   1.7.1    |
+| 1.0.0-ALPHA-8  | _no suffix_         |   1.8.21    |   1.0.11   |   1.6.4    |
+| 1.0.0-ALPHA-7  | _no suffix_         |   1.8.20    |   1.0.10   |   1.6.4    |
 
 You can choose from a couple of Swift implementations.  
 Depending on the implementation you can support as low as iOS 9, macOS 10.9, tvOS 9 and watchOS 3:
@@ -64,7 +65,7 @@ For Kotlin just add the plugin to your `build.gradle.kts`:
 ```kotlin
 plugins {
     id("com.google.devtools.ksp") version "1.9.20-1.0.14"
-    id("com.rickclephas.kmp.nativecoroutines") version "1.0.0-ALPHA-20"
+    id("com.rickclephas.kmp.nativecoroutines") version "1.0.0-ALPHA-21"
 }
 ```
 and make sure to opt in to the experimental `@ObjCName` annotation:
@@ -80,7 +81,20 @@ The Swift implementations are available via the Swift Package Manager.
 Just add it to your `Package.swift` file:
 ```swift
 dependencies: [
-    .package(url: "https://github.com/rickclephas/KMP-NativeCoroutines.git", from: "1.0.0-ALPHA-20")
+    .package(url: "https://github.com/rickclephas/KMP-NativeCoroutines.git", exact: "1.0.0-ALPHA-21")
+],
+targets: [
+    .target(
+        name: "MyTargetName",
+        dependencies: [
+            // Swift Concurrency implementation
+            .product(name: "KMPNativeCoroutinesAsync", package: "KMP-NativeCoroutines"),
+            // Combine implementation
+            .product(name: "KMPNativeCoroutinesCombine", package: "KMP-NativeCoroutines"),
+            // RxSwift implementation
+            .product(name: "KMPNativeCoroutinesRxSwift", package: "KMP-NativeCoroutines")
+        ]
+    )
 ]
 ```
 
@@ -99,9 +113,9 @@ Or add it in Xcode by going to `File` > `Add Packages...` and providing the URL:
 
 If you use CocoaPods add one or more of the following libraries to your `Podfile`:
 ```ruby
-pod 'KMPNativeCoroutinesAsync', '1.0.0-ALPHA-20'    # Swift Concurrency implementation
-pod 'KMPNativeCoroutinesCombine', '1.0.0-ALPHA-20'  # Combine implementation
-pod 'KMPNativeCoroutinesRxSwift', '1.0.0-ALPHA-20'  # RxSwift implementation
+pod 'KMPNativeCoroutinesAsync', '1.0.0-ALPHA-21'    # Swift Concurrency implementation
+pod 'KMPNativeCoroutinesCombine', '1.0.0-ALPHA-21'  # Combine implementation
+pod 'KMPNativeCoroutinesRxSwift', '1.0.0-ALPHA-21'  # RxSwift implementation
 ```
 > [!NOTE]
 > The version for CocoaPods should not contain the Kotlin version suffix (e.g. `-new-mm` or `-kotlin-1.6.0`).

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ buildscript {
 
 allprojects {
     group = "com.rickclephas.kmp"
-    version = "1.0.0-ALPHA-20"
+    version = "1.0.0-ALPHA-21"
 
     repositories {
         mavenCentral()