[K/N][test] Fix Native downloading test
Use a newer version of the compiler with changes to archive name (contains arch). Also, remove obsolete test for the old version. Merge-request: KT-MR-10399 Merged-by: Pavel Punegov <Pavel.Punegov@jetbrains.com>
This commit is contained in:
committed by
Space Team
parent
b19decc00a
commit
6d06f29326
+9
-21
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.gradle.internals.DISABLED_NATIVE_TARGETS_REPORTER_WA
|
|||||||
import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics
|
import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics
|
||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind
|
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind
|
||||||
import org.jetbrains.kotlin.gradle.testbase.*
|
import org.jetbrains.kotlin.gradle.testbase.*
|
||||||
|
import org.jetbrains.kotlin.gradle.testbase.TestVersions.Kotlin.NATIVE_STABLE_RELEASE
|
||||||
import org.jetbrains.kotlin.gradle.util.modify
|
import org.jetbrains.kotlin.gradle.util.modify
|
||||||
import org.jetbrains.kotlin.gradle.util.runProcess
|
import org.jetbrains.kotlin.gradle.util.runProcess
|
||||||
import org.jetbrains.kotlin.gradle.utils.Xcode
|
import org.jetbrains.kotlin.gradle.utils.Xcode
|
||||||
@@ -940,36 +941,23 @@ class GeneralNativeIT : BaseGradleIT() {
|
|||||||
assertNoDiagnostic(KotlinToolingDiagnostics.NativeStdlibIsMissingDiagnostic)
|
assertNoDiagnostic(KotlinToolingDiagnostics.NativeStdlibIsMissingDiagnostic)
|
||||||
}
|
}
|
||||||
|
|
||||||
build("tasks", "-Pkotlin.native.version=1.5.20") {
|
|
||||||
|
val platform = HostManager.platformName()
|
||||||
|
val version = NATIVE_STABLE_RELEASE
|
||||||
|
val escapedRegexVersion = Regex.escape(NATIVE_STABLE_RELEASE)
|
||||||
|
build("tasks", "-Pkotlin.native.version=$version") {
|
||||||
assertSuccessful()
|
assertSuccessful()
|
||||||
assertContainsRegex(
|
assertContainsRegex("Kotlin/Native distribution: .*kotlin-native-prebuilt-$platform-$escapedRegexVersion".toRegex())
|
||||||
"Kotlin/Native distribution: .*kotlin-native-prebuilt-(macos|linux|windows)-1\\.5\\.20"
|
|
||||||
.toRegex()
|
|
||||||
)
|
|
||||||
assertNotContains("Project property 'org.jetbrains.kotlin.native.version' is deprecated")
|
assertNotContains("Project property 'org.jetbrains.kotlin.native.version' is deprecated")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deprecated property
|
// Deprecated property
|
||||||
build("tasks", "-Porg.jetbrains.kotlin.native.version=1.5.20") {
|
build("tasks", "-Porg.jetbrains.kotlin.native.version=$version") {
|
||||||
assertSuccessful()
|
assertSuccessful()
|
||||||
assertContainsRegex(
|
assertContainsRegex("Kotlin/Native distribution: .*kotlin-native-prebuilt-$platform-$escapedRegexVersion".toRegex())
|
||||||
"Kotlin/Native distribution: .*kotlin-native-prebuilt-(macos|linux|windows)-1\\.5\\.20"
|
|
||||||
.toRegex()
|
|
||||||
)
|
|
||||||
assertContains("Project property 'org.jetbrains.kotlin.native.version' is deprecated")
|
assertContains("Project property 'org.jetbrains.kotlin.native.version' is deprecated")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Gradle 5.0 introduced a new API for Ivy repository layouts.
|
|
||||||
// MPP plugin uses this API to download K/N if Gradle version is >= 5.0.
|
|
||||||
// Check this too (see KT-30258).
|
|
||||||
with(Project("native-libraries")) {
|
|
||||||
build("tasks", "-Pkotlin.native.version=1.3.50") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertTrue(output.contains("Kotlin/Native distribution: "))
|
|
||||||
assertFalse(output.contains("Deprecated Gradle features were used in this build, making it incompatible with Gradle 6.0."))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
+1
@@ -32,6 +32,7 @@ interface TestVersions {
|
|||||||
|
|
||||||
object Kotlin {
|
object Kotlin {
|
||||||
const val STABLE_RELEASE = "1.6.21"
|
const val STABLE_RELEASE = "1.6.21"
|
||||||
|
const val NATIVE_STABLE_RELEASE = "1.8.20"
|
||||||
|
|
||||||
// Copied from KOTLIN_VERSION.kt file
|
// Copied from KOTLIN_VERSION.kt file
|
||||||
val CURRENT
|
val CURRENT
|
||||||
|
|||||||
Reference in New Issue
Block a user