fixup! Support compose resources in native macOS framework in additio…

…n to existing executable support
JetBrains · Nov 29, 2024 · d5c4dc5 · d5c4dc5
1 parent 98fe5ce
commit d5c4dc5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt
@@ -116,6 +116,7 @@ private fun Framework.getClassifier(): String {
 }
 
 internal fun Framework.getSyncResourcesTaskName() = "sync${getClassifier()}ComposeResourcesForIos"
+
 private fun Framework.isCocoapodsFramework() = name.startsWith("pod")
 
 private fun Framework.getFinalResourcesDir(): Provider<Directory> {
@@ -125,10 +126,9 @@ private fun Framework.getFinalResourcesDir(): Provider<Directory> {
     } else {
         providers.environmentVariable("BUILT_PRODUCTS_DIR")
             .zip(
-                providers.environmentVariable("CONTENTS_FOLDER_PATH")
-            ) { builtProductsDir, contentsFolderPath ->
-                val pathSuffix = if (target.isMacTarget()) "/Resources" else ""
-                File("$builtProductsDir/$contentsFolderPath$pathSuffix/$IOS_COMPOSE_RESOURCES_ROOT_DIR").canonicalPath
+                providers.environmentVariable("UNLOCALIZED_RESOURCES_FOLDER_PATH")
+            ) { builtProductsDir, unlocalizedResourcesFolderPath ->
+                File("$builtProductsDir/$unlocalizedResourcesFolderPath/$IOS_COMPOSE_RESOURCES_ROOT_DIR").canonicalPath
             }
             .flatMap {
                 project.objects.directoryProperty().apply { set(File(it)) }
@@ -142,8 +142,11 @@ private fun KotlinNativeTarget.isIosSimulatorTarget(): Boolean =
 private fun KotlinNativeTarget.isIosDeviceTarget(): Boolean =
     konanTarget === KonanTarget.IOS_ARM64
 
+private fun KotlinNativeTarget.isIosTarget(): Boolean =
+    isIosSimulatorTarget() || isIosDeviceTarget()
+
 private fun KotlinNativeTarget.isMacTarget(): Boolean =
     konanTarget === KonanTarget.MACOS_X64 || konanTarget === KonanTarget.MACOS_ARM64
 
 private fun KotlinNativeTarget.isIosOrMacTarget(): Boolean =
-    isIosSimulatorTarget() || isIosDeviceTarget() || isMacTarget()
+    isIosTarget() || isMacTarget()
diff --git a/...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt b/...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
@@ -756,9 +756,9 @@ class ResourcesTest : GradlePluginTestBase() {
                 check.taskSkipped(":prepareComposeResourcesTaskForMacosX64Main")
                 check.taskSkipped(":generateResourceAccessorsForMacosX64Main")
 
-                check.taskSkipped(":syncPodComposeResourcesForMacos")
+                check.taskSkipped(":syncPodComposeResourcesForIos")
             }
-            gradle(":syncPodComposeResourcesForMacos").checks {
+            gradle(":syncPodComposeResourcesForIos").checks {
                 check.taskNoSource(":convertXmlValueResourcesForCommonMain")
                 check.taskSuccessful(":copyNonXmlValueResourcesForCommonMain")
                 check.taskSuccessful(":prepareComposeResourcesTaskForCommonMain")