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

[Gradle] Remove warnings suppression from more tests

Browse Source 
KT-55972 Related
This commit is contained in:
Alexander.Likhachev
2023-01-20 01:40:19 +01:00
committed by Space Team
parent 9bb2a2468d
commit 2e7e1625d3
4 changed files with 16 additions and 37 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/ConfigurationAvoidanceIT.kt
+1 -10
View File
@@ -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(
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+1 -9
View File
@@ -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")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt
+13 -7
View File
@@ -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<ResolvedVariantRequest, String>()
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt
+1 -11
View File
@@ -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")
}
}