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

[Gradle] Cleanup max Gradle versions in the tests

Browse Source 
As we are running now by default with Gradle 8.2 release our IT tests -
specifying this version explicitly does not make sense.
This commit is contained in:
Yahor Berdnikau
2023-12-10 10:46:16 +01:00
committed by Space Team
parent 91465d7110
commit da7ceb162b
3 changed files with 1 additions and 9 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
-2
View File
@@ -205,7 +205,6 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
@DisplayName("Proper Gradle plugin variant is used") @DisplayName("Proper Gradle plugin variant is used")
@GradleTestVersions( @GradleTestVersions(
maxVersion = TestVersions.Gradle.G_8_2,
additionalVersions = [ additionalVersions = [
TestVersions.Gradle.G_7_0, TestVersions.Gradle.G_7_0,
TestVersions.Gradle.G_7_1, TestVersions.Gradle.G_7_1,
@@ -215,7 +214,6 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
TestVersions.Gradle.G_7_6, TestVersions.Gradle.G_7_6,
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,
], ],
) )
@GradleTest @GradleTest
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt
-1
View File
@@ -19,7 +19,6 @@ import java.nio.file.Path
import kotlin.io.path.readText import kotlin.io.path.readText
import kotlin.test.fail import kotlin.test.fail
@GradleTestVersions(minVersion = TestVersions.Gradle.G_8_2)
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_82) @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_82)
@AndroidGradlePluginTests @AndroidGradlePluginTests
class ExternalAndroidTargetIT : KGPBaseTest() { class ExternalAndroidTargetIT : KGPBaseTest() {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt
+1 -6
View File
@@ -21,11 +21,6 @@ import kotlin.test.assertIs
@MppGradlePluginTests @MppGradlePluginTests
@DisplayName("Tests for multiplatform with composite builds") @DisplayName("Tests for multiplatform with composite builds")
/*
Testing with maxVersion 8.2, because of significant branching introduced in KT-58157
We can remove this, once MAX_SUPPORTED is higher or equal to 8.2
*/
@GradleTestVersions(maxVersion = TestVersions.Gradle.G_8_2)
class MppCompositeBuildIT : KGPBaseTest() { class MppCompositeBuildIT : KGPBaseTest() {
@GradleTest @GradleTest
fun `test - sample0 - ide dependencies`(gradleVersion: GradleVersion) { fun `test - sample0 - ide dependencies`(gradleVersion: GradleVersion) {
@@ -437,7 +432,7 @@ class MppCompositeBuildIT : KGPBaseTest() {
} }
@GradleTest @GradleTest
@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0, maxVersion = TestVersions.Gradle.G_8_2) @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0)
fun `test sample7`(gradleVersion: GradleVersion) { fun `test sample7`(gradleVersion: GradleVersion) {
val producer = project("mpp-composite-build/sample7-KT-59863-pluginManagement.includeBuild/producerBuild", gradleVersion) val producer = project("mpp-composite-build/sample7-KT-59863-pluginManagement.includeBuild/producerBuild", gradleVersion)
project( project(