From bfbc33e3f612e6ce269adbbef25ab34f18290da3 Mon Sep 17 00:00:00 2001 From: Artem Daugel-Dauge Date: Mon, 4 Mar 2024 09:55:26 +0100 Subject: [PATCH] [Gradle] Fix macOS functionalTests --- .../KotlinNativeCompileArgumentsTest.kt | 5 ++++- .../org/jetbrains/kotlin/gradle/util/buildProject.kt | 12 +++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinNativeCompileArgumentsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinNativeCompileArgumentsTest.kt index 2f39eafba26..3e2c90f52d7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinNativeCompileArgumentsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinNativeCompileArgumentsTest.kt @@ -14,7 +14,6 @@ import org.jetbrains.kotlin.gradle.dependencyResolutionTests.mavenCentralCacheRe import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.CreateCompilerArgumentsContext -import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.ArgumentType.PluginClasspath import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.ArgumentType.Primitive import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext.Companion.default @@ -23,6 +22,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP import org.jetbrains.kotlin.gradle.util.main +import org.jetbrains.kotlin.gradle.util.mockXcodeVersion +import org.jetbrains.kotlin.gradle.utils.getFile import java.io.File import kotlin.test.* @@ -239,6 +240,8 @@ class KotlinNativeCompileArgumentsTest { @Test fun `native compile tasks SHOULD NOT have native platform dependencies but SHOULD have stdlib`() { val project = buildProjectWithMPP() + + project.mockXcodeVersion() project.repositories.mavenLocal() project.repositories.mavenCentralCacheRedirector() val kotlin = project.multiplatformExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt index 660e687440a..18d0e737b31 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt @@ -22,6 +22,9 @@ import org.jetbrains.kotlin.gradle.plugin.getExtension import org.jetbrains.kotlin.gradle.plugin.mpp.resources.resolve.KotlinTargetResourcesResolutionStrategy import org.jetbrains.kotlin.gradle.targets.native.tasks.artifact.KotlinArtifactsExtensionImpl import org.jetbrains.kotlin.gradle.targets.native.tasks.artifact.kotlinArtifactsExtension +import org.jetbrains.kotlin.gradle.utils.getFile +import org.jetbrains.kotlin.konan.target.Xcode +import org.jetbrains.kotlin.konan.target.XcodeVersion fun buildProject( projectBuilder: ProjectBuilder.() -> Unit = { }, @@ -141,4 +144,11 @@ fun Project.enableDependencyVerification(enabled: Boolean = true) { fun Project.enableWasmStabilityNoWarn(enabled: Boolean = true) { propertiesExtension.set("kotlin.wasm.stability.nowarn", enabled.toString()) -} \ No newline at end of file +} + +fun Project.mockXcodeVersion(version: XcodeVersion = XcodeVersion.maxTested) { + project.layout.buildDirectory.getFile().apply { + mkdirs() + resolve("xcode-version.txt").writeText(version.toString()) + } +}