azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix macOS functionalTests

Browse Source
This commit is contained in:
Artem Daugel-Dauge
2024-03-04 09:55:26 +01:00
committed by Space Team
parent e9005e4fed
commit bfbc33e3f6
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinNativeCompileArgumentsTest.kt
+4 -1
View File
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.gradle.dependencyResolutionTests.mavenCentralCacheRe
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.CreateCompilerArgumentsContext 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.PluginClasspath
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.ArgumentType.Primitive import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.ArgumentType.Primitive
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext.Companion.default 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.tasks.KotlinNativeLink
import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP
import org.jetbrains.kotlin.gradle.util.main 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 java.io.File
import kotlin.test.* import kotlin.test.*
@@ -239,6 +240,8 @@ class KotlinNativeCompileArgumentsTest {
@Test @Test
fun `native compile tasks SHOULD NOT have native platform dependencies but SHOULD have stdlib`() { fun `native compile tasks SHOULD NOT have native platform dependencies but SHOULD have stdlib`() {
val project = buildProjectWithMPP() val project = buildProjectWithMPP()
project.mockXcodeVersion()
project.repositories.mavenLocal() project.repositories.mavenLocal()
project.repositories.mavenCentralCacheRedirector() project.repositories.mavenCentralCacheRedirector()
val kotlin = project.multiplatformExtension val kotlin = project.multiplatformExtension
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt
+11 -1
View File
@@ -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.plugin.mpp.resources.resolve.KotlinTargetResourcesResolutionStrategy
import org.jetbrains.kotlin.gradle.targets.native.tasks.artifact.KotlinArtifactsExtensionImpl 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.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( fun buildProject(
projectBuilder: ProjectBuilder.() -> Unit = { }, projectBuilder: ProjectBuilder.() -> Unit = { },
@@ -141,4 +144,11 @@ fun Project.enableDependencyVerification(enabled: Boolean = true) {
fun Project.enableWasmStabilityNoWarn(enabled: Boolean = true) { fun Project.enableWasmStabilityNoWarn(enabled: Boolean = true) {
propertiesExtension.set("kotlin.wasm.stability.nowarn", enabled.toString()) propertiesExtension.set("kotlin.wasm.stability.nowarn", enabled.toString())
} }
fun Project.mockXcodeVersion(version: XcodeVersion = XcodeVersion.maxTested) {
project.layout.buildDirectory.getFile().apply {
mkdirs()
resolve("xcode-version.txt").writeText(version.toString())
}
}