Skip to content

Commit

Permalink
Merge branch 'master' into feature/kotlin-2.0.20
Browse files Browse the repository at this point in the history
  • Loading branch information
rickclephas committed Jul 14, 2024
2 parents 74edf03 + 8477466 commit cedec9c
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 15 deletions.
1 change: 1 addition & 0 deletions .github/workflows/code-quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ jobs:
uses: JetBrains/qodana-action@v2024.1
with:
args: -v,${{ steps.get-java-home-11.outputs.JAVA_HOME_11_X64 }}:/root/.jdks/jdk11
post-pr-comment: false
env:
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/release-kotlin-preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Cache Konan
uses: ./.github/actions/cache-konan
- name: Publish to Sonatype
run: ./gradlew publishAllPublicationsToSonatypeRepository
run: ./gradlew publishAllPublicationsToSonatypeRepository --no-configuration-cache
env:
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-kotlin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:
- name: Cache Konan
uses: ./.github/actions/cache-konan
- name: Publish to Sonatype
run: ./gradlew publishAllPublicationsToSonatypeRepository
run: ./gradlew publishAllPublicationsToSonatypeRepository --no-configuration-cache
env:
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
- name: Publish to Gradle Plugin Portal
run: ./gradlew publishPlugins
run: ./gradlew publishPlugins --no-configuration-cache
env:
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion KMPNativeCoroutinesAsync.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'KMPNativeCoroutinesAsync'
s.version = '1.0.0-ALPHA-31'
s.version = '1.0.0-ALPHA-32'
s.summary = 'Swift library for Kotlin Coroutines with Swift Async/Await'

s.homepage = 'https://github.com/rickclephas/KMP-NativeCoroutines'
Expand Down
2 changes: 1 addition & 1 deletion KMPNativeCoroutinesCombine.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'KMPNativeCoroutinesCombine'
s.version = '1.0.0-ALPHA-31'
s.version = '1.0.0-ALPHA-32'
s.summary = 'Swift library for Kotlin Coroutines with Combine'

s.homepage = 'https://github.com/rickclephas/KMP-NativeCoroutines'
Expand Down
2 changes: 1 addition & 1 deletion KMPNativeCoroutinesCore.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'KMPNativeCoroutinesCore'
s.version = '1.0.0-ALPHA-31'
s.version = '1.0.0-ALPHA-32'
s.summary = 'Swift library for Kotlin Coroutines'

s.homepage = 'https://github.com/rickclephas/KMP-NativeCoroutines'
Expand Down
2 changes: 1 addition & 1 deletion KMPNativeCoroutinesRxSwift.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'KMPNativeCoroutinesRxSwift'
s.version = '1.0.0-ALPHA-31'
s.version = '1.0.0-ALPHA-32'
s.summary = 'Swift library for Kotlin Coroutines with RxSwift'

s.homepage = 'https://github.com/rickclephas/KMP-NativeCoroutines'
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Compatibility versions for older and/or preview Kotlin versions are also availab
| Version | Version suffix | Kotlin | KSP | Coroutines |
|----------------|----------------------|:------------:|:----------:|:----------:|
| _latest_ | -kotlin-2.0.20-Beta1 | 2.0.20-Beta1 | 1.0.22 | 1.9.0-RC |
| **_latest_** | **_no suffix_** | **2.0.0** | **1.0.21** | **1.8.1** |
| **_latest_** | **_no suffix_** | **2.0.0** | **1.0.23** | **1.8.1** |
| 1.0.0-ALPHA-30 | _no suffix_ | 1.9.24 | 1.0.20 | 1.8.1 |
| 1.0.0-ALPHA-28 | _no suffix_ | 1.9.23 | 1.0.20 | 1.8.0 |
| 1.0.0-ALPHA-25 | _no suffix_ | 1.9.22 | 1.0.17 | 1.8.0 |
Expand Down Expand Up @@ -63,8 +63,8 @@ Make sure to always use the same versions for all the libraries!
For Kotlin just add the plugin to your `build.gradle.kts`:
```kotlin
plugins {
id("com.google.devtools.ksp") version "2.0.0-1.0.21"
id("com.rickclephas.kmp.nativecoroutines") version "1.0.0-ALPHA-31"
id("com.google.devtools.ksp") version "2.0.0-1.0.23"
id("com.rickclephas.kmp.nativecoroutines") version "1.0.0-ALPHA-32"
}
```
and make sure to opt in to the experimental `@ObjCName` annotation:
Expand All @@ -80,7 +80,7 @@ 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", exact: "1.0.0-ALPHA-31")
.package(url: "https://github.com/rickclephas/KMP-NativeCoroutines.git", exact: "1.0.0-ALPHA-32")
],
targets: [
.target(
Expand Down Expand Up @@ -112,9 +112,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-31' # Swift Concurrency implementation
pod 'KMPNativeCoroutinesCombine', '1.0.0-ALPHA-31' # Combine implementation
pod 'KMPNativeCoroutinesRxSwift', '1.0.0-ALPHA-31' # RxSwift implementation
pod 'KMPNativeCoroutinesAsync', '1.0.0-ALPHA-32' # Swift Concurrency implementation
pod 'KMPNativeCoroutinesCombine', '1.0.0-ALPHA-32' # Combine implementation
pod 'KMPNativeCoroutinesRxSwift', '1.0.0-ALPHA-32' # RxSwift implementation
```
> [!NOTE]
> The version for CocoaPods should not contain the Kotlin version suffix (e.g. `-new-mm` or `-kotlin-1.6.0`).
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {

allprojects {
group = "com.rickclephas.kmp"
version = "1.0.0-ALPHA-31-kotlin-2.0.20-Beta1"
version = "1.0.0-ALPHA-32"

repositories {
mavenCentral()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#This is the verification token for the com.rickclephas.kmp:kmp-nativecoroutines-annotations-jvm SDK.
#Sun Jul 14 03:58:30 PDT 2024
token=W3RYNAJ7DVG75HELMMNMMEQFQY

0 comments on commit cedec9c

Please sign in to comment.