diff --git a/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt b/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt index 8c9aad69f0..8102ec5e53 100644 --- a/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt +++ b/compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt @@ -16,6 +16,9 @@ val Project.isInIdea: Boolean val Project.isFailingJsCase: Boolean get() = this.name.contains("-failingJs-") +val Project.isMingwX64Enabled: Boolean + get() = this.isInIdea + @OptIn(ExternalVariantApi::class) fun KotlinMultiplatformExtension.configureTargets() { jvm("desktop") @@ -27,7 +30,7 @@ fun KotlinMultiplatformExtension.configureTargets() { macosX64() macosArm64() // We use linux agents on CI. So it doesn't run the tests, but it builds the klib anyway which is time consuming. - if (project.isInIdea) mingwX64() + if (project.isMingwX64Enabled) mingwX64() linuxX64() } diff --git a/compose/integrations/composable-test-cases/gradle.properties b/compose/integrations/composable-test-cases/gradle.properties index 292c20dbeb..6fd9a02218 100644 --- a/compose/integrations/composable-test-cases/gradle.properties +++ b/compose/integrations/composable-test-cases/gradle.properties @@ -4,7 +4,7 @@ kotlin.native.enableDependencyPropagation=false android.useAndroidX=true kotlin.version=1.9.0 agp.version=7.3.0 -compose.version=1.5.0-beta01 +compose.version=1.5.0-beta02 kotlin.native.cacheKind=none #empty by default - a default version will be used diff --git a/compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts b/compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts index 1ec04242a4..df91a04d1f 100644 --- a/compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts +++ b/compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts @@ -32,8 +32,10 @@ kotlin { val macosArm64Main by getting { dependsOn(nativeMain) } - val mingwX64Main by getting { - dependsOn(nativeMain) + if (project.isMingwX64Enabled) { + val mingwX64Main by getting { + dependsOn(nativeMain) + } } } }