Merge pull request #251 from rickclephas/feature/kotlin-2.4.0

Kotlin 2.4.0

Author: rickclephas

.idea/kotlinc.xml

@@ -31,35 +31,9 @@ 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.
 
-## ⚠️ `@ObjCName` is ignored
-
-The `@ObjCName` annotation is (currently) ignored by Swift export.  
-This prevents KMP-NativeCoroutines from reusing your original function or property name.
-
-**Temporary workaround:**  
-You should update your Swift code with the `Native` name suffix in order to access the generated declarations.
-
 # Enabling Swift export
 
-To enable Swift export with KMP-NativeCoroutines you start by following the
-[official documentation](https://kotlinlang.org/docs/native-swift-export.html)
-and enabling the experimental coroutines support:
-```kotlin
-// build.gradle.kts
-import org.jetbrains.kotlin.gradle.plugin.mpp.apple.swiftexport.SWIFT_EXPORT_COROUTINES_SUPPORT_TURNED_ON
-
-kotlin {
-    // ...
-    swiftExport {
-        // ...
-        configure {
-            settings.put(SWIFT_EXPORT_COROUTINES_SUPPORT_TURNED_ON, "true")
-        }
-    }
-}
-```
-
-Once Swift export is enabled you'll need to activate the Swift export compatibility mode:
+To enable Swift export with KMP-NativeCoroutines you'll need to activate the Swift export compatibility mode:
 ```kotlin
 // build.gradle.kts
 nativeCoroutines {
@@ -72,15 +46,13 @@ nativeCoroutines {
 Only some coroutines related code can be used when Swift export is enabled.
 
 > [!NOTE]
-> You can also use the generated properties for the `StateFlow.value` and `SharedFlow.replayCache` values,
-> but keep in mind the `@ObjCName` limitation. 
+> You can also use the generated properties for the `StateFlow.value` and `SharedFlow.replayCache` values.
 
 ## Suspend functions
 
-You can use suspend functions as async functions in Swift (but keep in mind the limitations):
-```diff
-- let letters = try await asyncFunction(for: randomLettersGenerator.getRandomLetters(throwException: throwException))
-+ let letters = try await asyncFunction(for: randomLettersGenerator.getRandomLettersNative(throwException: throwException))
+You can use suspend functions as async functions in Swift without any changes:
+```swift
+let letters = try await asyncFunction(for: randomLettersGenerator.getRandomLetters(throwException: throwException))
 ```
 
 > [!NOTE]
@@ -90,5 +62,5 @@ You can use suspend functions as async functions in Swift (but keep in mind the
 For Combine and RxSwift there are helper functions available, e.g.:
 ```diff
 - let future = createFuture(for: randomLettersGenerator.getRandomLetters(throwException: throwException))
-+ let future = createFuture(for: { await self.randomLettersGenerator.getRandomLettersNative(throwException: throwException) })
++ let future = createFuture(for: { await self.randomLettersGenerator.getRandomLetters(throwException: throwException) })
 ```

SWIFT_EXPORT.md

@@ -13,7 +13,7 @@ buildscript {
 
 allprojects {
     group = "com.rickclephas.kmp"
-    version = "1.0.3"
+    version = "1.0.3-kotlin-2.4.0-Beta2"
 }
 
 apiValidation {

build.gradle.kts

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.3.21"
+kotlin = "2.4.0"
 kotlin-idea = "2.4.0-dev-2631"
 kotlinx-coroutines = "1.10.1"
 kotlinx-binary-compatibility-validator = "0.16.3"

gradle/libs.versions.toml

@@ -41,9 +41,6 @@ internal fun FirExtension.buildValueParametersCopy(
             .let(substitutor::substituteOrSelf)
             .toFirResolvedTypeRef()
 
-        @OptIn(SymbolInternals::class)
-        deprecationsProvider = parameter.fir.deprecationsProvider
-
         // TODO: support defaultValue once exported to ObjC
 
         annotations.addAll(buildAnnotationsCopy(parameter.resolvedAnnotationsWithClassIds))

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

@@ -16,6 +16,10 @@
 @TestMetadata("src/testData/codegen")
 @TestDataPath("$PROJECT_ROOT")
 public class FirLightTreeCodegenTestGenerated extends AbstractFirLightTreeCodegenTest {
+  private void run(String fileName) {
+    runTest("src/testData/codegen/" + fileName);
+  }
+
   @Test
   public void testAllFilesPresentInCodegen() {
     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("src/testData/codegen"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kt$"), true);
@@ -24,37 +28,41 @@ public void testAllFilesPresentInCodegen() {
   @Test
   @TestMetadata("annotations.kt")
   public void testAnnotations() {
-    runTest("src/testData/codegen/annotations.kt");
+    run("annotations.kt");
   }
 
   @Test
   @TestMetadata("coroutinescope.kt")
   public void testCoroutinescope() {
-    runTest("src/testData/codegen/coroutinescope.kt");
+    run("coroutinescope.kt");
   }
 
   @Test
   @TestMetadata("functions.kt")
   public void testFunctions() {
-    runTest("src/testData/codegen/functions.kt");
+    run("functions.kt");
   }
 
   @Test
   @TestMetadata("properties.kt")
   public void testProperties() {
-    runTest("src/testData/codegen/properties.kt");
+    run("properties.kt");
   }
 
   @Test
   @TestMetadata("viewmodelscope.kt")
   public void testViewmodelscope() {
-    runTest("src/testData/codegen/viewmodelscope.kt");
+    run("viewmodelscope.kt");
   }
 
   @Nested
   @TestMetadata("src/testData/codegen/swift1")
   @TestDataPath("$PROJECT_ROOT")
   public class Swift1 {
+    private void run(String fileName) {
+      runTest("src/testData/codegen/swift1/" + fileName);
+    }
+
     @Test
     public void testAllFilesPresentInSwift1() {
       KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("src/testData/codegen/swift1"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kt$"), true);
@@ -63,38 +71,42 @@ public void testAllFilesPresentInSwift1() {
     @Test
     @TestMetadata("annotations.kt")
     public void testAnnotations() {
-      runTest("src/testData/codegen/swift1/annotations.kt");
+      run("annotations.kt");
     }
 
     @Test
     @TestMetadata("coroutinescope.kt")
     public void testCoroutinescope() {
-      runTest("src/testData/codegen/swift1/coroutinescope.kt");
+      run("coroutinescope.kt");
     }
 
     @Test
     @TestMetadata("functions.kt")
     public void testFunctions() {
-      runTest("src/testData/codegen/swift1/functions.kt");
+      run("functions.kt");
     }
 
     @Test
     @TestMetadata("properties.kt")
     public void testProperties() {
-      runTest("src/testData/codegen/swift1/properties.kt");
+      run("properties.kt");
     }
 
     @Test
     @TestMetadata("viewmodelscope.kt")
     public void testViewmodelscope() {
-      runTest("src/testData/codegen/swift1/viewmodelscope.kt");
+      run("viewmodelscope.kt");
     }
   }
 
   @Nested
   @TestMetadata("src/testData/codegen/swift3")
   @TestDataPath("$PROJECT_ROOT")
   public class Swift3 {
+    private void run(String fileName) {
+      runTest("src/testData/codegen/swift3/" + fileName);
+    }
+
     @Test
     public void testAllFilesPresentInSwift3() {
       KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("src/testData/codegen/swift3"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kt$"), true);
@@ -103,38 +115,42 @@ public void testAllFilesPresentInSwift3() {
     @Test
     @TestMetadata("annotations.kt")
     public void testAnnotations() {
-      runTest("src/testData/codegen/swift3/annotations.kt");
+      run("annotations.kt");
     }
 
     @Test
     @TestMetadata("coroutinescope.kt")
     public void testCoroutinescope() {
-      runTest("src/testData/codegen/swift3/coroutinescope.kt");
+      run("coroutinescope.kt");
     }
 
     @Test
     @TestMetadata("functions.kt")
     public void testFunctions() {
-      runTest("src/testData/codegen/swift3/functions.kt");
+      run("functions.kt");
     }
 
     @Test
     @TestMetadata("properties.kt")
     public void testProperties() {
-      runTest("src/testData/codegen/swift3/properties.kt");
+      run("properties.kt");
     }
 
     @Test
     @TestMetadata("viewmodelscope.kt")
     public void testViewmodelscope() {
-      runTest("src/testData/codegen/swift3/viewmodelscope.kt");
+      run("viewmodelscope.kt");
     }
   }
 
   @Nested
   @TestMetadata("src/testData/codegen/swift5")
   @TestDataPath("$PROJECT_ROOT")
   public class Swift5 {
+    private void run(String fileName) {
+      runTest("src/testData/codegen/swift5/" + fileName);
+    }
+
     @Test
     public void testAllFilesPresentInSwift5() {
       KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("src/testData/codegen/swift5"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kt$"), true);
@@ -143,31 +159,31 @@ public void testAllFilesPresentInSwift5() {
     @Test
     @TestMetadata("annotations.kt")
     public void testAnnotations() {
-      runTest("src/testData/codegen/swift5/annotations.kt");
+      run("annotations.kt");
     }
 
     @Test
     @TestMetadata("coroutinescope.kt")
     public void testCoroutinescope() {
-      runTest("src/testData/codegen/swift5/coroutinescope.kt");
+      run("coroutinescope.kt");
     }
 
     @Test
     @TestMetadata("functions.kt")
     public void testFunctions() {
-      runTest("src/testData/codegen/swift5/functions.kt");
+      run("functions.kt");
     }
 
     @Test
     @TestMetadata("properties.kt")
     public void testProperties() {
-      runTest("src/testData/codegen/swift5/properties.kt");
+      run("properties.kt");
     }
 
     @Test
     @TestMetadata("viewmodelscope.kt")
     public void testViewmodelscope() {
-      runTest("src/testData/codegen/swift5/viewmodelscope.kt");
+      run("viewmodelscope.kt");
     }
   }
 }