Merge branch 'dev-1.0'

rickclephas · Apr 3, 2023 · fc8eb76 · fc8eb76
2 parents 5012d81 + 659e6b3
commit fc8eb76
Show file tree

Hide file tree

Showing 113 changed files with 3,651 additions and 1,451 deletions.
diff --git a/.github/workflows/release-kotlin-preview.yaml b/.github/workflows/release-kotlin-preview.yaml
@@ -3,11 +3,11 @@ on:
   push:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-Beta'
-      - 'v[0-9]+.[0-9]+.[0-9]+-new-mm-kotlin-[0-9]+.[0-9]+.[0-9]+-Beta'
+      - 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-Beta'
       - 'v[0-9]+.[0-9]+.[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-RC'
-      - 'v[0-9]+.[0-9]+.[0-9]+-new-mm-kotlin-[0-9]+.[0-9]+.[0-9]+-RC'
+      - 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-RC'
       - 'v[0-9]+.[0-9]+.[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-RC[0-9]+'
-      - 'v[0-9]+.[0-9]+.[0-9]+-new-mm-kotlin-[0-9]+.[0-9]+.[0-9]+-RC[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-RC[0-9]+'
 jobs:
   publish-kotlin-libraries:
     runs-on: macos-12
@@ -32,4 +32,4 @@ jobs:
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
           SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
diff --git a/.github/workflows/release-kotlin.yaml b/.github/workflows/release-kotlin.yaml
@@ -3,9 +3,9 @@ on:
   push:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+'
       - 'v[0-9]+.[0-9]+.[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+'
-      - 'v[0-9]+.[0-9]+.[0-9]+-new-mm'
-      - 'v[0-9]+.[0-9]+.[0-9]+-new-mm-[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+'
 jobs:
   publish-kotlin-libraries:
     runs-on: macos-12
@@ -38,4 +38,4 @@ jobs:
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
           SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
           GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
-          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
+          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
diff --git a/.github/workflows/release-swift.yaml b/.github/workflows/release-swift.yaml
@@ -3,6 +3,7 @@ on:
   push:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+'
 jobs:
   publish-cocoapods-core:
     runs-on: macos-12
@@ -31,6 +32,18 @@ jobs:
         run: pod trunk push KMPNativeCoroutinesAsync.podspec --synchronous
         env:
           COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+  publish-spm-async:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Publish Async SPM tag
+        uses: ./.github/actions/publish-spm-tag
+        with:
+          package-name: async
+          version-name: ${{ github.ref_name }}
   publish-cocoapods-combine:
     needs: publish-cocoapods-core
     runs-on: macos-12
@@ -45,6 +58,18 @@ jobs:
         run: pod trunk push KMPNativeCoroutinesCombine.podspec --synchronous
         env:
           COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+  publish-spm-combine:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Publish Combine SPM tag
+        uses: ./.github/actions/publish-spm-tag
+        with:
+          package-name: combine
+          version-name: ${{ github.ref_name }}
   publish-cocoapods-rxswift:
     needs: publish-cocoapods-core
     runs-on: macos-12
@@ -59,3 +84,15 @@ jobs:
         run: pod trunk push KMPNativeCoroutinesRxSwift.podspec --synchronous
         env:
           COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+  publish-spm-rxswift:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Publish RxSwift SPM tag
+        uses: ./.github/actions/publish-spm-tag
+        with:
+          package-name: rxswift
+          version-name: ${{ github.ref_name }}
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -22,7 +22,7 @@ jobs:
         os: [ macos-12 ]
         xcode: [ 13.4.1 ]
         java: [ 11 ]
-        module: [ core ]
+        module: [ core, ksp ]
     name: ${{ format('{0} ({1}, Xcode {2}, JDK {3})', matrix.module, matrix.os, matrix.xcode, matrix.java) }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -46,7 +46,7 @@ jobs:
       - name: Run tests
         env:
           GRADLE_MODULE: ${{ format(':kmp-nativecoroutines-{0}', matrix.module) }}
-        run: ./gradlew $GRADLE_MODULE:allTests
+        run: ./gradlew $GRADLE_MODULE:check
   run-swift-tests:
     if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
     strategy:

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/runConfigurations/Core_Tests.xml b/.idea/runConfigurations/Core_Tests.xml
diff --git a/.idea/runConfigurations/KSP_Tests.xml b/.idea/runConfigurations/KSP_Tests.xml
diff --git a/KMPNativeCoroutines.xcodeproj/project.pbxproj b/KMPNativeCoroutines.xcodeproj/project.pbxproj
@@ -17,7 +17,6 @@
 		1D7175C1266FF04200846F75 /* Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D2EC86A266D290000B118B0 /* Publisher.swift */; };
 		1D75A367272D4B3800CFF795 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 1D75A366272D4B3800CFF795 /* RxSwift */; };
 		1D75A369272D4B4900CFF795 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 1D75A368272D4B4900CFF795 /* RxSwift */; };
-		1D75A36A272D4BC200CFF795 /* KMPNativeCoroutinesCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D717583266FE90400846F75 /* KMPNativeCoroutinesCore.framework */; };
 		1DA5DCEF267613BB002448E3 /* KMPNativeCoroutinesAsync.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DA5DCE5267613BB002448E3 /* KMPNativeCoroutinesAsync.framework */; platformFilter = ios; };
 		1DA5DCF4267613BB002448E3 /* AsyncFunctionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DA5DCF3267613BB002448E3 /* AsyncFunctionTests.swift */; };
 		1DA5DCFD26761404002448E3 /* AsyncFunction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DA5DCFC26761404002448E3 /* AsyncFunction.swift */; };
@@ -32,8 +31,8 @@
 		1DF3F9E1269369AD004C21F2 /* SingleObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DF3F95726935E2A004C21F2 /* SingleObservable.swift */; };
 		1DF3F9E2269369B5004C21F2 /* ObservableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DF3F94E2693590D004C21F2 /* ObservableTests.swift */; };
 		1DF3F9E3269369BA004C21F2 /* SingleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DF3F959269362D0004C21F2 /* SingleTests.swift */; };
-		1DFB127A26A09796001BE321 /* AsyncStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFB127926A09796001BE321 /* AsyncStream.swift */; };
-		1DFB127C26A0A446001BE321 /* AsyncStreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFB127B26A0A446001BE321 /* AsyncStreamTests.swift */; };
+		1DFB127A26A09796001BE321 /* AsyncSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFB127926A09796001BE321 /* AsyncSequence.swift */; };
+		1DFB127C26A0A446001BE321 /* AsyncSequenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFB127B26A0A446001BE321 /* AsyncSequenceTests.swift */; };
 		1DFC35FC268A2DE3008393FA /* AsyncResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFC35FB268A2DE3008393FA /* AsyncResult.swift */; };
 		1DFC35FE268A2FFE008393FA /* AsyncResultTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFC35FD268A2FFE008393FA /* AsyncResultTests.swift */; };
 /* End PBXBuildFile section */
@@ -46,33 +45,26 @@
 			remoteGlobalIDString = 1D717582266FE90400846F75;
 			remoteInfo = KMPNativeCoroutinesCore;
 		};
-		1DA5DCF0267613BB002448E3 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1DF8833F266D1BC10058B6F9 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 1DA5DCE4267613BB002448E3;
-			remoteInfo = KMPNativeCoroutinesAsync;
-		};
 		1D75A36C272D4BC200CFF795 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 1DF8833F266D1BC10058B6F9 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 1D717582266FE90400846F75;
 			remoteInfo = KMPNativeCoroutinesCore;
 		};
-		1DCA41AB26753C640036C1A3 /* PBXContainerItemProxy */ = {
+		1DA5DCF0267613BB002448E3 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 1DF8833F266D1BC10058B6F9 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 1D71759E266FE9B700846F75;
-			remoteInfo = KMPNativeCoroutinesCombine;
+			remoteGlobalIDString = 1DA5DCE4267613BB002448E3;
+			remoteInfo = KMPNativeCoroutinesAsync;
 		};
-		1DF053072698D5E100A16325 /* PBXContainerItemProxy */ = {
+		1DCA41AB26753C640036C1A3 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 1DF8833F266D1BC10058B6F9 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 1D717582266FE90400846F75;
-			remoteInfo = KMPNativeCoroutinesCore;
+			remoteGlobalIDString = 1D71759E266FE9B700846F75;
+			remoteInfo = KMPNativeCoroutinesCombine;
 		};
 		1DF3F9D226936935004C21F2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -107,8 +99,8 @@
 		1DF3F959269362D0004C21F2 /* SingleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleTests.swift; sourceTree = "<group>"; };
 		1DF3F9C826936935004C21F2 /* KMPNativeCoroutinesRxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = KMPNativeCoroutinesRxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1DF3F9D026936935004C21F2 /* KMPNativeCoroutinesRxSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KMPNativeCoroutinesRxSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		1DFB127926A09796001BE321 /* AsyncStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncStream.swift; sourceTree = "<group>"; };
-		1DFB127B26A0A446001BE321 /* AsyncStreamTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncStreamTests.swift; sourceTree = "<group>"; };
+		1DFB127926A09796001BE321 /* AsyncSequence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncSequence.swift; sourceTree = "<group>"; };
+		1DFB127B26A0A446001BE321 /* AsyncSequenceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncSequenceTests.swift; sourceTree = "<group>"; };
 		1DFC35FB268A2DE3008393FA /* AsyncResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncResult.swift; sourceTree = "<group>"; };
 		1DFC35FD268A2FFE008393FA /* AsyncResultTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncResultTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -207,7 +199,7 @@
 			children = (
 				1DA5DCFC26761404002448E3 /* AsyncFunction.swift */,
 				1DFC35FB268A2DE3008393FA /* AsyncResult.swift */,
-				1DFB127926A09796001BE321 /* AsyncStream.swift */,
+				1DFB127926A09796001BE321 /* AsyncSequence.swift */,
 			);
 			path = KMPNativeCoroutinesAsync;
 			sourceTree = "<group>";
@@ -217,7 +209,7 @@
 			children = (
 				1DA5DCF3267613BB002448E3 /* AsyncFunctionTests.swift */,
 				1DFC35FD268A2FFE008393FA /* AsyncResultTests.swift */,
-				1DFB127B26A0A446001BE321 /* AsyncStreamTests.swift */,
+				1DFB127B26A0A446001BE321 /* AsyncSequenceTests.swift */,
 			);
 			path = KMPNativeCoroutinesAsyncTests;
 			sourceTree = "<group>";
@@ -357,7 +349,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				1DA5DD022676192F002448E3 /* PBXTargetDependency */,
 			);
 			name = KMPNativeCoroutinesAsync;
 			productName = KMPNativeCoroutinesAsync;
@@ -404,7 +395,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1DF3F9D926936935004C21F2 /* Build configuration list for PBXNativeTarget "KMPNativeCoroutinesRxSwift" */;
 			buildPhases = (
-				1DF3F9C326936935004C21F2 /* Headers */,
 				1DF3F9C426936935004C21F2 /* Sources */,
 				1DF3F9C526936935004C21F2 /* Frameworks */,
 				1DF3F9C626936935004C21F2 /* Resources */,
@@ -583,7 +573,7 @@
 			files = (
 				1DA5DCFD26761404002448E3 /* AsyncFunction.swift in Sources */,
 				1DFC35FC268A2DE3008393FA /* AsyncResult.swift in Sources */,
-				1DFB127A26A09796001BE321 /* AsyncStream.swift in Sources */,
+				1DFB127A26A09796001BE321 /* AsyncSequence.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -592,7 +582,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				1DA5DCF4267613BB002448E3 /* AsyncFunctionTests.swift in Sources */,
-				1DFB127C26A0A446001BE321 /* AsyncStreamTests.swift in Sources */,
+				1DFB127C26A0A446001BE321 /* AsyncSequenceTests.swift in Sources */,
 				1DFC35FE268A2FFE008393FA /* AsyncResultTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -633,27 +623,22 @@
 			target = 1D717582266FE90400846F75 /* KMPNativeCoroutinesCore */;
 			targetProxy = 1D7175B9266FE9F800846F75 /* PBXContainerItemProxy */;
 		};
+		1D75A36D272D4BC200CFF795 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 1D717582266FE90400846F75 /* KMPNativeCoroutinesCore */;
+			targetProxy = 1D75A36C272D4BC200CFF795 /* PBXContainerItemProxy */;
+		};
 		1DA5DCF1267613BB002448E3 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			platformFilter = ios;
 			target = 1DA5DCE4267613BB002448E3 /* KMPNativeCoroutinesAsync */;
 			targetProxy = 1DA5DCF0267613BB002448E3 /* PBXContainerItemProxy */;
 		};
-		1D75A36D272D4BC200CFF795 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 1D717582266FE90400846F75 /* KMPNativeCoroutinesCore */;
-			targetProxy = 1D75A36C272D4BC200CFF795 /* PBXContainerItemProxy */;
-		};
 		1DCA41AC26753C640036C1A3 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 1D71759E266FE9B700846F75 /* KMPNativeCoroutinesCombine */;
 			targetProxy = 1DCA41AB26753C640036C1A3 /* PBXContainerItemProxy */;
 		};
-		1DF053082698D5E100A16325 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 1D717582266FE90400846F75 /* KMPNativeCoroutinesCore */;
-			targetProxy = 1DF053072698D5E100A16325 /* PBXContainerItemProxy */;
-		};
 		1DF3F9D326936935004C21F2 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 1DF3F9C726936935004C21F2 /* KMPNativeCoroutinesRxSwift */;

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