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

Bump minimal supported AGP version to 4.2.2

Browse Source 
^KT-56454 In Progress
This commit is contained in:
Yahor Berdnikau
2023-02-22 22:20:35 +01:00
committed by Space Team
parent 321a476898
commit db5589121d
2 changed files with 2 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/testbase/TestVersions.kt
+1 -3
View File
@@ -37,7 +37,6 @@ interface TestVersions {
} }
object AGP { object AGP {
const val AGP_41 = "4.1.3"
const val AGP_42 = "4.2.2" const val AGP_42 = "4.2.2"
const val AGP_70 = "7.0.4" const val AGP_70 = "7.0.4"
const val AGP_71 = "7.1.3" const val AGP_71 = "7.1.3"
@@ -46,7 +45,7 @@ interface TestVersions {
const val AGP_74 = "7.4.0" const val AGP_74 = "7.4.0"
const val AGP_80 = "8.0.0-alpha11" const val AGP_80 = "8.0.0-alpha11"
const val MIN_SUPPORTED = AGP_41 // KotlinAndroidPlugin.MINIMAL_SUPPORTED_AGP_VERSION const val MIN_SUPPORTED = AGP_42 // KotlinAndroidPlugin.minimalSupportedAgpVersion
const val MAX_SUPPORTED = AGP_74 // Update once Gradle MAX_SUPPORTED version will be bumped const val MAX_SUPPORTED = AGP_74 // Update once Gradle MAX_SUPPORTED version will be bumped
} }
@@ -56,7 +55,6 @@ interface TestVersions {
val maxSupportedGradleVersion: GradleVersion, val maxSupportedGradleVersion: GradleVersion,
val requiredJdkVersion: JavaVersion val requiredJdkVersion: JavaVersion
) { ) {
AGP_41(AGP.AGP_41, GradleVersion.version(Gradle.MIN_SUPPORTED), GradleVersion.version(Gradle.G_6_9), JavaVersion.VERSION_1_8),
AGP_42(AGP.AGP_42, GradleVersion.version(Gradle.MIN_SUPPORTED), GradleVersion.version(Gradle.G_6_9), JavaVersion.VERSION_1_8), AGP_42(AGP.AGP_42, GradleVersion.version(Gradle.MIN_SUPPORTED), GradleVersion.version(Gradle.G_6_9), JavaVersion.VERSION_1_8),
AGP_70(AGP.AGP_70, GradleVersion.version(Gradle.G_7_0), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11), 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_71(AGP.AGP_71, GradleVersion.version(Gradle.G_7_2), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11),
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt
+1 -1
View File
@@ -45,7 +45,7 @@ internal open class KotlinAndroidPlugin(
} }
companion object { companion object {
private val minimalSupportedAgpVersion = AndroidGradlePluginVersion(4, 1, 3) private val minimalSupportedAgpVersion = AndroidGradlePluginVersion(4, 2, 2)
fun androidTargetHandler(): AndroidProjectHandler { fun androidTargetHandler(): AndroidProjectHandler {
val tasksProvider = KotlinTasksProvider() val tasksProvider = KotlinTasksProvider()
val androidGradlePluginVersion = AndroidGradlePluginVersion.currentOrNull val androidGradlePluginVersion = AndroidGradlePluginVersion.currentOrNull