Fix ResourcesTest

Author: pjBooms

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

@@ -36,7 +36,7 @@ private fun Project.onKgpApplied(config: Provider<ResourcesExtension>, kgp: Kotl
 
     if (kmpResourcesAreAvailable) {
         configureMultimoduleResources(kotlinExtension, config)
-        configureXCFrameworkComposeResources(kotlinExtension, kgp)
+        configureXCFrameworkComposeResources(kotlinExtension)
     } else {
         if (!disableMultimoduleResources) {
             if (!hasKmpResources) logger.info(

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

@@ -1,44 +1,30 @@
 package org.jetbrains.compose.resources
 
 import org.gradle.api.Project
-import org.jetbrains.compose.internal.Version
 import org.jetbrains.kotlin.gradle.ComposeKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
 import org.jetbrains.kotlin.gradle.plugin.extraProperties
 import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFrameworkTask
 import org.jetbrains.kotlin.gradle.plugin.mpp.resources.KotlinTargetResourcesPublication
 
-private const val MIN_KGP_VERSION_FOR_XCFRAMEWORK_RESOURCES = "2.2.0-Beta2-1"
-
 @OptIn(ComposeKotlinGradlePluginApi::class)
 internal fun Project.configureXCFrameworkComposeResources(
-    kotlinExtension: KotlinMultiplatformExtension,
-    kgp: KotlinBasePlugin
+    kotlinExtension: KotlinMultiplatformExtension
 ) {
-    val kgpVersion = Version.fromString(kgp.pluginVersion)
     val kmpResources = extraProperties.get(KMP_RES_EXT) as KotlinTargetResourcesPublication
-    val requiredVersion = Version.fromString(MIN_KGP_VERSION_FOR_XCFRAMEWORK_RESOURCES)
-    val isAvailable = kgpVersion >= requiredVersion
-
     tasks.withType(XCFrameworkTask::class.java).configureEach { task ->
-        if (isAvailable) {
-            logger.info("Configure compose resources in ${task.name}")
-            kotlinExtension.targets
-                .withType(KotlinNativeTarget::class.java)
-                .configureEach { target ->
-                    target.binaries.withType(Framework::class.java).configureEach { framework ->
-                        task.addTargetResources(
-                            resources = kmpResources.resolveResources(target),
-                            target = framework.target.konanTarget
-                        )
-                    }
+        logger.info("Configure compose resources in ${task.name}")
+        kotlinExtension.targets
+            .withType(KotlinNativeTarget::class.java)
+            .configureEach { target ->
+                target.binaries.withType(Framework::class.java).configureEach { framework ->
+                    task.addTargetResources(
+                        resources = kmpResources.resolveResources(target),
+                        target = framework.target.konanTarget
+                    )
                 }
-        } else {
-            logger.warn("Compose resources are supported in XCFrameworks " +
-                    "since '$MIN_KGP_VERSION_FOR_XCFRAMEWORK_RESOURCES' Kotlin Gradle plugin version")
-        }
+            }
     }
 }

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

@@ -745,8 +745,8 @@ class ResourcesTest : GradlePluginTestBase() {
                     |
                 """.trimMargin()
             }
-            gradle(":assembleComposeAppDebugXCFramework", "--dry-run").checks {
-                check.logContains("Compose resources are supported in XCFrameworks since '2.2.0-Beta2-1' Kotlin Gradle plugin version")
+            gradleFailure(":assembleComposeAppDebugXCFramework", "--dry-run").checks {
+                check.logContains("e: Configuration problem: Minimal supported Kotlin")
             }
         }
     }