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

[Gradle] Bump max Gradle version in tests to 8.6

Browse Source 
^KT-64378 Verification Pending
This commit is contained in:
Yahor Berdnikau
2024-02-16 18:25:47 +01:00
committed by Space Team
parent 9d30fb1b1c
commit 1d9129f688
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+1 -1
View File
@@ -224,7 +224,7 @@ fun Test.includeTestsWithPattern(include: Boolean, patterns: (MutableSet<String>
} }
fun Test.advanceGradleVersion() { fun Test.advanceGradleVersion() {
val gradleVersionForTests = "8.5" val gradleVersionForTests = "8.6"
systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests) systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
+2
View File
@@ -217,6 +217,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
TestVersions.Gradle.G_8_2, TestVersions.Gradle.G_8_2,
TestVersions.Gradle.G_8_3, TestVersions.Gradle.G_8_3,
TestVersions.Gradle.G_8_4, TestVersions.Gradle.G_8_4,
TestVersions.Gradle.G_8_5,
], ],
) )
@GradleTest @GradleTest
@@ -224,6 +225,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_6) -> "gradle85"
GradleVersion.version(TestVersions.Gradle.G_8_5) -> "gradle85" GradleVersion.version(TestVersions.Gradle.G_8_5) -> "gradle85"
GradleVersion.version(TestVersions.Gradle.G_8_4) -> "gradle82" GradleVersion.version(TestVersions.Gradle.G_8_4) -> "gradle82"
GradleVersion.version(TestVersions.Gradle.G_8_3) -> "gradle82" GradleVersion.version(TestVersions.Gradle.G_8_3) -> "gradle82"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
+6 -7
View File
@@ -29,11 +29,10 @@ interface TestVersions {
const val G_8_3 = "8.3" const val G_8_3 = "8.3"
const val G_8_4 = "8.4" const val G_8_4 = "8.4"
const val G_8_5 = "8.5" const val G_8_5 = "8.5"
const val G_8_6 = "8.6-rc-2" const val G_8_6 = "8.6"
const val MIN_SUPPORTED = minSupportedGradleVersion const val MIN_SUPPORTED = minSupportedGradleVersion
const val MIN_SUPPORTED_KPM = G_7_0 const val MAX_SUPPORTED = G_8_6
const val MAX_SUPPORTED = G_8_5
} }
object Kotlin { object Kotlin {
@@ -63,7 +62,7 @@ interface TestVersions {
val version: String, val version: String,
val minSupportedGradleVersion: GradleVersion, val minSupportedGradleVersion: GradleVersion,
val maxSupportedGradleVersion: GradleVersion, val maxSupportedGradleVersion: GradleVersion,
val requiredJdkVersion: JavaVersion val requiredJdkVersion: JavaVersion,
) { ) {
AGP_71(AGP.AGP_71, GradleVersion.version(Gradle.G_7_2), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11), AGP_71(AGP.AGP_71, GradleVersion.version(Gradle.G_7_2), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11),
AGP_72(AGP.AGP_72, GradleVersion.version(Gradle.G_7_3), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11), AGP_72(AGP.AGP_72, GradleVersion.version(Gradle.G_7_3), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11),
@@ -72,8 +71,8 @@ interface TestVersions {
AGP_80(AGP.AGP_80, GradleVersion.version(Gradle.G_8_0), GradleVersion.version(Gradle.G_8_0), JavaVersion.VERSION_17), AGP_80(AGP.AGP_80, GradleVersion.version(Gradle.G_8_0), GradleVersion.version(Gradle.G_8_0), JavaVersion.VERSION_17),
AGP_81(AGP.AGP_81, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17), AGP_81(AGP.AGP_81, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17),
AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_2), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17), AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_2), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17),
AGP_83(AGP.AGP_83, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_5), JavaVersion.VERSION_17), AGP_83(AGP.AGP_83, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_6), JavaVersion.VERSION_17),
AGP_84(AGP.AGP_84, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_5), JavaVersion.VERSION_17), AGP_84(AGP.AGP_84, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_6), JavaVersion.VERSION_17),
; ;
} }