Merge pull request #4 from GuilhE/feature/swift-export

GuilhE · web-flow · commit 42596cabaa05 · 2025-10-28T17:20:06.000Z
Swift Export - Kotlin 2.3.0
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.3.0-Beta2-1.10.0-alpha03]
+
+- Kotlin 2.3.0-Beta2
+
+---
+
+## [2.3.0-Beta2-91-1.10.0-alpha03]
+
+- Kotlin 2.3.0-Beta2-91
+- CMP 1.10.0-alpha03
+- KSP 2.3.0
+
+---
+
 ## [2.2.21-1.9.1]
 
 - Kotlin 2.0.21
@@ -8,6 +22,12 @@
 
 ---
 
+## [2.3.0-Beta1-1.9.0]
+
+- Kotlin 2.3.0-Beta1
+
+---
+
 ## [2.2.20-1.9.0]
 
 - CMP 1.9.0
diff --git a/CHANGELOG_PLUGIN.md b/CHANGELOG_PLUGIN.md
@@ -1,11 +1,35 @@
 # Changelog
 
+## [2.3.0-Beta2-1.10.0-alpha03]
+
+- Compatible with 2.3.0-Beta2-1.10.0-alpha03
+
+---
+
+## [2.3.0-Beta2-91-1.10.0-alpha03]
+
+- Compatible with 2.3.0-Beta2-91-1.10.0-alpha03
+
+---
+
 ## [2.2.21-1.9.1]
 
 - Compatible with 2.2.21-1.9.1
 
 ---
 
+## [2.3.0-Beta1-1.9.0]
+
+- Compatible with 2.3.0-Beta1-1.9.0
+
+---
+
+## [2.3.0-dev-5897-1.9.0]
+
+- Compatible with 2.3.0-dev-5897-1.9.0
+
+---
+
 ## [2.2.20-1.9.0-rc01]
 
 - Compatible with 2.2.20-1.9.0-rc01
diff --git a/README.md b/README.md
@@ -4,10 +4,9 @@
 
 KSP library and Gradle plugin for generating `ComposeUIViewController` and `UIViewControllerRepresentable` files when using [Compose Multiplatform](https://www.jetbrains.com/lp/compose-multiplatform/) for iOS.
 
-| Version                                                                                                                                                                                                                                             |     Kotlin     |  KSP  | Compose Multiplatform | Xcode  |
-|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------:|:-----:|:---------------------:|:------:|
-| `2.2.21-1.9.1`                                                                                                                                                                                                                                      |     2.2.21     | 2.3.0 |         1.9.1         | 26.0.0 |
-| [![Gradle Plugin Portal Version](https://img.shields.io/gradle-plugin-portal/v/io.github.guilhe.kmp.plugin-composeuiviewcontroller?strategy=latestProperty)](https://plugins.gradle.org/plugin/io.github.guilhe.kmp.plugin-composeuiviewcontroller) | 2.3.0-Beta2-91 | 2.3.0 |    1.10.0-alpha03     | 26.0.0 |
+| Version                                                                                                                                                                                                                                             |   Kotlin    |  KSP  | Compose Multiplatform | Xcode  |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------:|:-----:|:---------------------:|:------:|
+| [![Gradle Plugin Portal Version](https://img.shields.io/gradle-plugin-portal/v/io.github.guilhe.kmp.plugin-composeuiviewcontroller?strategy=latestProperty)](https://plugins.gradle.org/plugin/io.github.guilhe.kmp.plugin-composeuiviewcontroller) | 2.3.0-Beta2 | 2.3.0 |    1.10.0-alpha03     | 26.0.0 |
 
 [![Android Weekly](https://androidweekly.net/issues/issue-583/badge)](https://androidweekly.net/issues/issue-583) [![Featured in Kotlin Weekly - Issue #378](https://img.shields.io/badge/Featured_in_Kotlin_Weekly-Issue_%23378-7878b4)](https://mailchi.mp/kotlinweekly/kotlin-weekly-378) [![Featured in Kotlin Weekly - Issue #389](https://img.shields.io/badge/Featured_in_Kotlin_Weekly-Issue_%23389-7878b4)](https://mailchi.mp/kotlinweekly/kotlin-weekly-389) <a href="https://jetc.dev/issues/177.html"><img src="https://img.shields.io/badge/As_Seen_In-jetc.dev_Newsletter_Issue_%23177-blue?logo=Jetpack+Compose&amp;logoColor=white" alt="As Seen In - jetc.dev Newsletter Issue #177"></a> <a href="https://jetc.dev/issues/188.html"><img src="https://img.shields.io/badge/As_Seen_In-jetc.dev_Newsletter_Issue_%23188-blue?logo=Jetpack+Compose&amp;logoColor=white" alt="As Seen In - jetc.dev Newsletter Issue #188"></a>
 
@@ -44,7 +43,7 @@ ComposeUiViewController {
 }
 ```
 
-With this setup, all necessary configurations are automatically applied. You only need to adjust the `ComposeUiViewController` block to match your 
+With this setup, all necessary configurations are automatically applied. You only need to adjust the `ComposeUiViewController` block to match your
 project settings (e.g. `iosAppName` and `targetName`). If you wish to change the default values, you can configure its parameters:
 
 <details><summary>Parameters available</summary>
@@ -61,14 +60,12 @@ project settings (e.g. `iosAppName` and `targetName`). If you wish to change the
 
 ## Swift Export
 To enable Swift Export support, just follow the official [documentation](https://kotlinlang.org/docs/native-swift-export.html).  
-Until the stable release of Kotlin 2.3.0, use the experimental plugin chanel `2.3.0-*`.
 
-> [!IMPORTANT] 
-> The following steps are recommended when switching between modes:
-> 1. Change `embedAndSignAppleFrameworkForXcode` to `embedSwiftExportForXcode` in your `project.pbxproj` or vice-versa;
-> 2. Delete the `Representables` folder inside your `iosApp` using Xcode (if exists);
-> 3. Delete the `Derived Data`using Xcode or DevCleaner app;
-> 4. Run `./gradlew clean --no-build-cache`.
+> [!IMPORTANT]
+> When switching between modes - `embedAndSignAppleFrameworkForXcode` to `embedSwiftExportForXcode` or vice-versa - follow this steps:
+> 1. Delete the `Representables` folder inside your `iosApp` using Xcode;
+> 2. Delete the `Derived Data`using Xcode or DevCleaner app;
+> 3. Run `./gradlew clean --no-build-cache`.
 
 ## Code generation
 
@@ -228,4 +225,4 @@ of the License at
 
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
-the License.
+the License.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
 
 allprojects {
     group = "com.github.guilhe.kmp"
-    version = "2.2.21-1.9.1"
+    version = "2.3.0-Beta2-1.10.0-alpha03"
 }
 
 tasks.register("publishLibraryModules") {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
 
-kotlin = "2.2.21"
+kotlin = "2.3.0-Beta2"
 ksp = "2.3.0"
-kotlinCompose = "1.9.1"
+kotlinCompose = "1.10.0-alpha03"
 kotlinxSerialization = "1.9.0"
-kotlinxSerializationPlugin = "2.2.21"
+kotlinxSerializationPlugin = "2.3.0-Beta2"
 dokka = "2.1.0-Beta"
 gradlePublish = "1.3.1"
 compileTesting = "0.8.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Aug 31 12:49:13 WEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kmp-composeuiviewcontroller-gradle-plugin/build.gradle.kts b/kmp-composeuiviewcontroller-gradle-plugin/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     testImplementation(libs.test.kotlin)
 }
 
-version = "2.2.21-1.9.1"
+version = "2.3.0-Beta2-1.10.0-alpha03"
 group = "io.github.guilhe.kmp"
 
 gradlePlugin {
diff --git a/kmp-composeuiviewcontroller-gradle-plugin/src/main/kotlin/com/github/guilhe/kmp/composeuiviewcontroller/gradle/KmpComposeUIViewControllerPlugin.kt b/kmp-composeuiviewcontroller-gradle-plugin/src/main/kotlin/com/github/guilhe/kmp/composeuiviewcontroller/gradle/KmpComposeUIViewControllerPlugin.kt
@@ -290,7 +290,7 @@ public class KmpComposeUIViewControllerPlugin : Plugin<Project> {
         listOf(iosAppFolderName, iosAppName, targetName, autoExport, exportFolderName)
 
     internal companion object {
-        private const val VERSION_LIBRARY = "2.2.21-1.9.1"
+        private const val VERSION_LIBRARY = "2.3.0-Beta2-1.10.0-alpha03"
         private const val LOG_TAG = "KmpComposeUIViewControllerPlugin"
         internal const val PLUGIN_KMP = "org.jetbrains.kotlin.multiplatform"
         internal const val PLUGIN_KSP = "com.google.devtools.ksp"
diff --git a/sample/gradle/wrapper/gradle-wrapper.properties b/sample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Sep 01 22:06:55 WEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/iosApp/Gradient.xcodeproj/project.pbxproj b/sample/iosApp/Gradient.xcodeproj/project.pbxproj
@@ -10,8 +10,8 @@
 		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
 		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
 		2152FB042600AC8F00CF470E /* GradientApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* GradientApp.swift */; };
+		4482BA00ED3320AEC50E6842 /* GradientScreenUIViewControllerRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86576E91AA91E3C646602F11 /* GradientScreenUIViewControllerRepresentable.swift */; };
 		7555FF83242A565900829871 /* SharedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* SharedView.swift */; };
-		EEBFD1D25DED7A5A93F1AEA2 /* GradientScreenUIViewControllerRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C5CCD70AE92D3B0FAABE1FB /* GradientScreenUIViewControllerRepresentable.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -31,10 +31,10 @@
 		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		2152FB032600AC8F00CF470E /* GradientApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientApp.swift; sourceTree = "<group>"; };
-		2C5CCD70AE92D3B0FAABE1FB /* GradientScreenUIViewControllerRepresentable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GradientScreenUIViewControllerRepresentable.swift; path = Representables/GradientScreenUIViewControllerRepresentable.swift; sourceTree = "<group>"; };
 		7555FF7B242A565900829871 /* Gradient.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Gradient.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7555FF82242A565900829871 /* SharedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedView.swift; sourceTree = "<group>"; };
 		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		86576E91AA91E3C646602F11 /* GradientScreenUIViewControllerRepresentable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GradientScreenUIViewControllerRepresentable.swift; path = Representables/GradientScreenUIViewControllerRepresentable.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -96,7 +96,7 @@
 		FB554F50FFDB9E360558BC9D /* Representables */ = {
 			isa = PBXGroup;
 			children = (
-				2C5CCD70AE92D3B0FAABE1FB /* GradientScreenUIViewControllerRepresentable.swift */,
+				86576E91AA91E3C646602F11 /* GradientScreenUIViewControllerRepresentable.swift */,
 			);
 			name = Representables;
 			sourceTree = "<group>";
@@ -187,7 +187,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedSwiftExportForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -198,7 +198,7 @@
 			files = (
 				2152FB042600AC8F00CF470E /* GradientApp.swift in Sources */,
 				7555FF83242A565900829871 /* SharedView.swift in Sources */,
-				EEBFD1D25DED7A5A93F1AEA2 /* GradientScreenUIViewControllerRepresentable.swift in Sources */,
+				4482BA00ED3320AEC50E6842 /* GradientScreenUIViewControllerRepresentable.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/sample/iosApp/Gradient/SharedView.swift b/sample/iosApp/Gradient/SharedView.swift
@@ -1,4 +1,5 @@
 import Composables
+import Models
 import SwiftUI
 
 struct SharedView: View {
@@ -21,7 +22,7 @@ struct SharedView: View {
     
     var body: some View {
         GradientScreenRepresentable(state: $screenState, randomize: { millis in
-            print("Shuffled at \(dateFormatter.string(from: dateFromMilliseconds(milliseconds: Int64(truncating: millis))))", terminator: "\n")
+            print("Shuffled at \(dateFormatter.string(from: dateFromMilliseconds(milliseconds: Int64(truncating: millis as NSNumber))))", terminator: "\n")
             let randomColors = colorValues.shuffled().prefix(2)
             screenState = ScreenState(
                 startColor: randomColors.first!,
diff --git a/sample/iosApp/Representables/GradientScreenUIViewControllerRepresentable.swift b/sample/iosApp/Representables/GradientScreenUIViewControllerRepresentable.swift
@@ -1,16 +1,17 @@
 // This file is auto-generated by KSP. Do not edit manually.
 import SwiftUI
+import Models
 import Composables
 
 public struct GradientScreenRepresentable: UIViewControllerRepresentable {
     @Binding var state: ScreenState
-    let randomize: (KotlinLong) -> Void
+    let randomize: (Int64) -> Void
 
     public func makeUIViewController(context: Context) -> UIViewController {
-        GradientScreenUIViewController().make(randomize: randomize)
+        GradientScreenUIViewController.shared.make(randomize: randomize)
     }
 
     public func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
-        GradientScreenUIViewController().update(state: state)
+        GradientScreenUIViewController.shared.update(state: state)
     }
 }
diff --git a/sample/shared-models/src/commonMain/kotlin/com/sample/models/Models.kt b/sample/shared-models/src/commonMain/kotlin/com/sample/models/Models.kt
@@ -3,7 +3,7 @@ package com.sample.models
 import androidx.compose.ui.graphics.Color
 import kotlin.experimental.ExperimentalObjCRefinement
 
-data class ScreenStateExternal(val startColor: Long, val endColor: Long) {
+data class ScreenState(val startColor: Long, val endColor: Long) {
     @OptIn(ExperimentalObjCRefinement::class)
     @HiddenFromObjC
     val colors: List<Color> = listOf(Color(startColor), Color(endColor))
diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts
@@ -18,16 +18,14 @@ kotlin {
     iosArm64()
     iosSimulatorArm64()
     @OptIn(ExperimentalSwiftExportDsl::class)
-//    swiftExport {
-//        moduleName = "Composables"
-//        flattenPackage = "com.sample.shared"
-//        export(projects.sharedModels) {
-//            moduleName = "Models"
-//            flattenPackage = "com.sample.models"
-//        }
-//    }
-
-    listOf(iosArm64(), iosSimulatorArm64()).forEach { target -> target.binaries.framework { baseName = "Composables" } }
+    swiftExport {
+        moduleName = "Composables"
+        flattenPackage = "com.sample.shared"
+        export(projects.sharedModels) {
+            moduleName = "Models"
+            flattenPackage = "com.sample.models"
+        }
+    }
 
     sourceSets {
         commonMain.dependencies {
diff --git a/sample/shared/src/iosMain/kotlin/com/sample/shared/Screens.kt b/sample/shared/src/iosMain/kotlin/com/sample/shared/Screens.kt
@@ -8,21 +8,14 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.graphics.Color
 import com.github.guilhe.kmp.composeuiviewcontroller.ComposeUIViewController
 import com.github.guilhe.kmp.composeuiviewcontroller.ComposeUIViewControllerState
+import com.sample.models.ScreenState
 import platform.Foundation.NSDate
 import platform.Foundation.timeIntervalSince1970
-import kotlin.experimental.ExperimentalObjCRefinement
 
 private fun getCurrentMillis(): Long = NSDate().timeIntervalSince1970.toLong() * 1000
 
-data class ScreenState(val startColor: Long, val endColor: Long) {
-    @OptIn(ExperimentalObjCRefinement::class)
-    @HiddenFromObjC
-    val colors: List<Color> = listOf(Color(startColor), Color(endColor))
-}
-
 @ComposeUIViewController
 @Composable
 internal fun GradientScreen(@ComposeUIViewControllerState state: ScreenState, randomize: (Long) -> Unit) {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ buildscript {`
`15`	`15`
`16`	`16`	`allprojects {`
`17`	`17`	`group = "com.github.guilhe.kmp"`
`18`		`- version = "2.2.21-1.9.1"`
	`18`	`+ version = "2.3.0-Beta2-1.10.0-alpha03"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`tasks.register("publishLibraryModules") {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencies {`
`27`	`27`	`testImplementation(libs.test.kotlin)`
`28`	`28`	`}`
`29`	`29`
`30`		`-version = "2.2.21-1.9.1"`
	`30`	`+version = "2.3.0-Beta2-1.10.0-alpha03"`
`31`	`31`	`group = "io.github.guilhe.kmp"`
`32`	`32`
`33`	`33`	`gradlePlugin {`