diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index 1ca9c038563..a2c1085041f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -227,7 +227,7 @@ fun Test.includeTestsWithPattern(include: Boolean, patterns: (MutableSet } fun Test.advanceGradleVersion() { - val gradleVersionForTests = "8.1.1" + val gradleVersionForTests = "8.2.1" systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt index a68ecac1c1a..4096ce6656c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt @@ -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, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt index 26c96724a1a..43f532b3c2d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt @@ -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), ; } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle index 3dac7b0302f..952404f5922 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle @@ -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"