diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt index 46468fc1cb4..2286e998c43 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt @@ -400,25 +400,30 @@ class AppleFrameworkIT : BaseGradleIT() { fun dependencyInsight(configuration: String) = arrayOf( ":iosApp:dependencyInsight", "--configuration", configuration, "--dependency", "iosLib" ) + + fun CompiledProject.assertContainsVariant(variantName: String) { + assertContains("Variant $variantName") + } + build(*dependencyInsight("iosAppIosX64DebugImplementation")) { assertSuccessful() - assertContains("variant \"mainDynamicDebugFrameworkIos\"") + assertContainsVariant("mainDynamicDebugFrameworkIos") } build(*dependencyInsight("iosAppIosX64ReleaseImplementation")) { assertSuccessful() - assertContains("variant \"mainDynamicReleaseFrameworkIos\"") + assertContainsVariant("mainDynamicReleaseFrameworkIos") } // NB: '0' is required at the end since dependency is added with custom attribute and it creates new configuration build(*dependencyInsight("iosAppIosX64DebugImplementation0"), "-PmultipleFrameworks") { assertSuccessful() - assertContains("variant \"mainStaticDebugFrameworkIos\"") + assertContainsVariant("mainStaticDebugFrameworkIos") } build(*dependencyInsight("iosAppIosX64ReleaseImplementation0"), "-PmultipleFrameworks") { assertSuccessful() - assertContains("variant \"mainStaticReleaseFrameworkIos\"") + assertContainsVariant("mainStaticReleaseFrameworkIos") } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleGradlePluginConsumesAppleFrameworks/iosApp/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleGradlePluginConsumesAppleFrameworks/iosApp/build.gradle.kts index 73e979b0652..9397708343d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleGradlePluginConsumesAppleFrameworks/iosApp/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/appleGradlePluginConsumesAppleFrameworks/iosApp/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget plugins { - id("org.jetbrains.gradle.apple.applePlugin") version "222.4550-0.21-dev-0" + id("org.jetbrains.gradle.apple.applePlugin") version "222.4550-0.21" } apple {