[Gradle] Set max Gradle version in tests to 8.4
^KT-62639 Verification Pending
This commit is contained in:
committed by
Space Team
parent
27dc0a55fd
commit
0258e71bd5
@@ -218,7 +218,7 @@ fun Test.includeTestsWithPattern(include: Boolean, patterns: (MutableSet<String>
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun Test.advanceGradleVersion() {
|
fun Test.advanceGradleVersion() {
|
||||||
val gradleVersionForTests = "8.3"
|
val gradleVersionForTests = "8.4"
|
||||||
systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
|
systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -21,7 +21,6 @@ class MacosCapableConfigurationCacheIT : AbstractConfigurationCacheIT() {
|
|||||||
@DisplayName("works with native tasks in complex project")
|
@DisplayName("works with native tasks in complex project")
|
||||||
@GradleTestVersions(
|
@GradleTestVersions(
|
||||||
minVersion = TestVersions.Gradle.G_7_4,
|
minVersion = TestVersions.Gradle.G_7_4,
|
||||||
maxVersion = TestVersions.Gradle.G_8_4,
|
|
||||||
)
|
)
|
||||||
@GradleTest
|
@GradleTest
|
||||||
fun testNativeTasks(gradleVersion: GradleVersion) {
|
fun testNativeTasks(gradleVersion: GradleVersion) {
|
||||||
|
|||||||
+2
@@ -215,6 +215,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
|
|||||||
TestVersions.Gradle.G_8_0,
|
TestVersions.Gradle.G_8_0,
|
||||||
TestVersions.Gradle.G_8_1,
|
TestVersions.Gradle.G_8_1,
|
||||||
TestVersions.Gradle.G_8_2,
|
TestVersions.Gradle.G_8_2,
|
||||||
|
TestVersions.Gradle.G_8_3
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@GradleTest
|
@GradleTest
|
||||||
@@ -222,6 +223,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
|
|||||||
project("kotlinProject", gradleVersion) {
|
project("kotlinProject", gradleVersion) {
|
||||||
build("help") {
|
build("help") {
|
||||||
val expectedVariant = when (gradleVersion) {
|
val expectedVariant = when (gradleVersion) {
|
||||||
|
GradleVersion.version(TestVersions.Gradle.G_8_4) -> "gradle82"
|
||||||
GradleVersion.version(TestVersions.Gradle.G_8_3) -> "gradle82"
|
GradleVersion.version(TestVersions.Gradle.G_8_3) -> "gradle82"
|
||||||
GradleVersion.version(TestVersions.Gradle.G_8_2) -> "gradle82"
|
GradleVersion.version(TestVersions.Gradle.G_8_2) -> "gradle82"
|
||||||
GradleVersion.version(TestVersions.Gradle.G_8_1) -> "gradle81"
|
GradleVersion.version(TestVersions.Gradle.G_8_1) -> "gradle81"
|
||||||
|
|||||||
+7
-1
@@ -193,7 +193,13 @@ class MppCompositeBuildIT : KGPBaseTest() {
|
|||||||
|
|
||||||
@GradleTest
|
@GradleTest
|
||||||
fun `test - sample1 - assemble and execute - included build using older version of Kotlin`(gradleVersion: GradleVersion) {
|
fun `test - sample1 - assemble and execute - included build using older version of Kotlin`(gradleVersion: GradleVersion) {
|
||||||
project("mpp-composite-build/sample1", gradleVersion) {
|
project(
|
||||||
|
"mpp-composite-build/sample1",
|
||||||
|
gradleVersion,
|
||||||
|
buildOptions = defaultBuildOptions.suppressDeprecationWarningsOn(
|
||||||
|
reason = "KGP 1.7.21 produces deprecation warnings with Gradle 8.4"
|
||||||
|
) { gradleVersion >= GradleVersion.version(TestVersions.Gradle.G_8_4) }
|
||||||
|
) {
|
||||||
projectPath.resolve("included-build").addDefaultBuildFiles()
|
projectPath.resolve("included-build").addDefaultBuildFiles()
|
||||||
buildGradleKts.replaceText("<kgp_version>", KOTLIN_VERSION)
|
buildGradleKts.replaceText("<kgp_version>", KOTLIN_VERSION)
|
||||||
projectPath.resolve("included-build/build.gradle.kts").replaceText("<kgp_version>", "1.7.21")
|
projectPath.resolve("included-build/build.gradle.kts").replaceText("<kgp_version>", "1.7.21")
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ interface TestVersions {
|
|||||||
|
|
||||||
const val MIN_SUPPORTED = minSupportedGradleVersion
|
const val MIN_SUPPORTED = minSupportedGradleVersion
|
||||||
const val MIN_SUPPORTED_KPM = G_7_0
|
const val MIN_SUPPORTED_KPM = G_7_0
|
||||||
const val MAX_SUPPORTED = G_8_3
|
const val MAX_SUPPORTED = G_8_4
|
||||||
}
|
}
|
||||||
|
|
||||||
object Kotlin {
|
object Kotlin {
|
||||||
|
|||||||
Reference in New Issue
Block a user