From 2e7e1625d301fc23b16fdb6c4e5e5f63a7e65bc6 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Fri, 20 Jan 2023 01:40:19 +0100 Subject: [PATCH] [Gradle] Remove warnings suppression from more tests KT-55972 Related --- .../kotlin/gradle/ConfigurationAvoidanceIT.kt | 11 +--------- .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 10 +--------- .../mpp/AndroidAndJavaConsumeMppLibIT.kt | 20 ++++++++++++------- .../kotlin/gradle/tasks/CleanDataTaskIT.kt | 12 +---------- 4 files changed, 16 insertions(+), 37 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt index 2ea3f7f2bb6..607c7578a4e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt @@ -153,16 +153,7 @@ class ConfigurationAvoidanceIT : KGPBaseTest() { @DisplayName("JS early configuration resolution") @GradleTest fun testEarlyConfigurationsResolutionKotlinJs(gradleVersion: GradleVersion) { - testEarlyConfigurationsResolution( - "kotlin-js-browser-project", - gradleVersion, - kts = true, - buildOptions = defaultBuildOptions.suppressDeprecationWarningsUntilGradleVersion( - TestVersions.Gradle.G_7_0, - gradleVersion, - "bug in Gradle: https://github.com/gradle/gradle/issues/15796" - ) - ) + testEarlyConfigurationsResolution("kotlin-js-browser-project", gradleVersion, kts = true) } private fun testEarlyConfigurationsResolution( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 474a2b1af1a..02952eeac22 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt @@ -1601,15 +1601,7 @@ class GeneralKotlin2JsGradlePluginIT : KGPBaseTest() { @DisplayName("nodejs up-to-date check works") @GradleTest fun testNodeJsAndYarnDownload(gradleVersion: GradleVersion) { - project( - "cleanTask", - gradleVersion, - buildOptions = defaultBuildOptions.suppressDeprecationWarningsUntilGradleVersion( - TestVersions.Gradle.G_7_0, - gradleVersion, - "bug in Gradle: https://github.com/gradle/gradle/issues/15796" - ) - ) { + project("cleanTask", gradleVersion) { build("checkDownloadedFolder") build("checkIfLastModifiedNotNow", "--rerun-tasks") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt index d379137fdf7..24aeb134aa6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.mpp +import org.gradle.api.logging.LogLevel import org.gradle.api.logging.configuration.WarningMode import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.* @@ -90,6 +91,8 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() { buildParams.map { arrayOf(*it, agpVersion, gradleVersion) } } } + + const val oldKotlinVersion = "1.5.31" } @Parameterized.Parameter(0) @@ -122,7 +125,7 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() { val producerBuildOptions: BuildOptions - dependencyProject = Project("new-mpp-android", producerGradleVersion).apply { + dependencyProject = Project("new-mpp-android", producerGradleVersion, minLogLevel = LogLevel.INFO).apply { val usedProducerGradleVersion = chooseWrapperVersionOrFinishTest() producerBuildOptions = defaultBuildOptions().copy( javaHome = jdk11Home, @@ -130,8 +133,8 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() { androidGradlePluginVersion = producerAgpVersion, ).suppressDeprecationWarningsOn( "AGP relies on FileTrees for ignoring empty directories when using @SkipWhenEmpty which has been deprecated (Gradle 7.4)" - ) { - GradleVersion.version(usedProducerGradleVersion) >= GradleVersion.version(TestVersions.Gradle.G_7_4) && producerAgpVersion < AGPVersion.v7_1_0 + ) { options -> + GradleVersion.version(usedProducerGradleVersion) >= GradleVersion.version(TestVersions.Gradle.G_7_4) && options.safeAndroidGradlePluginVersion < AGPVersion.v7_1_0 } producerBuildOptions.androidHome?.let { acceptAndroidSdkLicenses(it) } projectDir.deleteRecursively() @@ -194,7 +197,7 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() { // We don't want to test the behavior with old Kotlin project-to-project dependencies, only compatibility with publications: if (isPublishedLibrary) { - runConsumerTest(dependencyProject, withKotlinVersion = "1.5.31") + runConsumerTest(dependencyProject, withKotlinVersion = oldKotlinVersion) } } @@ -220,7 +223,7 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() { else "project(\":${dependencyProject.projectName}:lib\")" val usedConsumerGradleVersion: String - val consumerProject = Project("AndroidProject", consumerGradleVersion).apply { + val consumerProject = Project("AndroidProject", consumerGradleVersion, minLogLevel = LogLevel.INFO).apply { usedConsumerGradleVersion = chooseWrapperVersionOrFinishTest() projectDir.deleteRecursively() if (!isPublishedLibrary) { @@ -296,8 +299,11 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() { kotlinVersion = withKotlinVersion ?: defaultBuildOptions().kotlinVersion ).suppressDeprecationWarningsOn( "AGP uses deprecated IncrementalTaskInputs (Gradle 7.5)" - ) { - GradleVersion.version(usedConsumerGradleVersion) >= GradleVersion.version(TestVersions.Gradle.G_7_5) && consumerAgpVersion < AGPVersion.v7_3_0 + ) { options -> + // looks a bit messy :/ + (!isPublishedLibrary && (withKotlinVersion != null || options.safeAndroidGradlePluginVersion >= AGPVersion.v7_0_0) || isPublishedLibrary && withKotlinVersion == oldKotlinVersion) && + GradleVersion.version(usedConsumerGradleVersion) >= GradleVersion.version(TestVersions.Gradle.G_7_5) && + options.safeAndroidGradlePluginVersion < AGPVersion.v7_3_0 } val variantCheckRequests = mutableMapOf() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt index f88042241cd..c56580d9705 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt @@ -5,27 +5,17 @@ package org.jetbrains.kotlin.gradle.tasks -import org.gradle.api.logging.configuration.WarningMode import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.testbase.* import org.junit.jupiter.api.DisplayName - @JsGradlePluginTests class CleanDataTaskIT : KGPBaseTest() { @DisplayName("nodejs is deleted from Gradle user home") @GradleTest fun testDownloadedFolderDeletion(gradleVersion: GradleVersion) { - project( - "cleanTask", - gradleVersion, - buildOptions = defaultBuildOptions.suppressDeprecationWarningsUntilGradleVersion( - TestVersions.Gradle.G_7_0, - gradleVersion, - "bug in Gradle: https://github.com/gradle/gradle/issues/15796" - ) - ) { + project("cleanTask", gradleVersion) { build("testCleanTask") } }