Skip to content

Commit 1188d71

Browse files
rickclephasrickclephas
committed
Merge branch 'master' into feature/kotlin-2.1.21
2 parents 6b0806b + 9ca2bee commit 1188d71

File tree

9 files changed

+36
-35
lines changed

9 files changed

+36
-35
lines changed

‎.github/workflows/run-idea-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
ide: [ IC, IU, AI ]
42-
build: [ 243 ]
42+
build: [ 243, 251 ]
4343
name: ${{ format('{0}-{1}', matrix.ide, matrix.build) }}
4444
runs-on: ubuntu-latest
4545
steps:

‎KMPNativeCoroutinesAsync.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 = 'KMPNativeCoroutinesAsync'
3-
s.version = '1.0.0-ALPHA-41'
3+
s.version = '1.0.0-ALPHA-42'
44
s.summary = 'Swift library for Kotlin Coroutines with Swift Async/Await'
55

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

‎KMPNativeCoroutinesCombine.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 = 'KMPNativeCoroutinesCombine'
3-
s.version = '1.0.0-ALPHA-41'
3+
s.version = '1.0.0-ALPHA-42'
44
s.summary = 'Swift library for Kotlin Coroutines with Combine'
55

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

‎KMPNativeCoroutinesCore.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 = 'KMPNativeCoroutinesCore'
3-
s.version = '1.0.0-ALPHA-41'
3+
s.version = '1.0.0-ALPHA-42'
44
s.summary = 'Swift library for Kotlin Coroutines'
55

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

‎KMPNativeCoroutinesRxSwift.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 = 'KMPNativeCoroutinesRxSwift'
3-
s.version = '1.0.0-ALPHA-41'
3+
s.version = '1.0.0-ALPHA-42'
44
s.summary = 'Swift library for Kotlin Coroutines with RxSwift'
55

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

‎README.md

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,27 @@ This library solves both of these limitations 😄.
2626
The latest version of the library uses Kotlin version `2.1.20`.
2727
Compatibility versions for older and/or preview Kotlin versions are also available:
2828

29-
| Version | Version suffix | Kotlin | KSP | Coroutines |
30-
|----------------|----------------------|:----------:|:----------:|:----------:|
31-
| **_latest_** | **_no suffix_** | **2.1.20** | **1.0.31** | **1.10.1** |
32-
| 1.0.0-ALPHA-40 | _no suffix_ | 2.1.10 | 1.0.31 | 1.10.1 |
33-
| 1.0.0-ALPHA-38 | _no suffix_ | 2.1.0 | 1.0.29 | 1.9.0 |
34-
| 1.0.0-ALPHA-37 | _no suffix_ | 2.0.21 | 1.0.25 | 1.9.0 |
35-
| 1.0.0-ALPHA-36 | _no suffix_ | 2.0.20 | 1.0.25 | 1.9.0 |
36-
| 1.0.0-ALPHA-35 | _no suffix_ | 2.0.20 | 1.0.24 | 1.8.1 |
37-
| 1.0.0-ALPHA-34 | _no suffix_ | 2.0.10 | 1.0.24 | 1.8.1 |
38-
| 1.0.0-ALPHA-33 | _no suffix_ | 2.0.0 | 1.0.24 | 1.8.1 |
39-
| 1.0.0-ALPHA-30 | _no suffix_ | 1.9.24 | 1.0.20 | 1.8.1 |
40-
| 1.0.0-ALPHA-28 | _no suffix_ | 1.9.23 | 1.0.20 | 1.8.0 |
41-
| 1.0.0-ALPHA-25 | _no suffix_ | 1.9.22 | 1.0.17 | 1.8.0 |
42-
| 1.0.0-ALPHA-23 | _no suffix_ | 1.9.21 | 1.0.16 | 1.7.3 |
43-
| 1.0.0-ALPHA-21 | _no suffix_ | 1.9.20 | 1.0.14 | 1.7.3 |
44-
| 1.0.0-ALPHA-18 | _no suffix_ | 1.9.10 | 1.0.13 | 1.7.3 |
45-
| 1.0.0-ALPHA-17 | _no suffix_ | 1.9.0 | 1.0.12 | 1.7.3 |
46-
| 1.0.0-ALPHA-12 | _no suffix_ | 1.8.22 | 1.0.11 | 1.7.2 |
47-
| 1.0.0-ALPHA-10 | _no suffix_ | 1.8.21 | 1.0.11 | 1.7.1 |
48-
| 1.0.0-ALPHA-7 | _no suffix_ | 1.8.20 | 1.0.10 | 1.6.4 |
29+
| Version | Version suffix | Kotlin | KSP | Coroutines |
30+
|----------------|----------------------|:----------:|:---------:|:----------:|
31+
| **_latest_** | **_no suffix_** | **2.1.20** | **2.0.0** | **1.10.1** |
32+
| 1.0.0-ALPHA-41 | _no suffix_ | 2.1.10 | 1.0.31 | 1.10.1 |
33+
| 1.0.0-ALPHA-40 | _no suffix_ | 2.1.10 | 1.0.31 | 1.10.1 |
34+
| 1.0.0-ALPHA-38 | _no suffix_ | 2.1.0 | 1.0.29 | 1.9.0 |
35+
| 1.0.0-ALPHA-37 | _no suffix_ | 2.0.21 | 1.0.25 | 1.9.0 |
36+
| 1.0.0-ALPHA-36 | _no suffix_ | 2.0.20 | 1.0.25 | 1.9.0 |
37+
| 1.0.0-ALPHA-35 | _no suffix_ | 2.0.20 | 1.0.24 | 1.8.1 |
38+
| 1.0.0-ALPHA-34 | _no suffix_ | 2.0.10 | 1.0.24 | 1.8.1 |
39+
| 1.0.0-ALPHA-33 | _no suffix_ | 2.0.0 | 1.0.24 | 1.8.1 |
40+
| 1.0.0-ALPHA-30 | _no suffix_ | 1.9.24 | 1.0.20 | 1.8.1 |
41+
| 1.0.0-ALPHA-28 | _no suffix_ | 1.9.23 | 1.0.20 | 1.8.0 |
42+
| 1.0.0-ALPHA-25 | _no suffix_ | 1.9.22 | 1.0.17 | 1.8.0 |
43+
| 1.0.0-ALPHA-23 | _no suffix_ | 1.9.21 | 1.0.16 | 1.7.3 |
44+
| 1.0.0-ALPHA-21 | _no suffix_ | 1.9.20 | 1.0.14 | 1.7.3 |
45+
| 1.0.0-ALPHA-18 | _no suffix_ | 1.9.10 | 1.0.13 | 1.7.3 |
46+
| 1.0.0-ALPHA-17 | _no suffix_ | 1.9.0 | 1.0.12 | 1.7.3 |
47+
| 1.0.0-ALPHA-12 | _no suffix_ | 1.8.22 | 1.0.11 | 1.7.2 |
48+
| 1.0.0-ALPHA-10 | _no suffix_ | 1.8.21 | 1.0.11 | 1.7.1 |
49+
| 1.0.0-ALPHA-7 | _no suffix_ | 1.8.20 | 1.0.10 | 1.6.4 |
4950

5051
You can choose from a couple of Swift implementations.
5152
Depending on the implementation you can support as low as iOS 9, macOS 10.9, tvOS 9 and watchOS 3:
@@ -69,8 +70,8 @@ Make sure to always use the same versions for all the libraries!
6970
For Kotlin just add the plugin to your `build.gradle.kts`:
7071
```kotlin
7172
plugins {
72-
id("com.google.devtools.ksp") version "2.1.20-1.0.31"
73-
id("com.rickclephas.kmp.nativecoroutines") version "1.0.0-ALPHA-41"
73+
id("com.google.devtools.ksp") version "2.1.20-2.0.0"
74+
id("com.rickclephas.kmp.nativecoroutines") version "1.0.0-ALPHA-42"
7475
}
7576
```
7677
and make sure to opt in to the experimental `@ObjCName` annotation:
@@ -86,7 +87,7 @@ The Swift implementations are available via the Swift Package Manager.
8687
Just add it to your `Package.swift` file:
8788
```swift
8889
dependencies: [
89-
.package(url: "https://github.com/rickclephas/KMP-NativeCoroutines.git", exact: "1.0.0-ALPHA-41")
90+
.package(url: "https://github.com/rickclephas/KMP-NativeCoroutines.git", exact: "1.0.0-ALPHA-42")
9091
],
9192
targets: [
9293
.target(
@@ -118,9 +119,9 @@ Or add it in Xcode by going to `File` > `Add Packages...` and providing the URL:
118119

119120
If you use CocoaPods add one or more of the following libraries to your `Podfile`:
120121
```ruby
121-
pod 'KMPNativeCoroutinesAsync', '1.0.0-ALPHA-41' # Swift Concurrency implementation
122-
pod 'KMPNativeCoroutinesCombine', '1.0.0-ALPHA-41' # Combine implementation
123-
pod 'KMPNativeCoroutinesRxSwift', '1.0.0-ALPHA-41' # RxSwift implementation
122+
pod 'KMPNativeCoroutinesAsync', '1.0.0-ALPHA-42' # Swift Concurrency implementation
123+
pod 'KMPNativeCoroutinesCombine', '1.0.0-ALPHA-42' # Combine implementation
124+
pod 'KMPNativeCoroutinesRxSwift', '1.0.0-ALPHA-42' # RxSwift implementation
124125
```
125126
> [!NOTE]
126127
> The version for CocoaPods should not contain the Kotlin version suffix (e.g. `-new-mm` or `-kotlin-1.6.0`).

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
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-41"
21+
version = "1.0.0-ALPHA-42"
2222

2323
repositories {
2424
mavenCentral()

‎gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
3535

3636
[plugins]
3737
gradle-plugin-publish = { id = "com.gradle.plugin-publish", version = "1.2.0" }
38-
intellij-platform = { id = "org.jetbrains.intellij.platform", version = "2.2.1" }
38+
intellij-platform = { id = "org.jetbrains.intellij.platform", version = "2.5.0" }
3939
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
4040
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
4141
kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-binary-compatibility-validator" }

‎kmp-nativecoroutines-idea-plugin/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ intellijPlatform {
5353

5454
ideaVersion {
5555
sinceBuild = "243"
56-
untilBuild = "243.*"
56+
untilBuild = "251.*"
5757
}
5858

5959
vendor {
@@ -110,7 +110,7 @@ val runIntelliJUltimate by intellijPlatformTesting.runIde.registering {
110110

111111
val runAndroidStudio by intellijPlatformTesting.runIde.registering {
112112
type = IntelliJPlatformType.AndroidStudio
113-
version = "2024.2.1.7"
113+
version = "2024.3.2.11"
114114
}
115115

116116
tasks.withType(RunIdeTask::class) {

0 commit comments

Comments
 (0)