Swift export 2.3.0

KMPNativeCoroutinesAsync/AsyncFunction.swift

@@ -18,6 +18,14 @@ public func asyncFunction<Result, Failure: Error, Unit>(
     try await AsyncFunctionTask(nativeSuspend: nativeSuspend).awaitResult()
 }
 
+/// This function provides source compatibility during the migration to Swift export.
+///
+/// This is a no-op function and it can be safely removed once you have fully migrated to Swift export.
+@available(*, deprecated, message: "Kotlin Coroutines are supported by Swift export")
+public func asyncFunction<Result>(for result: Result) async -> Result {
+    return result
+}
+
 /// Wraps the `NativeSuspend` in an async function.
 /// - Parameter nativeSuspend: The native suspend function to await.
 /// - Throws: Errors thrown by the `nativeSuspend`.

KMPNativeCoroutinesAsync/AsyncResult.swift

@@ -20,6 +20,20 @@ public func asyncResult<Output, Failure: Error, Unit>(
     }
 }
 
+/// This function provides source compatibility during the migration to Swift export.
+///
+/// Once you have fully migrated to Swift export you can replace this function with a do-catch.
+@available(*, deprecated, message: "Kotlin Coroutines are supported by Swift export")
+public func asyncResult<Output>(
+    for output: @autoclosure () async throws -> Output
+) async -> Result<Output, Error> {
+    do {
+        return .success(try await output())
+    } catch {
+        return .failure(error)
+    }
+}
+
 /// Awaits the `NativeSuspend` and returns the result.
 /// - Parameter nativeSuspend: The native suspend function to await.
 /// - Returns: The `Result` from the `nativeSuspend`.

KMPNativeCoroutinesCombine/Future.swift

@@ -18,6 +18,17 @@ public func createFuture<Result, Failure: Error, Unit>(
         .eraseToAnyPublisher()
 }
 
+/// This function provides source compatibility during the migration to Swift export.
+///
+/// You should migrate away from this function once you have fully migrated to Swift export.
+@available(*, deprecated, message: "Kotlin Coroutines are supported by Swift export")
+public func createFuture<Result>(
+    for operation: @escaping () async throws -> Result
+) -> AnyPublisher<Result, Error> {
+    return TaskFuture(operation: operation)
+        .eraseToAnyPublisher()
+}
+
 /// Creates an `AnyPublisher` for the provided `NativeSuspend`.
 /// - Parameter nativeSuspend: The native suspend function to await.
 /// - Returns: A publisher that either finishes with a single value or fails with an error.
@@ -78,3 +89,51 @@ internal class NativeSuspendSubscription<Result, Failure, Unit, S: Subscriber>:
         nativeCancellable = nil
     }
 }
+
+internal struct TaskFuture<Result>: Publisher {
+
+    typealias Output = Result
+    typealias Failure = Error
+
+    let operation: () async throws -> Result
+
+    func receive<S>(subscriber: S) where S : Subscriber, any Failure == S.Failure, Result == S.Input {
+        let subscription = TaskSubscription(operation: operation, subscriber: subscriber)
+        subscriber.receive(subscription: subscription)
+    }
+}
+
+internal class TaskSubscription<Result, S: Subscriber>: Subscription where S.Input == Result, S.Failure == Error {
+
+    private var operation: (() async throws -> Result)?
+    private var task: Task<Void, Never>? = nil
+    private var subscriber: S?
+
+    init(operation: @escaping () async throws -> Result, subscriber: S) {
+        self.operation = operation
+        self.subscriber = subscriber
+    }
+
+    func request(_ demand: Subscribers.Demand) {
+        guard let operation = operation, demand >= 1 else { return }
+        self.operation = nil
+        task = Task {
+            do {
+                let result = try await operation()
+                if let subscriber = self.subscriber {
+                    _ = subscriber.receive(result)
+                    subscriber.receive(completion: .finished)
+                }
+            } catch {
+                self.subscriber?.receive(completion: .failure(error))
+            }
+        }
+    }
+
+    func cancel() {
+        subscriber = nil
+        operation = nil
+        task?.cancel()
+        task = nil
+    }
+}

KMPNativeCoroutinesRxSwift/Single.swift

@@ -17,6 +17,29 @@ public func createSingle<Result, Failure: Error, Unit>(
     return createSingleImpl(for: nativeSuspend)
 }
 
+/// This function provides source compatibility during the migration to Swift export.
+///
+/// You should migrate away from this function once you have fully migrated to Swift export.
+@available(*, deprecated, message: "Kotlin Coroutines are supported by Swift export")
+@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
+public func createSingle<Result>(
+    for operation: @escaping () async throws -> Result
+) -> Single<Result> {
+    return Single.deferred {
+        return Single.create { observer in
+            let task = Task {
+                do {
+                    let result = try await operation()
+                    observer(.success(result))
+                } catch {
+                    observer(.failure(error))
+                }
+            }
+            return Disposables.create { task.cancel() }
+        }
+    }
+}
+
 /// Creates a `Single` for the provided `NativeSuspend`.
 /// - Parameter nativeSuspend: The native suspend function to await.
 /// - Returns: A single that either finishes with a single value or fails with an error.

SWIFT_EXPORT.md

@@ -31,6 +31,13 @@ For now the plugin just clones your original functions and properties to prevent
 **Temporary workaround:**  
 You should disable any relevant code in Swift if you would like to try Swift export.
 
+## 🚨 `@Throws` suspend functions are unsupported
+
+Throwing suspend functions aren't supported yet.
+
+KMP-NativeCoroutines behaves as if a `@Throws(Exception::class)` annotation was added to all suspend functions.
+Since throwing suspend functions aren't supported yet, any exception will currently cause a fatal crash.
+
 ## ⚠️ `@ObjCName` is ignored
 
 The `@ObjCName` annotation is (currently) ignored by Swift export.  

build.gradle.kts

@@ -13,7 +13,7 @@ buildscript {
 
 allprojects {
     group = "com.rickclephas.kmp"
-    version = "1.0.0-ALPHA-48"
+    version = "1.0.0-ALPHA-48-kotlin-2.3.0-Beta2"
 }
 
 apiValidation {

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.2.21"
+kotlin = "2.3.0-Beta2"
 kotlin-idea = "2.2.0-ij251-78"
 kotlinx-coroutines = "1.10.1"
 kotlinx-binary-compatibility-validator = "0.16.3"

kmp-nativecoroutines-compiler-embeddable/api/kmp-nativecoroutines-compiler-embeddable.api

@@ -7,6 +7,7 @@ public final class com/rickclephas/kmp/nativecoroutines/compiler/KmpNativeCorout
 
 public final class com/rickclephas/kmp/nativecoroutines/compiler/KmpNativeCoroutinesCompilerPluginRegistrar : org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar {
 	public fun <init> ()V
+	public fun getPluginId ()Ljava/lang/String;
 	public fun getSupportsK2 ()Z
 	public fun registerExtensions (Lorg/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar$ExtensionStorage;Lorg/jetbrains/kotlin/config/CompilerConfiguration;)V
 }
@@ -104,6 +105,7 @@ public final class com/rickclephas/kmp/nativecoroutines/compiler/config/Suffixes
 
 public final class com/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport : java/lang/Enum {
 	public static final field NO_FUNC_RETURN_TYPES Lcom/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport;
+	public static final field NO_THROWS_SUSPEND_FUNC Lcom/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport;
 	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lcom/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport;
 	public static fun values ()[Lcom/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport;

kmp-nativecoroutines-compiler/api/kmp-nativecoroutines-compiler.api

@@ -7,6 +7,7 @@ public final class com/rickclephas/kmp/nativecoroutines/compiler/KmpNativeCorout
 
 public final class com/rickclephas/kmp/nativecoroutines/compiler/KmpNativeCoroutinesCompilerPluginRegistrar : org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar {
 	public fun <init> ()V
+	public fun getPluginId ()Ljava/lang/String;
 	public fun getSupportsK2 ()Z
 	public fun registerExtensions (Lorg/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar$ExtensionStorage;Lorg/jetbrains/kotlin/config/CompilerConfiguration;)V
 }
@@ -104,6 +105,7 @@ public final class com/rickclephas/kmp/nativecoroutines/compiler/config/Suffixes
 
 public final class com/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport : java/lang/Enum {
 	public static final field NO_FUNC_RETURN_TYPES Lcom/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport;
+	public static final field NO_THROWS_SUSPEND_FUNC Lcom/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport;
 	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lcom/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport;
 	public static fun values ()[Lcom/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport;

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/KmpNativeCoroutinesCompilerPluginRegistrar.kt

@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
 @OptIn(ExperimentalCompilerApi::class)
 public class KmpNativeCoroutinesCompilerPluginRegistrar: CompilerPluginRegistrar() {
 
+    override val pluginId: String = "com.rickclephas.kmp.nativecoroutines"
     override val supportsK2: Boolean = true
 
     override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/config/SwiftExport.kt

@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.utils.filterToSetOrEmpty
 
 public enum class SwiftExport {
     NO_FUNC_RETURN_TYPES,
+    NO_THROWS_SUSPEND_FUNC,
 }
 
 public val SWIFT_EXPORT: ConfigOptionWithDefault<Set<SwiftExport>> =

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/codegen/NativeFunction.kt

@@ -84,7 +84,10 @@ internal fun FirExtension.buildNativeFunction(
         if (annotation.shouldRefineInSwift) {
             annotations.add(buildAnnotation(ClassIds.shouldRefineInSwift))
         }
-        if (SwiftExport.NO_FUNC_RETURN_TYPES in swiftExport && callableSignature.isSuspend) {
+        if (SwiftExport.NO_FUNC_RETURN_TYPES in swiftExport &&
+            SwiftExport.NO_THROWS_SUSPEND_FUNC !in swiftExport &&
+            callableSignature.isSuspend
+        ) {
             annotations.add(buildThrowsAnnotation(ClassIds.exception))
         }
 

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/fir/extensions/KmpNativeCoroutinesDeclarationGenerationExtension.kt

@@ -5,6 +5,7 @@ import com.rickclephas.kmp.nativecoroutines.compiler.fir.codegen.buildNativeFunc
 import com.rickclephas.kmp.nativecoroutines.compiler.fir.codegen.buildNativeProperty
 import com.rickclephas.kmp.nativecoroutines.compiler.fir.codegen.buildSharedFlowReplayCacheProperty
 import com.rickclephas.kmp.nativecoroutines.compiler.fir.codegen.buildStateFlowValueProperty
+import com.rickclephas.kmp.nativecoroutines.compiler.utils.FqNames
 import com.rickclephas.kmp.nativecoroutines.compiler.utils.NativeCoroutinesAnnotation
 import com.rickclephas.kmp.nativecoroutines.compiler.utils.NativeCoroutinesAnnotation.NativeCoroutines
 import com.rickclephas.kmp.nativecoroutines.compiler.utils.NativeCoroutinesAnnotation.NativeCoroutinesIgnore
@@ -19,6 +20,7 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.DirectDeclarationsAccess
 import org.jetbrains.kotlin.fir.declarations.utils.isExpect
 import org.jetbrains.kotlin.fir.extensions.*
+import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate
 import org.jetbrains.kotlin.fir.extensions.predicate.LookupPredicate
 import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
 import org.jetbrains.kotlin.fir.scopes.getFunctions
@@ -41,9 +43,13 @@ internal class KmpNativeCoroutinesDeclarationGenerationExtension(
     private val lookupPredicate = LookupPredicate.AnnotatedWith(
         NativeCoroutinesAnnotation.entries.map { it.fqName }.toSet()
     )
+    private val objcExportPredicate = DeclarationPredicate.AnnotatedWith(
+        setOf(FqNames.nativeCoroutinesObjCExport)
+    )
 
     override fun FirDeclarationPredicateRegistrar.registerPredicates() {
         register(lookupPredicate)
+        register(objcExportPredicate)
     }
 
     override fun getCallableNamesForClass(
@@ -102,6 +108,7 @@ internal class KmpNativeCoroutinesDeclarationGenerationExtension(
 
     private fun getAnnotationForSymbol(symbol: FirCallableSymbol<*>): NativeCoroutinesAnnotation? {
         if (symbol.rawStatus.isOverride || symbol.isExpect) return null
+        if (swiftExport.isNotEmpty() && session.predicateBasedProvider.matches(objcExportPredicate, symbol)) return null
         return predicates.entries.singleOrNull { (_, predicate) ->
             session.predicateBasedProvider.matches(predicate, symbol)
         }?.key

kmp-nativecoroutines-compiler/src/main/kotlin/com/rickclephas/kmp/nativecoroutines/compiler/utils/FqNames.kt

@@ -26,4 +26,6 @@ internal object FqNames {
 
     val observableViewModel = FqName("com.rickclephas.kmp.observableviewmodel.ViewModel")
     val androidxViewModel = FqName("androidx.lifecycle.ViewModel")
+
+    val nativeCoroutinesObjCExport = FqName("com.rickclephas.kmp.nativecoroutines.sample.NativeCoroutinesObjCExport")
 }

kmp-nativecoroutines-compiler/src/test/generated/com/rickclephas/kmp/nativecoroutines/compiler/runners/FirLightTreeCodegenTestGenerated.java

@@ -4,7 +4,6 @@
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TargetBackend;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -19,7 +18,7 @@
 public class FirLightTreeCodegenTestGenerated extends AbstractFirLightTreeCodegenTest {
   @Test
   public void testAllFilesPresentInCodegen() {
-    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("src/testData/codegen"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kt$"), TargetBackend.JVM_IR, true);
+    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("src/testData/codegen"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kt$"), true);
   }
 
   @Test
@@ -58,7 +57,7 @@ public void testViewmodelscope() {
   public class Swift1 {
     @Test
     public void testAllFilesPresentInSwift1() {
-      KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("src/testData/codegen/swift1"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kt$"), TargetBackend.JVM_IR, true);
+      KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("src/testData/codegen/swift1"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kt$"), true);
     }
 
     @Test
@@ -91,4 +90,44 @@ public void testViewmodelscope() {
       runTest("src/testData/codegen/swift1/viewmodelscope.kt");
     }
   }
+
+  @Nested
+  @TestMetadata("src/testData/codegen/swift3")
+  @TestDataPath("$PROJECT_ROOT")
+  public class Swift3 {
+    @Test
+    public void testAllFilesPresentInSwift3() {
+      KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("src/testData/codegen/swift3"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kt$"), true);
+    }
+
+    @Test
+    @TestMetadata("annotations.kt")
+    public void testAnnotations() {
+      runTest("src/testData/codegen/swift3/annotations.kt");
+    }
+
+    @Test
+    @TestMetadata("coroutinescope.kt")
+    public void testCoroutinescope() {
+      runTest("src/testData/codegen/swift3/coroutinescope.kt");
+    }
+
+    @Test
+    @TestMetadata("functions.kt")
+    public void testFunctions() {
+      runTest("src/testData/codegen/swift3/functions.kt");
+    }
+
+    @Test
+    @TestMetadata("properties.kt")
+    public void testProperties() {
+      runTest("src/testData/codegen/swift3/properties.kt");
+    }
+
+    @Test
+    @TestMetadata("viewmodelscope.kt")
+    public void testViewmodelscope() {
+      runTest("src/testData/codegen/swift3/viewmodelscope.kt");
+    }
+  }
 }