Revert "Resources improvements for native macOS app (#5169)"

This reverts commit 5870305.

components/resources/library/src/macosMain/kotlin/org/jetbrains/compose/resources/ResourceReader.macos.kt

@@ -39,32 +39,12 @@ internal actual fun getPlatformResourceReader(): ResourceReader = object : Resou
     private fun getPathOnDisk(path: String): String {
         val fm = NSFileManager.defaultManager()
         val currentDirectoryPath = fm.currentDirectoryPath
-        val pathFix = getPathWithoutPackage(path)
         return listOf(
-            // Framework binary
-            // todo: support fallback path at bundle root?
-            NSBundle.mainBundle.resourcePath + "/compose-resources/" + path,
-            // Executable binary
             //todo in future bundle resources with app and use all sourceSets (skikoMain, nativeMain)
-            "$currentDirectoryPath/src/macosMain/composeResources/$pathFix",
-            "$currentDirectoryPath/src/macosTest/composeResources/$pathFix",
-            "$currentDirectoryPath/src/commonMain/composeResources/$pathFix",
-            "$currentDirectoryPath/src/commonTest/composeResources/$pathFix"
+            "$currentDirectoryPath/src/macosMain/composeResources/$path",
+            "$currentDirectoryPath/src/macosTest/composeResources/$path",
+            "$currentDirectoryPath/src/commonMain/composeResources/$path",
+            "$currentDirectoryPath/src/commonTest/composeResources/$path"
         ).firstOrNull { p -> fm.fileExistsAtPath(p) }  ?: throw MissingResourceException(path)
     }
-
-    private fun getPathWithoutPackage(path: String): String {
-        // At the moment resources are not bundled when running a macOS executable binary.
-        // As a workaround, load the resources from the actual path on disk. So the
-        // "composeResources/PACKAGE/" prefix must be removed. For example:
-        // "composeResources/chat_mpp.shared.generated.resources/drawable/background.jpg"
-        // Will be transformed into:
-        // "drawable/background.jpg"
-        // In the future when resources are bundled when running macOS executable binary this
-        // workaround is no longer needed.
-        require(path.startsWith("composeResources/")) { "Invalid path: $path" }
-        return path
-            .substringAfter("composeResources/") // remove "composeResources/" part
-            .substringAfter("/") // remove PACKAGE path
-    }
 }

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt

@@ -33,7 +33,7 @@ internal fun Project.configureSyncIosComposeResources(
     }
 
     kotlinExtension.targets.withType(KotlinNativeTarget::class.java).all { nativeTarget ->
-        if (nativeTarget.isIosOrMacTarget()) {
+        if (nativeTarget.isIosTarget()) {
             nativeTarget.binaries.withType(Framework::class.java).all { iosFramework ->
                 val frameworkClassifier = iosFramework.getClassifier()
                 val checkNoSandboxTask = tasks.registerOrConfigure<CheckCanAccessComposeResourcesDirectory>(
@@ -116,7 +116,6 @@ 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> {
@@ -126,9 +125,9 @@ private fun Framework.getFinalResourcesDir(): Provider<Directory> {
     } else {
         providers.environmentVariable("BUILT_PRODUCTS_DIR")
             .zip(
-                providers.environmentVariable("UNLOCALIZED_RESOURCES_FOLDER_PATH")
-            ) { builtProductsDir, unlocalizedResourcesFolderPath ->
-                File("$builtProductsDir/$unlocalizedResourcesFolderPath/$IOS_COMPOSE_RESOURCES_ROOT_DIR").canonicalPath
+                providers.environmentVariable("CONTENTS_FOLDER_PATH")
+            ) { builtProductsDir, contentsFolderPath ->
+                File("$builtProductsDir/$contentsFolderPath/$IOS_COMPOSE_RESOURCES_ROOT_DIR").canonicalPath
             }
             .flatMap {
                 project.objects.directoryProperty().apply { set(File(it)) }
@@ -143,10 +142,4 @@ 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 =
-    isIosTarget() || isMacTarget()
+    isIosSimulatorTarget() || isIosDeviceTarget()

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResourcesTasks.kt

@@ -118,17 +118,7 @@ private fun getRequestedKonanTargetsByXcode(platform: String, archs: List<String
             })
         }
 
-        platform.startsWith("macosx") -> {
-            targets.addAll(archs.map { arch ->
-                when (arch) {
-                    "arm64" -> KonanTarget.MACOS_ARM64
-                    "x86_64" -> KonanTarget.MACOS_X64
-                    else -> error("Unknown macOS arch: '$arch'")
-                }
-            })
-        }
-
-        else -> error("Unknown Apple platform: '$platform'")
+        else -> error("Unknown iOS platform: '$platform'")
     }
 
     return targets.toList()

gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt

@@ -280,13 +280,6 @@ class ResourcesTest : GradlePluginTestBase() {
                         libpath("iossimulatorarm64", "-kotlin_resources.kotlin_resources.zip")
                     )
                     checkResourcesZip(iossimulatorarm64ResZip, resourcesFiles, false)
-
-                    val macosx64ResZip =
-                        file(libpath("macosx64", "-kotlin_resources.kotlin_resources.zip"))
-                    checkResourcesZip(macosx64ResZip, resourcesFiles, false)
-                    val macosarm64ResZip =
-                        file(libpath("macosarm64", "-kotlin_resources.kotlin_resources.zip"))
-                    checkResourcesZip(macosarm64ResZip, resourcesFiles, false)
                 }
                 val jsResZip = file(libpath("js", "-kotlin_resources.kotlin_resources.zip"))
                 checkResourcesZip(jsResZip, resourcesFiles, false)
@@ -307,13 +300,6 @@ class ResourcesTest : GradlePluginTestBase() {
                     ":appModule:iosSimulatorArm64Test"
                 }
                 gradle(iosTask)
-
-                val macosTask = if (currentArch == Arch.X64) {
-                    ":appModule:macosX64Test"
-                } else {
-                    ":appModule:macosArm64Test"
-                }
-                gradle(macosTask)
             }
 
             file("featureModule/src/commonMain/kotlin/me/sample/app/Feature.kt").modify { content ->
@@ -701,95 +687,6 @@ class ResourcesTest : GradlePluginTestBase() {
         }
     }
 
-    @Test
-    fun macosResources() {
-        Assumptions.assumeTrue(currentOS == OS.MacOS)
-        val macosEnv = mapOf(
-            "PLATFORM_NAME" to "macosx",
-            "ARCHS" to "arm64",
-            "CONFIGURATION" to "Debug",
-        )
-        val testEnv = defaultTestEnvironment.copy(
-            additionalEnvVars = macosEnv
-        )
-
-        with(TestProject("misc/macosResources", testEnv)) {
-            gradle(":podspec", "-Pkotlin.native.cocoapods.generate.wrapper=true").checks {
-                assertEqualTextFiles(
-                    file("macosResources.podspec"),
-                    file("expected/macosResources.podspec")
-                )
-                file("build/compose/cocoapods/compose-resources").checkExists()
-            }
-
-            gradle(
-                ":syncFramework",
-                "-Pkotlin.native.cocoapods.platform=${macosEnv["PLATFORM_NAME"]}",
-                "-Pkotlin.native.cocoapods.archs=${macosEnv["ARCHS"]}",
-                "-Pkotlin.native.cocoapods.configuration=${macosEnv["CONFIGURATION"]}",
-                "--dry-run"
-            ).checks {
-                check.taskSkipped(":generateComposeResClass")
-
-                check.taskSkipped(":convertXmlValueResourcesForCommonMain")
-                check.taskSkipped(":copyNonXmlValueResourcesForCommonMain")
-                check.taskSkipped(":prepareComposeResourcesTaskForCommonMain")
-                check.taskSkipped(":generateResourceAccessorsForCommonMain")
-
-                check.taskSkipped(":convertXmlValueResourcesForNativeMain")
-                check.taskSkipped(":copyNonXmlValueResourcesForNativeMain")
-                check.taskSkipped(":prepareComposeResourcesTaskForNativeMain")
-                check.taskSkipped(":generateResourceAccessorsForNativeMain")
-
-                check.taskSkipped(":convertXmlValueResourcesForAppleMain")
-                check.taskSkipped(":copyNonXmlValueResourcesForAppleMain")
-                check.taskSkipped(":prepareComposeResourcesTaskForAppleMain")
-                check.taskSkipped(":generateResourceAccessorsForAppleMain")
-
-                check.taskSkipped(":convertXmlValueResourcesForMacosMain")
-                check.taskSkipped(":copyNonXmlValueResourcesForMacosMain")
-                check.taskSkipped(":prepareComposeResourcesTaskForMacosMain")
-                check.taskSkipped(":generateResourceAccessorsForMacosMain")
-
-                check.taskSkipped(":convertXmlValueResourcesForMacosX64Main")
-                check.taskSkipped(":copyNonXmlValueResourcesForMacosX64Main")
-                check.taskSkipped(":prepareComposeResourcesTaskForMacosX64Main")
-                check.taskSkipped(":generateResourceAccessorsForMacosX64Main")
-
-                check.taskSkipped(":syncPodComposeResourcesForIos")
-            }
-            gradle(":syncPodComposeResourcesForIos").checks {
-                check.taskNoSource(":convertXmlValueResourcesForCommonMain")
-                check.taskSuccessful(":copyNonXmlValueResourcesForCommonMain")
-                check.taskSuccessful(":prepareComposeResourcesTaskForCommonMain")
-                check.taskSkipped(":generateResourceAccessorsForCommonMain")
-
-                check.taskNoSource(":convertXmlValueResourcesForNativeMain")
-                check.taskNoSource(":copyNonXmlValueResourcesForNativeMain")
-                check.taskNoSource(":prepareComposeResourcesTaskForNativeMain")
-                check.taskSkipped(":generateResourceAccessorsForNativeMain")
-
-                check.taskNoSource(":convertXmlValueResourcesForAppleMain")
-                check.taskNoSource(":copyNonXmlValueResourcesForAppleMain")
-                check.taskNoSource(":prepareComposeResourcesTaskForAppleMain")
-                check.taskSkipped(":generateResourceAccessorsForAppleMain")
-
-                check.taskNoSource(":convertXmlValueResourcesForMacosMain")
-                check.taskSuccessful(":copyNonXmlValueResourcesForMacosMain")
-                check.taskSuccessful(":prepareComposeResourcesTaskForMacosMain")
-                check.taskSkipped(":generateResourceAccessorsForMacosMain")
-
-                check.taskNoSource(":convertXmlValueResourcesForMacosX64Main")
-                check.taskNoSource(":copyNonXmlValueResourcesForMacosX64Main")
-                check.taskNoSource(":prepareComposeResourcesTaskForMacosX64Main")
-                check.taskSkipped(":generateResourceAccessorsForMacosX64Main")
-
-                file("build/compose/cocoapods/compose-resources/composeResources/macosresources.generated.resources/drawable/compose-multiplatform.xml").checkExists()
-                file("build/compose/cocoapods/compose-resources/composeResources/macosresources.generated.resources/drawable/icon.xml").checkExists()
-            }
-        }
-    }
-
     @Test
     fun iosTestResources() {
         Assumptions.assumeTrue(currentOS == OS.MacOS)
@@ -805,21 +702,6 @@ class ResourcesTest : GradlePluginTestBase() {
         }
     }
 
-    @Test
-    fun macosTestResources() {
-        Assumptions.assumeTrue(currentOS == OS.MacOS)
-        with(testProject("misc/macosResources")) {
-            gradle(":linkDebugTestMacosX64", "--dry-run").checks {
-                check.taskSkipped(":copyTestComposeResourcesForMacosX64")
-                check.taskSkipped(":linkDebugTestMacosX64")
-            }
-            gradle(":copyTestComposeResourcesForMacosX64").checks {
-                file("build/bin/macosX64/debugTest/compose-resources/composeResources/macosresources.generated.resources/drawable/compose-multiplatform.xml").checkExists()
-                file("build/bin/macosX64/debugTest/compose-resources/composeResources/macosresources.generated.resources/drawable/icon.xml").checkExists()
-            }
-        }
-    }
-
     @Test
     fun checkTestResources() {
         with(testProject("misc/testResources")) {
@@ -832,10 +714,6 @@ class ResourcesTest : GradlePluginTestBase() {
                 check.logContains("Configure test resources for 'iosArm64' target")
                 check.logContains("Configure main resources for 'iosSimulatorArm64' target")
                 check.logContains("Configure test resources for 'iosSimulatorArm64' target")
-                check.logContains("Configure main resources for 'macosX64' target")
-                check.logContains("Configure test resources for 'macosX64' target")
-                check.logContains("Configure main resources for 'macosArm64' target")
-                check.logContains("Configure test resources for 'macosArm64' target")
 
                 check.taskSuccessful(":desktopTest")
             }

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts

@@ -13,8 +13,6 @@ kotlin {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
-    macosX64()
-    macosArm64()
     js { browser() }
     wasmJs { browser() }
 

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts

@@ -22,8 +22,6 @@ kotlin {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
-    macosX64()
-    macosArm64()
     js { browser() }
     wasmJs { browser() }
 

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts

@@ -11,8 +11,6 @@ kotlin {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
-    macosX64()
-    macosArm64()
     js { browser() }
     wasmJs { browser() }
 

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/gradle.properties

@@ -5,4 +5,3 @@ android.useAndroidX=true
 org.jetbrains.compose.experimental.uikit.enabled=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.wasm.enabled=true
-org.jetbrains.compose.experimental.macos.enabled=true