From 5c56145a194b17a8de849072e8dc019cec483547 Mon Sep 17 00:00:00 2001 From: Pavel Kargashinsky Date: Mon, 3 Apr 2023 13:07:50 +0200 Subject: [PATCH] [Gradle][Tests][MPP] Use MAX_SUPPORTED AGP/Gradle versions for MPP tests --- .../kotlin/gradle/ConfigurationCacheIT.kt | 2 +- .../kotlin/gradle/GradleVersionRequired.kt | 3 ++- .../kotlin/gradle/android/KotlinAndroidMppIT.kt | 15 +++++++++------ .../kotlin/gradle/native/AppleFrameworkIT.kt | 3 ++- .../kotlin/gradle/native/AppleSiliconIT.kt | 1 - .../kotlin/gradle/native/XCFrameworkIT.kt | 3 ++- .../kotlin/gradle/testbase/TestVersions.kt | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt index 836999441b3..01d1cd6814b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt @@ -224,7 +224,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } @JvmGradlePluginTests - @DisplayName("with build build scan report") + @DisplayName("with build scan report") @GradleTest fun testBuildScanReportSmokeTestForConfigurationCache(gradleVersion: GradleVersion) { project("simpleProject", gradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt index 255dc0bb7c3..6dd748f8215 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.gradle import org.gradle.util.GradleVersion import org.jetbrains.kotlin.com.google.common.base.Objects import org.jetbrains.kotlin.gradle.GradleVersionRequired.Companion.OLDEST_SUPPORTED +import org.jetbrains.kotlin.gradle.testbase.TestVersions import org.jetbrains.kotlin.gradle.utils.minSupportedGradleVersion import org.junit.Assume @@ -26,7 +27,7 @@ sealed class GradleVersionRequired(val minVersion: String, val maxVersion: Strin companion object { const val OLDEST_SUPPORTED = minSupportedGradleVersion - val FOR_MPP_SUPPORT = AtLeast(OLDEST_SUPPORTED) + val FOR_MPP_SUPPORT = AtLeast(TestVersions.Gradle.MAX_SUPPORTED) } class Exact(version: String) : GradleVersionRequired(version, version) { 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 8e72c40ab36..18404cd0cad 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 @@ -71,6 +71,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { android { compileSdkVersion 22 + namespace 'org.jetbrains.kotlin.gradle.test.android.libalfa' } kotlin { android("android") { } } @@ -129,7 +130,6 @@ class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("mpp source sets are registered in AGP") @GradleAndroidTest - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) fun testAndroidMppSourceSets( gradleVersion: GradleVersion, agpVersion: String, @@ -540,10 +540,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { } } - // AGP max version is limited due to https://youtrack.jetbrains.com/issue/KT-51940/HMPP-resolves-configurations-during-configuration @DisplayName("android app can depend on mpp lib") - @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_72) - @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_4) // due AGP version limit ^ @GradleAndroidTest fun testAndroidWithNewMppApp( gradleVersion: GradleVersion, @@ -726,7 +723,10 @@ class KotlinAndroidMppIT : KGPBaseTest() { appBuildScriptBackup + //language=Gradle """ - + + android { + namespace 'app.example.com.lib' + } kotlin.targets.all { compilations.all { attributes.attribute( @@ -741,7 +741,10 @@ class KotlinAndroidMppIT : KGPBaseTest() { appBuildScriptBackup + //language=Gradle """ - + + android { + namespace 'app.example.com.app_sample' + } kotlin.targets.androidApp.compilations.all { attributes.attribute( Attribute.of("com.example.compilation", String), diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt index 15b99f1b383..efd4bf39ba5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt @@ -28,7 +28,8 @@ class AppleFrameworkIT : BaseGradleIT() { override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT override fun defaultBuildOptions() = super.defaultBuildOptions().copy( androidHome = KtTestUtil.findAndroidSdk(), - androidGradlePluginVersion = AGPVersion.v4_2_0 + androidGradlePluginVersion = AGPVersion.v7_4_0, + javaHome = KtTestUtil.getJdk17Home() ) @Test diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleSiliconIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleSiliconIT.kt index 60188251069..8cf0d2e3575 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleSiliconIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleSiliconIT.kt @@ -98,7 +98,6 @@ class AppleSiliconIT : BaseGradleIT() { val x64Tests = listOf( ":iosX64Test", - ":jvmTest", ":macosX64Test", ":tvosX64Test", ":watchosX64Test", diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt index d5fa391e58e..0f4ec13c8a7 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt @@ -28,7 +28,8 @@ class XCFrameworkIT : BaseGradleIT() { override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT override fun defaultBuildOptions() = super.defaultBuildOptions().copy( androidHome = KtTestUtil.findAndroidSdk(), - androidGradlePluginVersion = AGPVersion.v4_2_0 + androidGradlePluginVersion = AGPVersion.v7_4_0, + javaHome = KtTestUtil.getJdk17Home() ) @Test 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 2984c96763a..92a8c9d3c2c 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,7 +22,7 @@ interface TestVersions { const val G_7_6 = "7.6" // https://gradle.org/nightly/ // Retention policy is 3 months - const val G_8_0 = "8.0-rc-1" + const val G_8_0 = "8.0.2" const val MIN_SUPPORTED = minSupportedGradleVersion const val MIN_SUPPORTED_KPM = G_7_0 const val MAX_SUPPORTED = G_7_6