Plugin update

Author: GuilhE

CHANGELOG_PLUGIN.md

@@ -3,6 +3,7 @@
 ## [2.3.20-Beta2-1.10.0]
 
 - Compatible with 2.3.20-Beta2-1.10.0
+- Plugin now throws when no iOS export configuration is found, instead of defaulting to module name
 
 ---
 

kmp-composeuiviewcontroller-gradle-plugin/src/main/kotlin/com/github/guilhe/kmp/composeuiviewcontroller/gradle/KmpComposeUIViewControllerPlugin.kt

@@ -179,10 +179,7 @@ public class KmpComposeUIViewControllerPlugin : Plugin<Project> {
             }
         }
 
-        // Priority 4: Project name (fallback)
-        val projectModuleName = name.toPascalCase()
-        logger.info("\t> $INFO_MODULE_NAME_BY_PROJECT [$projectModuleName]")
-        return Triple(setOf(projectModuleName), true, flattenConfigured)
+        throw PluginConfigurationException(ERROR_MISSING_FRAMEWORK_CONFIG_FULL)
     }
 
     private fun Project.buildFrameworkPackages(packageNames: Set<String>, frameworkNames: Set<String>): Map<String, Set<String>> {
@@ -300,13 +297,6 @@ public class KmpComposeUIViewControllerPlugin : Plugin<Project> {
         }
     }
 
-    private fun String.toPascalCase(): String {
-        return split("-")
-            .joinToString("") { segment ->
-                segment.replaceFirstChar { it.uppercaseChar() }
-            }
-    }
-
     private fun KotlinTarget.fromIosFamily(): Boolean = this is KotlinNativeTarget && konanTarget.family == Family.IOS
 
     private fun ComposeUiViewControllerParameters.toList() =
@@ -338,9 +328,13 @@ public class KmpComposeUIViewControllerPlugin : Plugin<Project> {
         internal const val PARAM_GROUP = "group_name"
         internal const val ERROR_MISSING_KMP = "$LOG_TAG requires the Kotlin Multiplatform plugin to be applied."
         internal const val ERROR_MISSING_PACKAGE = "Could not determine project's package"
+        internal const val ERROR_MISSING_FRAMEWORK_CONFIG = "No framework configuration found."
+        internal const val ERROR_MISSING_FRAMEWORK_CONFIG_FULL =
+            "$ERROR_MISSING_FRAMEWORK_CONFIG Please configure in the exporting module either:\n" +
+            "\t1. iOS framework baseName, or\n" +
+            "\t2. SwiftExport with moduleName"
         internal const val INFO_MODULE_NAME_BY_FRAMEWORK =
             "SwiftExport is NOT configured, will use all iOS targets' framework baseName as frameworkBaseName:"
         internal const val INFO_MODULE_NAME_BY_SWIFT_EXPORT = "SwiftExport is configured, will use its moduleName:"
-        internal const val INFO_MODULE_NAME_BY_PROJECT = "No configurations found for moduleName. Fallback to project module name:"
     }
 }

kmp-composeuiviewcontroller-gradle-plugin/src/test/kotlin/composeuiviewcontroller/PluginTest.kt

@@ -6,11 +6,11 @@ import com.github.guilhe.kmp.composeuiviewcontroller.common.FILE_NAME_ARGS
 import com.github.guilhe.kmp.composeuiviewcontroller.common.ModuleMetadata
 import com.github.guilhe.kmp.composeuiviewcontroller.common.TEMP_FILES_FOLDER
 import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin
+import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin.Companion.ERROR_MISSING_FRAMEWORK_CONFIG
 import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin.Companion.ERROR_MISSING_KMP
 import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin.Companion.ERROR_MISSING_PACKAGE
 import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin.Companion.FILE_NAME_SCRIPT_TEMP
 import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin.Companion.INFO_MODULE_NAME_BY_FRAMEWORK
-import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin.Companion.INFO_MODULE_NAME_BY_PROJECT
 import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin.Companion.INFO_MODULE_NAME_BY_SWIFT_EXPORT
 import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin.Companion.LIB_ANNOTATIONS_NAME
 import com.github.guilhe.kmp.composeuiviewcontroller.gradle.KmpComposeUIViewControllerPlugin.Companion.LIB_GROUP
@@ -307,7 +307,7 @@ class PluginTest {
     }
 
     @Test
-    fun `Method retrieveFrameworkBaseNamesFromIosTargets handles SwiftExport with fallback to project name as moduleName`() {
+    fun `Method retrieveFrameworkBaseNamesFromIosTargets throws exception when no moduleName exists`() {
         Templates.createCommonMainSource(projectDir, packageName = "com.test")
 
         val buildFile = Templates.writeBuildGradle(
@@ -322,7 +322,6 @@ class PluginTest {
 
                 kotlin {
                     iosSimulatorArm64()
-                    swiftExport {}
                 }
                 """
         )
@@ -331,8 +330,8 @@ class PluginTest {
         val settingsFile = Templates.writeSettingsGradle(projectDir, rootProjectName = "testProject")
         assertTrue(settingsFile.exists())
 
-        val result = Templates.runGradle(projectDir)
-        assertTrue(result.output.contains("$INFO_MODULE_NAME_BY_PROJECT [TestProject]"))
+        val result = Templates.runGradle(projectDir, expectFailure = true)
+        assertTrue(result.output.contains(ERROR_MISSING_FRAMEWORK_CONFIG))
     }
 
     @Test
@@ -394,7 +393,7 @@ class PluginTest {
     }
 
     @Test
-    fun `Method retrieveFrameworkBaseNamesFromIosTargets handles SwiftExport with exported module fallback to project name`() {
+    fun `Method retrieveFrameworkBaseNamesFromIosTargets handles SwiftExport with exported module with explicit moduleName`() {
         val commonFile = Templates.createCommonMainSource(projectDir, packageName = "com.test")
         assertTrue(commonFile.exists())
 
@@ -434,7 +433,8 @@ class PluginTest {
                     swiftExport {
                         moduleName = "DefaultModule"
                         export(projects.abc) {
-                            flattenPackage = "com.123"
+                            moduleName = "AbcModule"
+                            flattenPackage = "com.abc"
                         }
                     }
                 }
@@ -452,7 +452,7 @@ class PluginTest {
 
         val result = Templates.runGradle(projectDir)
         assertTrue(result.output.contains("$INFO_MODULE_NAME_BY_SWIFT_EXPORT [DefaultModule]"))
-        assertTrue(result.output.contains("$INFO_MODULE_NAME_BY_PROJECT [Abc]"))
+        assertTrue(result.output.contains("$INFO_MODULE_NAME_BY_SWIFT_EXPORT [AbcModule]"))
     }
 
     @Test
@@ -550,7 +550,9 @@ class PluginTest {
             
             kotlin {
                 iosSimulatorArm64()
-                swiftExport {}
+                swiftExport {
+                    moduleName = "TestModule"
+                }
             }
         """
         )

sample/build.gradle.kts

@@ -6,5 +6,4 @@ plugins {
 
 tasks.register("exportFrameworkForXcode") {
     dependsOn(":shared:embedAndSignAppleFrameworkForXcode")
-    finalizedBy(":shared-models:embedAndSignAppleFrameworkForXcode")
 }

sample/shared-models/build.gradle.kts

@@ -5,7 +5,9 @@ plugins {
 }
 
 kotlin {
-    listOf(iosArm64(), iosSimulatorArm64()).forEach { target -> target.binaries.framework { baseName = "Models" } }
+    iosArm64()
+    iosSimulatorArm64()
+
     sourceSets {
         commonMain.dependencies {
             implementation(local.kotlinx.collections)