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

[Gradle] Update AGP versions for tests

Browse Source
This commit is contained in:
Yahor Berdnikau
2023-07-03 10:37:05 +02:00
committed by Space Team
parent f4fbc2edc6
commit 5b1ffb417a
7 changed files with 5 additions and 12 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/BuildCacheRelocationIT.kt
-3
View File
@@ -111,7 +111,6 @@ class BuildCacheRelocationIT : KGPBaseTest() {
@AndroidGradlePluginTests
@DisplayName("works with Android project")
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
@GradleAndroidTest
fun testRelocationAndroidProject(
gradleVersion: GradleVersion,
@@ -141,7 +140,6 @@ class BuildCacheRelocationIT : KGPBaseTest() {
@AndroidGradlePluginTests
@DisplayName("Test relocation for Android with dagger project")
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
@GradleAndroidTest
fun testRelocationAndroidDagger(
gradleVersion: GradleVersion,
@@ -171,7 +169,6 @@ class BuildCacheRelocationIT : KGPBaseTest() {
@AndroidGradlePluginTests
@DisplayName("KT-48617: Kapt ignores empty directories from Android variant")
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
@GradleAndroidTest
fun kaptIgnoreEmptyAndroidVariant(
gradleVersion: GradleVersion,
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt
-1
View File
@@ -73,7 +73,6 @@ class ConfigurationAvoidanceIT : KGPBaseTest() {
@AndroidGradlePluginTests
@DisplayName("Android unrelated tasks are not configured")
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
@GradleAndroidTest
fun testAndroidUnrelatedTaskNotConfigured(
gradleVersion: GradleVersion,
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt
-1
View File
@@ -287,7 +287,6 @@ open class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() {
@AndroidGradlePluginTests
@DisplayName("KT-34340: origins in classpath")
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
@GradleAndroidTest
@DisabledOnOs(OS.WINDOWS, disabledReason = "https://youtrack.jetbrains.com/issue/KTI-405")
fun testIsolatingWithOriginsInClasspath(
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt
-1
View File
@@ -156,7 +156,6 @@ class SubpuginsIT : KGPBaseTest() {
@AndroidGradlePluginTests
@DisplayName("KT-39809: kapt subplugin legacy loading does not fail the build")
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
@GradleAndroidTest
fun testKotlinVersionDowngradeInSupbrojectKt39809(
gradleVersion: GradleVersion,
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt
-1
View File
@@ -12,7 +12,6 @@ import org.junit.jupiter.api.DisplayName
@DisplayName("Configuration cache in Android project")
@AndroidGradlePluginTests
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() {
@DisplayName("works in android plus kapt project")
@GradleAndroidTest
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
+4 -4
View File
@@ -45,10 +45,10 @@ interface TestVersions {
const val AGP_71 = "7.1.3"
const val AGP_72 = "7.2.2"
const val AGP_73 = "7.3.1"
const val AGP_74 = "7.4.0"
const val AGP_74 = "7.4.2"
const val AGP_80 = "8.0.2"
const val AGP_81 = "8.1.0-alpha08"
const val AGP_82 = "8.2.0-alpha09"
const val AGP_81 = "8.1.0-rc01"
const val AGP_82 = "8.2.0-alpha09" // -alpha10 fails ExternalAndroidTargetIT test
const val MIN_SUPPORTED = AGP_42 // KotlinAndroidPlugin.minimalSupportedAgpVersion
const val MAX_SUPPORTED = AGP_80 // Update once Gradle MAX_SUPPORTED version will be bumped
@@ -68,7 +68,7 @@ interface TestVersions {
AGP_74(AGP.AGP_74, GradleVersion.version(Gradle.G_7_5), GradleVersion.version(Gradle.G_7_6), JavaVersion.VERSION_11),
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_1), JavaVersion.VERSION_17),
AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_1), JavaVersion.VERSION_17),
AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_2), JavaVersion.VERSION_17),
;
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt
+1 -1
View File
@@ -24,7 +24,7 @@ class AGPVersion private constructor(private val versionNumber: VersionNumber) {
val v7_1_0 = fromString("7.1.3")
val v7_2_2 = fromString("7.2.2")
val v7_3_0 = fromString("7.3.1")
val v7_4_0 = fromString("7.4.0")
val v7_4_0 = fromString("7.4.2")
val testedVersions = listOf(v4_1_0, v4_2_0, v7_0_0, v7_1_0, v7_2_2, v7_3_0, v7_4_0)
}