Resources improvements for native macOS app (#5245)

This PR fixes compose resources for native macOS app (see currently
broken chat app using runDebugExecutableMacosArm64).

This PR also adds support for embedding resources into native macOS
framework. Similar to how it works on iOS. This allows using the macOS
compose code in an Xcode project. Just like iOS, using kotlin code as
framwork. Then call the main function from the Xcode project to run the
compose app.

https://github.com/JetBrains/compose-multiplatform/pull/5219
https://github.com/JetBrains/compose-multiplatform/pull/5169

## Testing
- For executable: run chat app using runDebugExecutableMacosArm64
- For framework: Tested by adding macOS support to the iOS Xcode project
in chat app (not in this PR). Can add the sample app if needed. There
were also tests added to verify this.

## Release Notes
N/A

components/gradle.properties

@@ -9,7 +9,7 @@ android.useAndroidX=true
 #Versions
 kotlin.version=2.1.0
 agp.version=8.2.2
-compose.version=1.8.0-alpha01
+compose.version=1.8.0-alpha03
 deploy.version=0.1.0-SNAPSHOT
 
 #Compose

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

@@ -39,12 +39,32 @@ 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/$path",
-            "$currentDirectoryPath/src/macosTest/composeResources/$path",
-            "$currentDirectoryPath/src/commonMain/composeResources/$path",
-            "$currentDirectoryPath/src/commonTest/composeResources/$path"
+            "$currentDirectoryPath/src/macosMain/composeResources/$pathFix",
+            "$currentDirectoryPath/src/macosTest/composeResources/$pathFix",
+            "$currentDirectoryPath/src/commonMain/composeResources/$pathFix",
+            "$currentDirectoryPath/src/commonTest/composeResources/$pathFix"
         ).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/experimental/internal/checkExperimentalTargets.kt

@@ -71,13 +71,16 @@ private fun checkTarget(project: Project, target: KotlinTarget): CheckResult {
 
     project.configurations.forEach { configuration ->
         if (configuration.isCanBeResolved && configuration.name in targetConfigurationNames) {
-            val containsSkikoArtifact = configuration.resolvedConfiguration.resolvedArtifacts.any {
-                it.id.displayName.contains(SKIKO_ARTIFACT_PREFIX)
-            }
-            if (containsSkikoArtifact) {
-                val targetIsDisabled = project.findLocalOrGlobalProperty(targetType.gradlePropertyName).map { it != "true" }
-                if (targetIsDisabled.get()) {
-                    return CheckResult.Fail(targetType)
+            val resolvedConfiguration = configuration.resolvedConfiguration
+            if (!resolvedConfiguration.hasError()) {
+                val containsSkikoArtifact = resolvedConfiguration.resolvedArtifacts.any {
+                    it.id.displayName.contains(SKIKO_ARTIFACT_PREFIX)
+                }
+                if (containsSkikoArtifact) {
+                    val targetIsDisabled = project.findLocalOrGlobalProperty(targetType.gradlePropertyName).map { it != "true" }
+                    if (targetIsDisabled.get()) {
+                        return CheckResult.Fail(targetType)
+                    }
                 }
             }
         }

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.isIosTarget()) {
+        if (nativeTarget.isIosOrMacTarget()) {
             nativeTarget.binaries.withType(Framework::class.java).all { iosFramework ->
                 val frameworkClassifier = iosFramework.getClassifier()
                 val checkNoSandboxTask = tasks.registerOrConfigure<CheckCanAccessComposeResourcesDirectory>(
@@ -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,9 +126,9 @@ private fun Framework.getFinalResourcesDir(): Provider<Directory> {
     } else {
         providers.environmentVariable("BUILT_PRODUCTS_DIR")
             .zip(
-                providers.environmentVariable("CONTENTS_FOLDER_PATH")
-            ) { builtProductsDir, contentsFolderPath ->
-                File("$builtProductsDir/$contentsFolderPath/$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,4 +143,10 @@ private fun KotlinNativeTarget.isIosDeviceTarget(): Boolean =
     konanTarget === KonanTarget.IOS_ARM64
 
 private fun KotlinNativeTarget.isIosTarget(): Boolean =
-    isIosSimulatorTarget() || isIosDeviceTarget()
+    isIosSimulatorTarget() || isIosDeviceTarget()
+
+private fun KotlinNativeTarget.isMacTarget(): Boolean =
+    konanTarget === KonanTarget.MACOS_X64 || konanTarget === KonanTarget.MACOS_ARM64
+
+private fun KotlinNativeTarget.isIosOrMacTarget(): Boolean =
+    isIosTarget() || isMacTarget()

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

@@ -118,7 +118,17 @@ private fun getRequestedKonanTargetsByXcode(platform: String, archs: List<String
             })
         }
 
-        else -> error("Unknown iOS platform: '$platform'")
+        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'")
     }
 
     return targets.toList()

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

@@ -22,6 +22,7 @@ import java.util.zip.ZipFile
 import kotlin.io.path.Path
 import kotlin.io.path.invariantSeparatorsPathString
 import kotlin.io.path.relativeTo
+import kotlin.test.Ignore
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
@@ -241,6 +242,7 @@ class ResourcesTest : GradlePluginTestBase() {
         }
     }
 
+    @Ignore // ignored until compose update after https://github.com/JetBrains/compose-multiplatform/pull/5245
     @Test
     fun testMultiModuleResources() {
         val environment = defaultTestEnvironment
@@ -280,6 +282,13 @@ 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)
@@ -300,6 +309,13 @@ 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 ->
@@ -687,6 +703,95 @@ 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)
@@ -702,6 +807,22 @@ 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()
+            }
+        }
+    }
+
+    @Ignore // ignored until compose update after https://github.com/JetBrains/compose-multiplatform/pull/5245
     @Test
     fun checkTestResources() {
         with(testProject("misc/testResources")) {
@@ -714,6 +835,10 @@ 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,6 +13,8 @@ kotlin {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
+    macosX64()
+    macosArm64()
     js { browser() }
     wasmJs { browser() }
 

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/src/macosMain/composeResources/values/macos_strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="macOS_str">macOS string</string>
+</resources>

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/src/macosMain/kotlin/me/sample/app/App.macos.kt

@@ -0,0 +1,10 @@
+package me.sample.app
+
+import androidx.compose.runtime.Composable
+import kmpresourcepublication.appmodule.generated.resources.Res
+import kmpresourcepublication.appmodule.generated.resources.macOS_str
+import org.jetbrains.compose.resources.stringResource
+
+@Composable
+actual fun getPlatformSpecificString(): String =
+    stringResource(Res.string.macOS_str)

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

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

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

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

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

@@ -5,3 +5,4 @@ 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

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

@@ -0,0 +1,32 @@
+plugins {
+    kotlin("multiplatform")
+    kotlin("plugin.compose")
+    kotlin("native.cocoapods")
+    id("org.jetbrains.compose")
+}
+
+kotlin {
+    cocoapods {
+        version = "1.0"
+        summary = "Some description for a Kotlin/Native module"
+        homepage = "Link to a Kotlin/Native module homepage"
+        pod("Base64", "1.1.2")
+        framework {
+            baseName = "shared"
+            isStatic = true
+        }
+    }
+
+    macosX64()
+    macosArm64()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(compose.runtime)
+                implementation(compose.material)
+                implementation(compose.components.resources)
+            }
+        }
+    }
+}

gradle-plugins/compose/src/test/test-projects/misc/macosResources/expected/macosResources.podspec

@@ -0,0 +1,54 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'macosResources'
+    spec.version                  = '1.0'
+    spec.homepage                 = 'Link to a Kotlin/Native module homepage'
+    spec.source                   = { :http=> ''}
+    spec.authors                  = ''
+    spec.license                  = ''
+    spec.summary                  = 'Some description for a Kotlin/Native module'
+    spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
+    spec.libraries                = 'c++'
+
+    spec.dependency 'Base64', '1.1.2'
+
+    if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
+        raise "
+
+        Kotlin framework 'shared' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :generateDummyFramework
+
+        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
+    end
+
+    spec.xcconfig = {
+        'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
+    }
+
+    spec.pod_target_xcconfig = {
+        'KOTLIN_PROJECT_PATH' => '',
+        'PRODUCT_MODULE_NAME' => 'shared',
+    }
+
+    spec.script_phases = [
+        {
+            :name => 'Build macosResources',
+            :execution_position => :before_compile,
+            :shell_path => '/bin/sh',
+            :script => <<-SCRIPT
+                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
+                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
+                  exit 0
+                fi
+                set -ev
+                REPO_ROOT="$PODS_TARGET_SRCROOT"
+                "$REPO_ROOT/gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
+                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
+                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
+                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
+            SCRIPT
+        }
+    ]
+    spec.resources = ['build/compose/cocoapods/compose-resources']
+end

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

@@ -0,0 +1,2 @@
+org.gradle.jvmargs=-Xmx8096M
+org.jetbrains.compose.experimental.macos.enabled=true

gradle-plugins/compose/src/test/test-projects/misc/macosResources/settings.gradle.kts

@@ -0,0 +1,24 @@
+rootProject.name = "macosResources"
+pluginManagement {
+    repositories {
+        mavenLocal()
+        gradlePluginPortal()
+        google()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
+    plugins {
+        id("org.jetbrains.kotlin.multiplatform").version("KOTLIN_VERSION_PLACEHOLDER")
+        id("org.jetbrains.kotlin.plugin.compose").version("KOTLIN_VERSION_PLACEHOLDER")
+        id("org.jetbrains.kotlin.native.cocoapods").version("KOTLIN_VERSION_PLACEHOLDER")
+        id("org.jetbrains.compose").version("COMPOSE_GRADLE_PLUGIN_VERSION_PLACEHOLDER")
+    }
+}
+dependencyResolutionManagement {
+    repositories {
+        mavenLocal()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        mavenCentral()
+        gradlePluginPortal()
+        google()
+    }
+}

gradle-plugins/compose/src/test/test-projects/misc/macosResources/src/commonMain/composeResources/drawable/compose-multiplatform.xml

@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="600dp"
+    android:height="600dp"
+    android:viewportWidth="600"
+    android:viewportHeight="600">
+    <path
+        android:fillColor="#041619"
+        android:fillType="nonZero"
+        android:pathData="M301.21,418.53C300.97,418.54 300.73,418.56 300.49,418.56C297.09,418.59 293.74,417.72 290.79,416.05L222.6,377.54C220.63,376.43 219,374.82 217.85,372.88C216.7,370.94 216.09,368.73 216.07,366.47L216.07,288.16C216.06,287.32 216.09,286.49 216.17,285.67C216.38,283.54 216.91,281.5 217.71,279.6L199.29,268.27L177.74,256.19C175.72,260.43 174.73,265.23 174.78,270.22L174.79,387.05C174.85,393.89 178.57,400.2 184.53,403.56L286.26,461.02C290.67,463.51 295.66,464.8 300.73,464.76C300.91,464.76 301.09,464.74 301.27,464.74C301.24,449.84 301.22,439.23 301.22,439.23L301.21,418.53Z" />
+    <path
+        android:fillColor="#37BF6E"
+        android:fillType="nonZero"
+        android:pathData="M409.45,242.91L312.64,188.23C303.64,183.15 292.58,183.26 283.68,188.51L187.92,245C183.31,247.73 179.93,251.62 177.75,256.17L177.74,256.19L199.29,268.27L217.71,279.6C217.83,279.32 217.92,279.02 218.05,278.74C218.24,278.36 218.43,277.98 218.64,277.62C219.06,276.88 219.52,276.18 220.04,275.51C221.37,273.8 223.01,272.35 224.87,271.25L289.06,233.39C290.42,232.59 291.87,231.96 293.39,231.51C295.53,230.87 297.77,230.6 300,230.72C302.98,230.88 305.88,231.73 308.47,233.2L373.37,269.85C375.54,271.08 377.49,272.68 379.13,274.57C379.68,275.19 380.18,275.85 380.65,276.53C380.86,276.84 381.05,277.15 381.24,277.47L397.79,266.39L420.34,252.93L420.31,252.88C417.55,248.8 413.77,245.35 409.45,242.91Z" />
+    <path
+        android:fillColor="#3870B2"
+        android:fillType="nonZero"
+        android:pathData="M381.24,277.47C381.51,277.92 381.77,278.38 382.01,278.84C382.21,279.24 382.39,279.65 382.57,280.06C382.91,280.88 383.19,281.73 383.41,282.59C383.74,283.88 383.92,285.21 383.93,286.57L383.93,361.1C383.96,363.95 383.35,366.77 382.16,369.36C381.93,369.86 381.69,370.35 381.42,370.83C379.75,373.79 377.32,376.27 374.39,378L310.2,415.87C307.47,417.48 304.38,418.39 301.21,418.53L301.22,439.23C301.22,439.23 301.24,449.84 301.27,464.74C306.1,464.61 310.91,463.3 315.21,460.75L410.98,404.25C419.88,399 425.31,389.37 425.22,379.03L425.22,267.85C425.17,262.48 423.34,257.34 420.34,252.93L397.79,266.39L381.24,277.47Z" />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="nonZero"
+        android:pathData="M177.75,256.17C179.93,251.62 183.31,247.73 187.92,245L283.68,188.51C292.58,183.26 303.64,183.15 312.64,188.23L409.45,242.91C413.77,245.35 417.55,248.8 420.31,252.88L420.34,252.93L498.59,206.19C494.03,199.46 487.79,193.78 480.67,189.75L320.86,99.49C306.01,91.1 287.75,91.27 273.07,99.95L114.99,193.2C107.39,197.69 101.81,204.11 98.21,211.63L177.74,256.19L177.75,256.17ZM301.27,464.74C301.09,464.74 300.91,464.76 300.73,464.76C295.66,464.8 290.67,463.51 286.26,461.02L184.53,403.56C178.57,400.2 174.85,393.89 174.79,387.05L174.78,270.22C174.73,265.23 175.72,260.43 177.74,256.19L98.21,211.63C94.86,218.63 93.23,226.58 93.31,234.82L93.31,427.67C93.42,438.97 99.54,449.37 109.4,454.92L277.31,549.77C284.6,553.88 292.84,556.01 301.2,555.94L301.2,555.8C301.39,543.78 301.33,495.26 301.27,464.74Z"
+        android:strokeWidth="10"
+        android:strokeColor="#083042" />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="nonZero"
+        android:pathData="M498.59,206.19L420.34,252.93C423.34,257.34 425.17,262.48 425.22,267.85L425.22,379.03C425.31,389.37 419.88,399 410.98,404.25L315.21,460.75C310.91,463.3 306.1,464.61 301.27,464.74C301.33,495.26 301.39,543.78 301.2,555.8L301.2,555.94C309.48,555.87 317.74,553.68 325.11,549.32L483.18,456.06C497.87,447.39 506.85,431.49 506.69,414.43L506.69,230.91C506.6,222.02 503.57,213.5 498.59,206.19Z"
+        android:strokeWidth="10"
+        android:strokeColor="#083042" />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="nonZero"
+        android:pathData="M301.2,555.94C292.84,556.01 284.6,553.88 277.31,549.76L109.4,454.92C99.54,449.37 93.42,438.97 93.31,427.67L93.31,234.82C93.23,226.58 94.86,218.63 98.21,211.63C101.81,204.11 107.39,197.69 114.99,193.2L273.07,99.95C287.75,91.27 306.01,91.1 320.86,99.49L480.67,189.75C487.79,193.78 494.03,199.46 498.59,206.19C503.57,213.5 506.6,222.02 506.69,230.91L506.69,414.43C506.85,431.49 497.87,447.39 483.18,456.06L325.11,549.32C317.74,553.68 309.48,555.87 301.2,555.94Z"
+        android:strokeWidth="10"
+        android:strokeColor="#083042" />
+</vector>

gradle-plugins/compose/src/test/test-projects/misc/macosResources/src/commonMain/kotlin/App.kt

@@ -0,0 +1,39 @@
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.Button
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.painterResource
+import iosResources.generated.resources.*
+
+@OptIn(ExperimentalResourceApi::class)
+@Composable
+fun App() {
+    MaterialTheme {
+        var greetingText by remember { mutableStateOf("Hello, World!") }
+        var showImage by remember { mutableStateOf(false) }
+        Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
+            Button(onClick = {
+                showImage = !showImage
+            }) {
+                Text(greetingText)
+            }
+            AnimatedVisibility(showImage) {
+                Image(
+                    painterResource(Res.drawable.compose_multiplatform),
+                    null
+                )
+            }
+        }
+    }
+}

gradle-plugins/compose/src/test/test-projects/misc/macosResources/src/macosMain/composeResources/drawable/icon.xml

@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="600dp"
+    android:height="600dp"
+    android:viewportWidth="600"
+    android:viewportHeight="600">
+    <path
+        android:fillColor="#041619"
+        android:fillType="nonZero"
+        android:pathData="M301.21,418.53C300.97,418.54 300.73,418.56 300.49,418.56C297.09,418.59 293.74,417.72 290.79,416.05L222.6,377.54C220.63,376.43 219,374.82 217.85,372.88C216.7,370.94 216.09,368.73 216.07,366.47L216.07,288.16C216.06,287.32 216.09,286.49 216.17,285.67C216.38,283.54 216.91,281.5 217.71,279.6L199.29,268.27L177.74,256.19C175.72,260.43 174.73,265.23 174.78,270.22L174.79,387.05C174.85,393.89 178.57,400.2 184.53,403.56L286.26,461.02C290.67,463.51 295.66,464.8 300.73,464.76C300.91,464.76 301.09,464.74 301.27,464.74C301.24,449.84 301.22,439.23 301.22,439.23L301.21,418.53Z" />
+    <path
+        android:fillColor="#37BF6E"
+        android:fillType="nonZero"
+        android:pathData="M409.45,242.91L312.64,188.23C303.64,183.15 292.58,183.26 283.68,188.51L187.92,245C183.31,247.73 179.93,251.62 177.75,256.17L177.74,256.19L199.29,268.27L217.71,279.6C217.83,279.32 217.92,279.02 218.05,278.74C218.24,278.36 218.43,277.98 218.64,277.62C219.06,276.88 219.52,276.18 220.04,275.51C221.37,273.8 223.01,272.35 224.87,271.25L289.06,233.39C290.42,232.59 291.87,231.96 293.39,231.51C295.53,230.87 297.77,230.6 300,230.72C302.98,230.88 305.88,231.73 308.47,233.2L373.37,269.85C375.54,271.08 377.49,272.68 379.13,274.57C379.68,275.19 380.18,275.85 380.65,276.53C380.86,276.84 381.05,277.15 381.24,277.47L397.79,266.39L420.34,252.93L420.31,252.88C417.55,248.8 413.77,245.35 409.45,242.91Z" />
+    <path
+        android:fillColor="#3870B2"
+        android:fillType="nonZero"
+        android:pathData="M381.24,277.47C381.51,277.92 381.77,278.38 382.01,278.84C382.21,279.24 382.39,279.65 382.57,280.06C382.91,280.88 383.19,281.73 383.41,282.59C383.74,283.88 383.92,285.21 383.93,286.57L383.93,361.1C383.96,363.95 383.35,366.77 382.16,369.36C381.93,369.86 381.69,370.35 381.42,370.83C379.75,373.79 377.32,376.27 374.39,378L310.2,415.87C307.47,417.48 304.38,418.39 301.21,418.53L301.22,439.23C301.22,439.23 301.24,449.84 301.27,464.74C306.1,464.61 310.91,463.3 315.21,460.75L410.98,404.25C419.88,399 425.31,389.37 425.22,379.03L425.22,267.85C425.17,262.48 423.34,257.34 420.34,252.93L397.79,266.39L381.24,277.47Z" />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="nonZero"
+        android:pathData="M177.75,256.17C179.93,251.62 183.31,247.73 187.92,245L283.68,188.51C292.58,183.26 303.64,183.15 312.64,188.23L409.45,242.91C413.77,245.35 417.55,248.8 420.31,252.88L420.34,252.93L498.59,206.19C494.03,199.46 487.79,193.78 480.67,189.75L320.86,99.49C306.01,91.1 287.75,91.27 273.07,99.95L114.99,193.2C107.39,197.69 101.81,204.11 98.21,211.63L177.74,256.19L177.75,256.17ZM301.27,464.74C301.09,464.74 300.91,464.76 300.73,464.76C295.66,464.8 290.67,463.51 286.26,461.02L184.53,403.56C178.57,400.2 174.85,393.89 174.79,387.05L174.78,270.22C174.73,265.23 175.72,260.43 177.74,256.19L98.21,211.63C94.86,218.63 93.23,226.58 93.31,234.82L93.31,427.67C93.42,438.97 99.54,449.37 109.4,454.92L277.31,549.77C284.6,553.88 292.84,556.01 301.2,555.94L301.2,555.8C301.39,543.78 301.33,495.26 301.27,464.74Z"
+        android:strokeWidth="10"
+        android:strokeColor="#083042" />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="nonZero"
+        android:pathData="M498.59,206.19L420.34,252.93C423.34,257.34 425.17,262.48 425.22,267.85L425.22,379.03C425.31,389.37 419.88,399 410.98,404.25L315.21,460.75C310.91,463.3 306.1,464.61 301.27,464.74C301.33,495.26 301.39,543.78 301.2,555.8L301.2,555.94C309.48,555.87 317.74,553.68 325.11,549.32L483.18,456.06C497.87,447.39 506.85,431.49 506.69,414.43L506.69,230.91C506.6,222.02 503.57,213.5 498.59,206.19Z"
+        android:strokeWidth="10"
+        android:strokeColor="#083042" />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="nonZero"
+        android:pathData="M301.2,555.94C292.84,556.01 284.6,553.88 277.31,549.76L109.4,454.92C99.54,449.37 93.42,438.97 93.31,427.67L93.31,234.82C93.23,226.58 94.86,218.63 98.21,211.63C101.81,204.11 107.39,197.69 114.99,193.2L273.07,99.95C287.75,91.27 306.01,91.1 320.86,99.49L480.67,189.75C487.79,193.78 494.03,199.46 498.59,206.19C503.57,213.5 506.6,222.02 506.69,230.91L506.69,414.43C506.85,431.49 497.87,447.39 483.18,456.06L325.11,549.32C317.74,553.68 309.48,555.87 301.2,555.94Z"
+        android:strokeWidth="10"
+        android:strokeColor="#083042" />
+</vector>

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

@@ -15,6 +15,9 @@ kotlin {
     iosArm64()
     iosSimulatorArm64()
 
+    macosX64()
+    macosArm64()
+
     sourceSets {
         commonMain {
             dependencies {

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

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx8096M
 android.useAndroidX=true
-org.jetbrains.compose.experimental.jscanvas.enabled=true
+org.jetbrains.compose.experimental.jscanvas.enabled=true
+org.jetbrains.compose.experimental.macos.enabled=true

gradle-plugins/gradle.properties

@@ -8,7 +8,7 @@ kotlin.code.style=official
 dev.junit.parallel=false
 
 # Default version of Compose Libraries used by Gradle plugin
-compose.version=1.8.0-alpha01
+compose.version=1.8.0-alpha03
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
 compose.tests.kotlin.version=2.1.0
 # __SUPPORTED_GRADLE_VERSIONS__