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

[Gradle][MPP] MPP/AGP compatibility: Bump maxSupportedVersion to 7.3

Browse Source 
^KT-54071 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-09-16 12:39:52 +02:00
committed by Space
parent def886cd31
commit 2ba7c7b8a9
4 changed files with 8 additions and 2 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/AbstractKotlinAndroidGradleTests.kt
+2
View File
@@ -730,6 +730,8 @@ open class KotlinAndroid71GradleIT : KotlinAndroid70GradleIT() {
// Special version added for testing KT-49798
.plus(AGPVersion.fromString("7.1.0-beta02"))
.filter { version -> version >= AGPVersion.v4_2_0 }
// Current Gradle version within kotlin.git is not sufficient to build with higher AGP
.filter { version -> version < AGPVersion.v7_2_2 }
checkedConsumerAGPVersions.forEach { agpVersion ->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
+2
View File
@@ -40,6 +40,7 @@ interface TestVersions {
const val AGP_70 = "7.0.4"
const val AGP_71 = "7.1.3"
const val AGP_72 = "7.2.1"
const val AGP_73 = "7.3.0"
const val MIN_SUPPORTED = AGP_36 // KotlinAndroidPlugin.MINIMAL_SUPPORTED_AGP_VERSION
const val MAX_SUPPORTED = AGP_70 // Update once Gradle MAX_SUPPORTED version will be bumped to 7.2+
@@ -58,6 +59,7 @@ interface TestVersions {
AGP_70(AGP.AGP_70, GradleVersion.version(Gradle.G_7_0), 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_73(AGP.AGP_73, GradleVersion.version(Gradle.G_7_4), GradleVersion.version(Gradle.G_7_5), JavaVersion.VERSION_11),
;
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt
+3 -1
View File
@@ -23,7 +23,9 @@ class AGPVersion private constructor(private val versionNumber: VersionNumber) {
val v4_2_0 = fromString("4.2.2")
val v7_0_0 = fromString("7.0.4")
val v7_1_0 = fromString("7.1.2")
val v7_2_2 = fromString("7.2.2")
val v7_3_0 = fromString("7.3.0")
val testedVersions = listOf(v3_6_0, v4_1_0, v4_2_0, v7_0_0, v7_1_0)
val testedVersions = listOf(v3_6_0, v4_1_0, v4_2_0, v7_0_0, v7_1_0, v7_2_2, v7_3_0)
}
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt
+1 -1
View File
@@ -19,7 +19,7 @@ internal object KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck {
val compatibleAndroidGradlePluginVersionRange = AndroidGradlePluginVersionRange(
minSupportedVersion = AndroidGradlePluginVersion(4, 0),
maxSupportedVersion = AndroidGradlePluginVersion(7, 2)
maxSupportedVersion = AndroidGradlePluginVersion(7, 3)
)
/**