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.4

Browse Source 
^KT-54982 Verification Pending
This commit is contained in:
Andrei.Tyrin
2022-11-18 09:24:47 +01:00
committed by Space Team
parent cc0bd8e57a
commit 0df7e689d9
4 changed files with 5 additions and 4 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/android/KotlinAndroidMppIT.kt
-2
View File
@@ -706,8 +706,6 @@ class KotlinAndroidMppIT : KGPBaseTest() {
} }
val checkedConsumerAGPVersions = AGPVersion.testedVersions val checkedConsumerAGPVersions = AGPVersion.testedVersions
// Special version added for testing KT-49798
.plus(AGPVersion.fromString("7.1.0-beta02"))
.filter { version -> version >= AGPVersion.fromString(TestVersions.AGP.AGP_42) } .filter { version -> version >= AGPVersion.fromString(TestVersions.AGP.AGP_42) }
.filter { version -> version < AGPVersion.fromString(TestVersions.AGP.MAX_SUPPORTED) } .filter { version -> version < AGPVersion.fromString(TestVersions.AGP.MAX_SUPPORTED) }
.map { it.toString() } .map { it.toString() }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
+2
View File
@@ -39,6 +39,7 @@ interface TestVersions {
const val AGP_71 = "7.1.3" const val AGP_71 = "7.1.3"
const val AGP_72 = "7.2.1" const val AGP_72 = "7.2.1"
const val AGP_73 = "7.3.0" const val AGP_73 = "7.3.0"
const val AGP_74 = "7.4.0-beta05"
const val MIN_SUPPORTED = AGP_41 // KotlinAndroidPlugin.MINIMAL_SUPPORTED_AGP_VERSION const val MIN_SUPPORTED = AGP_41 // KotlinAndroidPlugin.MINIMAL_SUPPORTED_AGP_VERSION
const val MAX_SUPPORTED = AGP_72 // Update once Gradle MAX_SUPPORTED version will be bumped to 7.2+ const val MAX_SUPPORTED = AGP_72 // Update once Gradle MAX_SUPPORTED version will be bumped to 7.2+
@@ -56,6 +57,7 @@ interface TestVersions {
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),
AGP_73(AGP.AGP_73, GradleVersion.version(Gradle.G_7_4), GradleVersion.version(Gradle.G_7_5), JavaVersion.VERSION_11), AGP_73(AGP.AGP_73, GradleVersion.version(Gradle.G_7_4), GradleVersion.version(Gradle.G_7_5), JavaVersion.VERSION_11),
AGP_74(AGP.AGP_74, GradleVersion.version(Gradle.G_7_5), 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
+2 -1
View File
@@ -24,7 +24,8 @@ class AGPVersion private constructor(private val versionNumber: VersionNumber) {
val v7_1_0 = fromString("7.1.2") val v7_1_0 = fromString("7.1.2")
val v7_2_2 = fromString("7.2.2") val v7_2_2 = fromString("7.2.2")
val v7_3_0 = fromString("7.3.0") val v7_3_0 = fromString("7.3.0")
val v7_4_0 = fromString("7.4.0-beta05")
val testedVersions = listOf(v4_1_0, v4_2_0, v7_0_0, v7_1_0, v7_2_2, v7_3_0) val testedVersions = listOf(v4_1_0, v4_2_0, v7_0_0, v7_1_0, v7_2_2, v7_3_0, v7_4_0)
} }
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.kt
+1 -1
View File
@@ -18,7 +18,7 @@ internal object KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck {
val compatibleAndroidGradlePluginVersionRange = AndroidGradlePluginVersionRange( val compatibleAndroidGradlePluginVersionRange = AndroidGradlePluginVersionRange(
minSupportedVersion = AndroidGradlePluginVersionRange.Version(4, 1), minSupportedVersion = AndroidGradlePluginVersionRange.Version(4, 1),
maxSupportedVersion = AndroidGradlePluginVersionRange.Version(7, 3) maxSupportedVersion = AndroidGradlePluginVersionRange.Version(7, 4)
) )
/** /**