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

[Gradle][Tests][MPP] Revert inheritance from MPPBaseTest in AbstractConfigurationCacheIT

Browse Source
This commit is contained in:
Pavel Kargashinsky
2023-03-31 16:24:15 +02:00
committed by Space Team
parent 4b289e89c5
commit 641b5d5fa7
1 changed files with 8 additions and 35 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/ConfigurationCacheIT.kt
+8 -35
View File
@@ -61,11 +61,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
@MppGradlePluginTests @MppGradlePluginTests
@DisplayName("works with MPP publishing") @DisplayName("works with MPP publishing")
@GradleTestVersions( @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4)
minVersion = TestVersions.Gradle.G_7_4,
maxVersion = BETA_GRADLE,
additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
)
@GradleTest @GradleTest
fun testMppWithMavenPublish(gradleVersion: GradleVersion) { fun testMppWithMavenPublish(gradleVersion: GradleVersion) {
project("new-mpp-lib-and-app/sample-lib", gradleVersion) { project("new-mpp-lib-and-app/sample-lib", gradleVersion) {
@@ -81,11 +77,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
@NativeGradlePluginTests @NativeGradlePluginTests
@DisplayName("works with native tasks in complex project") @DisplayName("works with native tasks in complex project")
@GradleTestVersions( @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4)
minVersion = TestVersions.Gradle.G_7_4,
maxVersion = BETA_GRADLE,
additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
)
@GradleTest @GradleTest
fun testNativeTasks(gradleVersion: GradleVersion) { fun testNativeTasks(gradleVersion: GradleVersion) {
val expectedTasks = mutableListOf( val expectedTasks = mutableListOf(
@@ -122,11 +114,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
@NativeGradlePluginTests @NativeGradlePluginTests
@DisplayName("works with commonizer") @DisplayName("works with commonizer")
@GradleTestVersions( @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4)
minVersion = TestVersions.Gradle.G_7_4,
maxVersion = BETA_GRADLE,
additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
)
@GradleTest @GradleTest
fun testCommonizer(gradleVersion: GradleVersion) { fun testCommonizer(gradleVersion: GradleVersion) {
project("native-configuration-cache", 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. // Set min Gradle version to 6.8 because of using DependencyResolutionManagement API to add repositories.
@JvmGradlePluginTests @JvmGradlePluginTests
@DisplayName("with instance execution") @DisplayName("with instance execution")
@GradleTestVersions( @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8)
minVersion = TestVersions.Gradle.G_6_8,
maxVersion = BETA_GRADLE,
additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
)
@GradleTest @GradleTest
fun testInstantExecution(gradleVersion: GradleVersion) { fun testInstantExecution(gradleVersion: GradleVersion) {
project("instantExecution", gradleVersion) { project("instantExecution", gradleVersion) {
@@ -195,11 +179,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
@JvmGradlePluginTests @JvmGradlePluginTests
@DisplayName("instant execution works with included build plugin") @DisplayName("instant execution works with included build plugin")
@GradleTestVersions( @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8)
minVersion = TestVersions.Gradle.G_6_8,
maxVersion = BETA_GRADLE,
additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
)
@GradleTest @GradleTest
fun testInstantExecutionWithIncludedBuildPlugin(gradleVersion: GradleVersion) { fun testInstantExecutionWithIncludedBuildPlugin(gradleVersion: GradleVersion) {
project("instantExecutionWithIncludedBuildPlugin", gradleVersion) { project("instantExecutionWithIncludedBuildPlugin", gradleVersion) {
@@ -212,11 +192,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
@MppGradlePluginTests @MppGradlePluginTests
@DisplayName("works in MPP withJava project") @DisplayName("works in MPP withJava project")
@GradleTestVersions( @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0)
minVersion = TestVersions.Gradle.G_7_0,
maxVersion = BETA_GRADLE,
additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
)
@GradleTest @GradleTest
fun testJvmWithJavaConfigurationCache(gradleVersion: GradleVersion) { fun testJvmWithJavaConfigurationCache(gradleVersion: GradleVersion) {
project("mppJvmWithJava", gradleVersion) { project("mppJvmWithJava", gradleVersion) {
@@ -248,11 +224,8 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
} }
@JvmGradlePluginTests @JvmGradlePluginTests
@DisplayName("with build scan report") @DisplayName("with build build scan report")
@GradleTest @GradleTest
@GradleTestVersions( // remove restriction after fix KT-57645
maxVersion = TestVersions.Gradle.MAX_SUPPORTED
)
fun testBuildScanReportSmokeTestForConfigurationCache(gradleVersion: GradleVersion) { fun testBuildScanReportSmokeTestForConfigurationCache(gradleVersion: GradleVersion) {
project("simpleProject", gradleVersion) { project("simpleProject", gradleVersion) {
val buildOptions = defaultBuildOptions.copy(buildReport = listOf(BuildReportType.BUILD_SCAN), logLevel = LogLevel.DEBUG) 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 = override val defaultBuildOptions =
super.defaultBuildOptions.copy(configurationCache = true) super.defaultBuildOptions.copy(configurationCache = true)