From a4e476952501126cedd8c2b747c5b4792063d856 Mon Sep 17 00:00:00 2001 From: Pavel Kargashinsky Date: Mon, 3 Apr 2023 11:30:42 +0200 Subject: [PATCH] Revert "[Gradle][Tests][MPP] Inherit mpp tests from MPPBaseTest" This reverts commit 11e4cb12b7e1a223525bde7d8ae8a8aece11e7e5. --- .../kotlin/gradle/ConfigurationCacheIT.kt | 43 ++++--------------- .../kotlin/gradle/HierarchicalMppIT.kt | 6 ++- .../gradle/MPPBuildReproducibilityIT.kt | 2 +- .../gradle/MppIdeDependencyResolutionIT.kt | 6 ++- .../gradle/android/KotlinAndroidMppIT.kt | 20 ++++----- ...MultiplatformAndroidSourceSetLayoutV2IT.kt | 4 +- .../mpp/AggregatingKotlinTestReportIT.kt | 2 +- .../gradle/mpp/BrokenLazyConfigurationIT.kt | 6 ++- .../kotlin/gradle/mpp/MppCompositeBuildIT.kt | 6 ++- .../kotlin/gradle/mpp/MppDiagnosticsIt.kt | 6 ++- .../gradle/mpp/MppSharedNativeCompileIT.kt | 6 ++- .../jetbrains/kotlin/gradle/mpp/MppTestsIT.kt | 4 +- .../kotlin/gradle/native/CinteropIT.kt | 6 ++- 13 files changed, 59 insertions(+), 58 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 9c2a6804baa..836999441b3 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 @@ -61,11 +61,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { @MppGradlePluginTests @DisplayName("works with MPP publishing") - @GradleTestVersions( - minVersion = TestVersions.Gradle.G_7_4, - maxVersion = BETA_GRADLE, - additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] - ) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4) @GradleTest fun testMppWithMavenPublish(gradleVersion: GradleVersion) { project("new-mpp-lib-and-app/sample-lib", gradleVersion) { @@ -81,11 +77,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { @NativeGradlePluginTests @DisplayName("works with native tasks in complex project") - @GradleTestVersions( - minVersion = TestVersions.Gradle.G_7_4, - maxVersion = BETA_GRADLE, - additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] - ) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4) @GradleTest fun testNativeTasks(gradleVersion: GradleVersion) { val expectedTasks = mutableListOf( @@ -122,11 +114,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { @NativeGradlePluginTests @DisplayName("works with commonizer") - @GradleTestVersions( - minVersion = TestVersions.Gradle.G_7_4, - maxVersion = BETA_GRADLE, - additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] - ) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4) @GradleTest fun testCommonizer(gradleVersion: GradleVersion) { project("native-configuration-cache", gradleVersion) { @@ -166,11 +154,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { // Set min Gradle version to 6.8 because of using DependencyResolutionManagement API to add repositories. @JvmGradlePluginTests @DisplayName("with instance execution") - @GradleTestVersions( - minVersion = TestVersions.Gradle.G_6_8, - maxVersion = BETA_GRADLE, - additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] - ) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8) @GradleTest fun testInstantExecution(gradleVersion: GradleVersion) { project("instantExecution", gradleVersion) { @@ -195,11 +179,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { @JvmGradlePluginTests @DisplayName("instant execution works with included build plugin") - @GradleTestVersions( - minVersion = TestVersions.Gradle.G_6_8, - maxVersion = BETA_GRADLE, - additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] - ) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8) @GradleTest fun testInstantExecutionWithIncludedBuildPlugin(gradleVersion: GradleVersion) { project("instantExecutionWithIncludedBuildPlugin", gradleVersion) { @@ -212,11 +192,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { @MppGradlePluginTests @DisplayName("works in MPP withJava project") - @GradleTestVersions( - minVersion = TestVersions.Gradle.G_7_0, - maxVersion = BETA_GRADLE, - additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] - ) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0) @GradleTest fun testJvmWithJavaConfigurationCache(gradleVersion: GradleVersion) { project("mppJvmWithJava", gradleVersion) { @@ -248,11 +224,8 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } @JvmGradlePluginTests - @DisplayName("with build scan report") + @DisplayName("with build build scan report") @GradleTest - @GradleTestVersions( // remove restriction after fix KT-57645 - maxVersion = TestVersions.Gradle.MAX_SUPPORTED - ) fun testBuildScanReportSmokeTestForConfigurationCache(gradleVersion: GradleVersion) { project("simpleProject", gradleVersion) { val buildOptions = defaultBuildOptions.copy(buildReport = listOf(BuildReportType.BUILD_SCAN), logLevel = LogLevel.DEBUG) @@ -267,7 +240,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } } -abstract class AbstractConfigurationCacheIT : MPPBaseTest() { +abstract class AbstractConfigurationCacheIT : KGPBaseTest() { override val defaultBuildOptions = super.defaultBuildOptions.copy(configurationCache = true) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt index ec2c0228a1a..e21f9d200c5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt @@ -31,8 +31,12 @@ import kotlin.test.assertTrue import kotlin.test.fail @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Hierarchical multiplatform") -open class HierarchicalMppIT : MPPBaseTest() { +open class HierarchicalMppIT : KGPBaseTest() { private val String.withPrefix get() = "hierarchical-mpp-published-modules/$this" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MPPBuildReproducibilityIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MPPBuildReproducibilityIT.kt index 68423e4c14d..c8aaf4266e2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MPPBuildReproducibilityIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MPPBuildReproducibilityIT.kt @@ -22,7 +22,7 @@ class MPPBuildReproducibilityIT : KGPBaseTest() { @GradleTest @GradleTestVersions( minVersion = TestVersions.Gradle.G_7_0, - maxVersion = BETA_GRADLE, + maxVersion = TestVersions.Gradle.NEXT_RELEASE, additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] ) @DisplayName("Check if consecutive builds produce same binaries: Simple Multiplatform project") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt index 6f2f3671441..1d9e1d37f9f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt @@ -30,8 +30,12 @@ import kotlin.test.assertEquals import kotlin.test.fail @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Multiplatform IDE dependency resolution") -class MppIdeDependencyResolutionIT : MPPBaseTest() { +class MppIdeDependencyResolutionIT : KGPBaseTest() { @GradleTest fun testCommonizedPlatformDependencyResolution(gradleVersion: GradleVersion) { with(project("commonizeHierarchically", gradleVersion)) { 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 03d53b32eef..1ccbff8281e 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 @@ -26,7 +26,9 @@ import kotlin.test.* @DisplayName("kotlin-android with mpp") @AndroidGradlePluginTests -class KotlinAndroidMppIT : MPPBaseTest() { +@AndroidTestVersions(additionalVersions = [TestVersions.AGP.NEXT_RELEASE]) +@GradleTestVersions(maxVersion = TestVersions.Gradle.NEXT_RELEASE, additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]) +class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("KT-50736: whenEvaluated waits for AGP being applied later") @GradleAndroidTest fun testAfterEvaluateOrdering( @@ -540,6 +542,7 @@ class KotlinAndroidMppIT : MPPBaseTest() { } } + // 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") @GradleAndroidTest fun testAndroidWithNewMppApp( @@ -818,11 +821,8 @@ class KotlinAndroidMppIT : MPPBaseTest() { */ @DisplayName("KT-49798: com.android.build.api.attributes.AgpVersionAttr is not published") @GradleAndroidTest - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [BETA_AGP]) - @GradleTestVersions( - minVersion = TestVersions.Gradle.G_7_2, maxVersion = BETA_GRADLE, - additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] - )// due AGP version limit ^ + @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^ fun testKT49798AgpVersionAttrNotPublished( gradleVersion: GradleVersion, agpVersion: String, @@ -855,9 +855,9 @@ class KotlinAndroidMppIT : MPPBaseTest() { @DisplayName("produced artifacts are consumable by projects with various AGP versions") @GradleAndroidTest - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [BETA_AGP]) + @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [TestVersions.AGP.NEXT_RELEASE]) @GradleTestVersions( - minVersion = TestVersions.Gradle.G_7_2, maxVersion = BETA_GRADLE, + minVersion = TestVersions.Gradle.G_7_2, maxVersion = TestVersions.Gradle.NEXT_RELEASE, additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] ) // due AGP version limit ^ fun testAndroidMultiplatformPublicationAGPCompatibility( @@ -926,9 +926,9 @@ class KotlinAndroidMppIT : MPPBaseTest() { @DisplayName("KT-49877, KT-35916: associate compilation dependencies are passed correctly to android test compilations") @GradleAndroidTest - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [BETA_AGP]) + @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [TestVersions.AGP.NEXT_RELEASE]) @GradleTestVersions( - minVersion = TestVersions.Gradle.G_7_2, maxVersion = BETA_GRADLE, + minVersion = TestVersions.Gradle.G_7_2, maxVersion = TestVersions.Gradle.NEXT_RELEASE, additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] ) // due AGP version limit ^ fun testAssociateCompilationDependenciesArePassedToAndroidTestCompilations( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt index 57a4fcbdba7..54ba0ef6a00 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt @@ -17,10 +17,10 @@ class MultiplatformAndroidSourceSetLayoutV2IT : KGPBaseTest() { @GradleAndroidTest @DisplayName("test Android project with flavors") - @AndroidTestVersions(minVersion = "7.0.4", additionalVersions = [BETA_AGP]) + @AndroidTestVersions(minVersion = "7.0.4", additionalVersions = [TestVersions.AGP.NEXT_RELEASE]) @GradleTestVersions( minVersion = TestVersions.Gradle.G_7_0, - maxVersion = BETA_GRADLE, + maxVersion = TestVersions.Gradle.NEXT_RELEASE, additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] ) // due AGP version limit ^ fun testProjectWithFlavors(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AggregatingKotlinTestReportIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AggregatingKotlinTestReportIT.kt index 4c7892ce3c8..9a6cc7e86ff 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AggregatingKotlinTestReportIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AggregatingKotlinTestReportIT.kt @@ -15,7 +15,7 @@ import org.junit.jupiter.api.DisplayName @MppGradlePluginTests @DisplayName("Tests for aggregating kotlin test reports") -class AggregatingKotlinTestReportIT : MPPBaseTest() { +class AggregatingKotlinTestReportIT : KGPBaseTest() { @DisplayName("KT-54506: `allTests` is not false positively up-to-date after failure") @GradleTest fun testFailedTestsAreNotUpToDate(gradleVersion: GradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/BrokenLazyConfigurationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/BrokenLazyConfigurationIT.kt index d0aac95ed8b..ea80cef6a7c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/BrokenLazyConfigurationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/BrokenLazyConfigurationIT.kt @@ -10,8 +10,12 @@ import org.jetbrains.kotlin.gradle.testbase.* import org.junit.jupiter.api.DisplayName @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Broken task configuration avoidance doesn't lead to build failures at least with simple setups") -class BrokenLazyConfigurationIT : MPPBaseTest() { +class BrokenLazyConfigurationIT : KGPBaseTest() { @GradleTest @DisplayName("works in JVM") fun testBrokenTcaInJvm(gradleVersion: GradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt index be9fb463af3..78f48be8f29 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt @@ -16,8 +16,12 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.condition.OS @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Tests for multiplatform with composite builds") -class MppCompositeBuildIT : MPPBaseTest() { +class MppCompositeBuildIT : KGPBaseTest() { @GradleTest fun `test - sample0 - ide dependencies`(gradleVersion: GradleVersion) { val producer = project("mpp-composite-build/sample0/producerBuild", gradleVersion) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt index d01995d8a11..fb5a09ea384 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt @@ -14,7 +14,11 @@ import kotlin.test.assertFalse import kotlin.test.assertTrue @MppGradlePluginTests -class MppDiagnosticsIt : MPPBaseTest() { +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) +class MppDiagnosticsIt : KGPBaseTest() { @GradleTest fun testDeprecatedProperties(gradleVersion: GradleVersion) { project("mppDeprecatedProperties", gradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt index 341202669b6..b0bc3059bf8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt @@ -15,8 +15,12 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.fail @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Tests for multiplatform | shared native compilations") -class MppSharedNativeCompileIT : MPPBaseTest() { +class MppSharedNativeCompileIT : KGPBaseTest() { /** * https://youtrack.jetbrains.com/issue/KT-56205/Shared-Native-Compilation-False-positive-w-Could-not-find-warnings-on-metadata-klibs * metadata klib should not contain any dependsOn= in their klib manifest. diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppTestsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppTestsIT.kt index ed09a4c5a3a..af8af993013 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppTestsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppTestsIT.kt @@ -12,10 +12,10 @@ import org.junit.jupiter.api.DisplayName @MppGradlePluginTests @DisplayName("Tests for multiplatform testing") -class MppTestsIT : MPPBaseTest() { +class MppTestsIT : KGPBaseTest() { @DisplayName("KT-54634: MPP testing logic is compatible with API changes in Gradle 7.6") @GradleTestVersions( - maxVersion = BETA_GRADLE, + maxVersion = TestVersions.Gradle.NEXT_RELEASE, additionalVersions = [TestVersions.Gradle.G_7_5, TestVersions.Gradle.G_7_6] ) @GradleTest diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CinteropIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CinteropIT.kt index 21a2732f18c..c5da87e5d0f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CinteropIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CinteropIT.kt @@ -9,7 +9,11 @@ import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.testbase.* @MppGradlePluginTests -class CinteropIT : MPPBaseTest() { +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) +class CinteropIT : KGPBaseTest() { @GradleTest fun `rerun cinterop after a header changing`(gradleVersion: GradleVersion) {