[Gradle] Don't override warningMode with the default value in some tests

This commit is contained in:
Alexander.Likhachev
2023-01-16 20:57:15 +01:00
parent 9386fbbe0f
commit f57bf74e4f
4 changed files with 3 additions and 10 deletions
@@ -1,7 +1,6 @@
package org.jetbrains.kotlin.gradle
import org.gradle.api.logging.LogLevel
import org.gradle.api.logging.configuration.WarningMode
import org.gradle.testkit.runner.BuildResult
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.testbase.*
@@ -28,7 +27,6 @@ open class KaptIncrementalIT : KGPBaseTest() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(
incremental = true,
warningMode = WarningMode.Fail,
kaptOptions = BuildOptions.KaptOptions(incrementalKapt = true)
)
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.gradle
import org.gradle.api.logging.LogLevel
import org.gradle.api.logging.configuration.WarningMode
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.tasks.USING_JVM_INCREMENTAL_COMPILATION_MESSAGE
import org.jetbrains.kotlin.gradle.testbase.*
@@ -750,8 +749,7 @@ class KotlinGradleIT : KGPBaseTest() {
fun testNoDeprecationOnAssociatedDep(gradleVersion: GradleVersion) {
project(
"associatedDependencies",
gradleVersion,
buildOptions = defaultBuildOptions.copy(warningMode = WarningMode.Fail)
gradleVersion
) {
build("tasks")
}
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.gradle
import org.gradle.api.logging.configuration.WarningMode
import org.jetbrains.kotlin.commonizer.CommonizerTarget
import org.jetbrains.kotlin.gradle.util.WithSourceSetCommonizerDependencies
import org.jetbrains.kotlin.gradle.util.reportSourceSetCommonizerDependencies
@@ -29,7 +28,6 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().run {
copy(
forceOutputToStdout = true,
warningMode = WarningMode.Fail,
parallelTasksInProject = true,
freeCommandLineArgs = freeCommandLineArgs + "-s"
)
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.gradle
import com.intellij.testFramework.TestDataPath
import org.gradle.api.logging.LogLevel
import org.gradle.api.logging.configuration.WarningMode
import org.jetbrains.kotlin.gradle.internals.KOTLIN_12X_MPP_DEPRECATION_WARNING
import org.jetbrains.kotlin.gradle.plugin.EXPECTED_BY_CONFIG_NAME
import org.jetbrains.kotlin.gradle.plugin.IMPLEMENT_CONFIG_NAME
@@ -171,7 +170,7 @@ class MultiplatformGradleIT : BaseGradleIT() {
@Test
fun testMultipleCommonModules(): Unit = with(Project("multiplatformMultipleCommonModules")) {
build("build", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) {
build("build") {
assertSuccessful()
val sourceSets = listOf("", "Test")
@@ -295,7 +294,7 @@ class MultiplatformGradleIT : BaseGradleIT() {
val customSourceSetCompileTasks = listOf(":lib" to "Common", ":libJvm" to "")
.map { (module, platform) -> "$module:compile${sourceSetName.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}Kotlin$platform" }
build(*customSourceSetCompileTasks.toTypedArray(), options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) {
build(*customSourceSetCompileTasks.toTypedArray()) {
assertSuccessful()
assertTasksExecuted(customSourceSetCompileTasks)
}