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

[Gradle] Bump max Gradle version in tests to 8.2.1

Browse Source 
^KT-58064 In Progress
This commit is contained in:
Yahor Berdnikau
2023-07-26 19:53:07 +02:00
committed by Space Team
parent b666e66e19
commit fc6ef76afe
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+1 -1
View File
@@ -227,7 +227,7 @@ fun Test.includeTestsWithPattern(include: Boolean, patterns: (MutableSet<String>
}
fun Test.advanceGradleVersion() {
val gradleVersionForTests = "8.1.1"
val gradleVersionForTests = "8.2.1"
systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt
-4
View File
@@ -739,8 +739,6 @@ class KotlinAndroidMppIT : KGPBaseTest() {
*/
@DisplayName("KT-49798: com.android.build.api.attributes.AgpVersionAttr is not published")
@GradleAndroidTest
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71)
@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^
fun testKT49798AgpVersionAttrNotPublished(
gradleVersion: GradleVersion,
agpVersion: String,
@@ -833,8 +831,6 @@ class KotlinAndroidMppIT : KGPBaseTest() {
@DisplayName("KT-49877, KT-35916: associate compilation dependencies are passed correctly to android test compilations")
@GradleAndroidTest
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71)
@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^
fun testAssociateCompilationDependenciesArePassedToAndroidTestCompilations(
gradleVersion: GradleVersion,
agpVersion: String,
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
+7 -6
View File
@@ -22,15 +22,16 @@ interface TestVersions {
const val G_7_3 = "7.3.3"
const val G_7_4 = "7.4.2"
const val G_7_5 = "7.5.1"
const val G_7_6 = "7.6.2"
const val G_7_6 = "7.6.3"
const val G_8_0 = "8.0.2"
const val G_8_1 = "8.1.1"
const val G_8_2 = "8.2.1"
const val G_8_3 = "8.3-rc-1"
const val G_8_3 = "8.3"
const val G_8_4 = "8.4"
const val MIN_SUPPORTED = minSupportedGradleVersion
const val MIN_SUPPORTED_KPM = G_7_0
const val MAX_SUPPORTED = G_8_1
const val MAX_SUPPORTED = G_8_2
}
object Kotlin {
@@ -51,7 +52,7 @@ interface TestVersions {
const val AGP_82 = "8.2.0-rc03"
const val MIN_SUPPORTED = AGP_71 // KotlinAndroidPlugin.minimalSupportedAgpVersion
const val MAX_SUPPORTED = AGP_81 // Update once Gradle MAX_SUPPORTED version will be bumped
const val MAX_SUPPORTED = AGP_82 // Update once Gradle MAX_SUPPORTED version will be bumped
}
enum class AgpCompatibilityMatrix(
@@ -65,8 +66,8 @@ interface TestVersions {
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_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_2), GradleVersion.version(Gradle.G_8_3), JavaVersion.VERSION_17),
AGP_81(AGP.AGP_81, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17),
AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17),
;
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle
+2 -2
View File
@@ -9,12 +9,12 @@ java {
}
android {
compileSdkVersion 31
compileSdkVersion 33
namespace 'app.example.com.app_sample'
defaultConfig {
applicationId "app.example.com.app_sample"
minSdkVersion 26
targetSdkVersion 31
targetSdkVersion 33
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"