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

[Gradle] Add Gradle 8.2+ plugin variant

Browse Source 
Fixups KT-52976 as the intention was to remove conventions registration. However until this commit, `gradle81` variant was used for all the 8.1+ versions providing an implementation that registers conventions.
^KT-63499 Fixed
This commit is contained in:
Alexander.Likhachev
2023-11-15 20:56:59 +01:00
committed by Space Team
parent 965b6b544d
commit 6fbd26905a
14 changed files with 430 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
+5 -2
View File
@@ -205,6 +205,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
@DisplayName("Proper Gradle plugin variant is used")
@GradleTestVersions(
maxVersion = TestVersions.Gradle.G_8_2,
additionalVersions = [
TestVersions.Gradle.G_7_0,
TestVersions.Gradle.G_7_1,
@@ -213,6 +214,8 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
TestVersions.Gradle.G_7_5,
TestVersions.Gradle.G_7_6,
TestVersions.Gradle.G_8_0,
TestVersions.Gradle.G_8_1,
TestVersions.Gradle.G_8_2,
],
)
@GradleTest
@@ -220,7 +223,8 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
project("kotlinProject", gradleVersion) {
build("help") {
val expectedVariant = when (gradleVersion) {
in GradleVersion.version(TestVersions.Gradle.G_8_1)..GradleVersion.version(TestVersions.Gradle.G_8_2) -> "gradle81"
GradleVersion.version(TestVersions.Gradle.G_8_2) -> "gradle82"
GradleVersion.version(TestVersions.Gradle.G_8_1) -> "gradle81"
GradleVersion.version(TestVersions.Gradle.G_8_0) -> "gradle80"
GradleVersion.version(TestVersions.Gradle.G_7_6) -> "gradle76"
GradleVersion.version(TestVersions.Gradle.G_7_5) -> "gradle75"
@@ -322,7 +326,6 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
}
}
@Disabled
@DisplayName("KT-63499: source sets conventions are not registered since Gradle 8.2")
@GradleTestVersions(minVersion = TestVersions.Gradle.G_8_2)
@GradleTest