Browse Source

Fix composable test build.gradle.kts (#3506)

pull/3509/head
Oleksandr Karpovich 1 year ago committed by GitHub
parent
commit
91a7dcb0f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt
  2. 2
      compose/integrations/composable-test-cases/gradle.properties
  3. 6
      compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts

5
compose/integrations/composable-test-cases/buildSrc/src/main/kotlin/TargetsConfiguration.kt

@ -16,6 +16,9 @@ val Project.isInIdea: Boolean
val Project.isFailingJsCase: Boolean val Project.isFailingJsCase: Boolean
get() = this.name.contains("-failingJs-") get() = this.name.contains("-failingJs-")
val Project.isMingwX64Enabled: Boolean
get() = this.isInIdea
@OptIn(ExternalVariantApi::class) @OptIn(ExternalVariantApi::class)
fun KotlinMultiplatformExtension.configureTargets() { fun KotlinMultiplatformExtension.configureTargets() {
jvm("desktop") jvm("desktop")
@ -27,7 +30,7 @@ fun KotlinMultiplatformExtension.configureTargets() {
macosX64() macosX64()
macosArm64() macosArm64()
// We use linux agents on CI. So it doesn't run the tests, but it builds the klib anyway which is time consuming. // 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() linuxX64()
} }

2
compose/integrations/composable-test-cases/gradle.properties

@ -4,7 +4,7 @@ kotlin.native.enableDependencyPropagation=false
android.useAndroidX=true android.useAndroidX=true
kotlin.version=1.9.0 kotlin.version=1.9.0
agp.version=7.3.0 agp.version=7.3.0
compose.version=1.5.0-beta01 compose.version=1.5.0-beta02
kotlin.native.cacheKind=none kotlin.native.cacheKind=none
#empty by default - a default version will be used #empty by default - a default version will be used

6
compose/integrations/composable-test-cases/testcases/expectActual/lib/build.gradle.kts

@ -32,8 +32,10 @@ kotlin {
val macosArm64Main by getting { val macosArm64Main by getting {
dependsOn(nativeMain) dependsOn(nativeMain)
} }
val mingwX64Main by getting { if (project.isMingwX64Enabled) {
dependsOn(nativeMain) val mingwX64Main by getting {
dependsOn(nativeMain)
}
} }
} }
} }

Loading…
Cancel
Save