diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt index 89ed6c99fc3..acd22bb043a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle +import org.gradle.api.logging.configuration.WarningMode import org.jetbrains.kotlin.gradle.targets.js.dukat.ExternalsOutputFormat import org.jetbrains.kotlin.gradle.util.modify import org.junit.Test @@ -330,7 +331,7 @@ class DukatIntegrationIT : BaseGradleIT() { project.setupWorkingDir() project.gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) - project.build("assemble") { + project.build("assemble", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertSuccessful() } } @@ -381,7 +382,7 @@ class DukatIntegrationIT : BaseGradleIT() { } val externalSrcs = "build/externals/both-jsIr/src" - project.build("assemble") { + project.build("assemble", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertSuccessful() assertTasksExecuted(":irGenerateExternalsIntegrated") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt index 2425c7fa4a9..e14da624cf5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt @@ -71,8 +71,8 @@ class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationMultiP apply plugin: 'kotlin' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:${"$"}kotlin_version" - compile 'org.codehaus.groovy:groovy-all:2.4.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:${"$"}kotlin_version" + implementation 'org.codehaus.groovy:groovy-all:2.4.8' } """.trimIndent() } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt index 666197a3a18..c14ab73a1fc 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.gradle +import org.gradle.api.logging.configuration.WarningMode import org.jetbrains.kotlin.gradle.tasks.USING_JVM_INCREMENTAL_COMPILATION_MESSAGE import org.jetbrains.kotlin.gradle.util.* import org.junit.Assert @@ -30,7 +31,7 @@ abstract class Kapt3BaseIT : BaseGradleIT() { } override fun defaultBuildOptions(): BuildOptions = - super.defaultBuildOptions().copy(kaptOptions = kaptOptions()) + super.defaultBuildOptions().copy(kaptOptions = kaptOptions(), warningMode = WarningMode.Summary) protected open fun kaptOptions(): KaptOptions = KaptOptions(verbose = true, useWorkers = false) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 4494ee65b35..dcaec936d7d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -776,7 +776,7 @@ class KotlinGradleIT : BaseGradleIT() { setupWorkingDir() // Add a dependency with an explicit lower Kotlin version that has a kotlin-stdlib transitive dependency: gradleBuildScript().appendText("\ndependencies { implementation 'org.jetbrains.kotlin:kotlin-reflect:1.2.71' }") - testResolveAllConfigurations { + testResolveAllConfigurations(options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertSuccessful() assertContains(">> :compileClasspath --> kotlin-reflect-1.2.71.jar") // Check that the default newer Kotlin version still wins for 'kotlin-stdlib': diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt index 511348ab314..c7eb4983425 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.gradle import com.intellij.testFramework.TestDataPath +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 @@ -175,7 +176,7 @@ class MultiplatformGradleIT : BaseGradleIT() { @Test fun testMultipleCommonModules(): Unit = with(Project("multiplatformMultipleCommonModules")) { - build("build") { + build("build", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertSuccessful() val sourceSets = listOf("", "Test") @@ -305,7 +306,7 @@ class MultiplatformGradleIT : BaseGradleIT() { val customSourceSetCompileTasks = listOf(":lib" to "Common", ":libJs" to "2Js", ":libJvm" to "") .map { (module, platform) -> "$module:compile${sourceSetName.capitalize()}Kotlin$platform" } - build(*customSourceSetCompileTasks.toTypedArray()) { + build(*customSourceSetCompileTasks.toTypedArray(), options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertSuccessful() assertTasksExecuted(customSourceSetCompileTasks) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index d6c31353717..7f098031483 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -44,10 +44,6 @@ class NewMultiplatformIT : BaseGradleIT() { private fun Project.targetClassesDir(targetName: String, sourceSetName: String = "main") = classesDir(sourceSet = "$targetName/$sourceSetName") - override fun defaultBuildOptions(): BuildOptions { - return super.defaultBuildOptions().copy(warningMode = WarningMode.Summary) - } - @Test fun testLibAndApp() = doTestLibAndApp( "sample-lib", @@ -1280,7 +1276,7 @@ class NewMultiplatformIT : BaseGradleIT() { @Test fun testJsDceInMpp() = with(Project("new-mpp-js-dce", gradleVersion)) { - build("runRhino") { + build("runRhino", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertSuccessful() assertTasksExecuted(":mainProject:runDceNodeJsKotlin") @@ -1365,7 +1361,7 @@ class NewMultiplatformIT : BaseGradleIT() { fun testDependenciesDsl() = with(transformProjectWithPluginsDsl("newMppDependenciesDsl")) { val originalBuildscriptContent = gradleBuildScript("app").readText() - fun testDependencies() = testResolveAllConfigurations("app") { + fun testDependencies() = testResolveAllConfigurations("app", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertContains(">> :app:testNonTransitiveStringNotationApiDependenciesMetadata --> junit-4.12.jar") assertEquals( 1, @@ -1399,7 +1395,7 @@ class NewMultiplatformIT : BaseGradleIT() { @Test fun testMultipleTargetsSamePlatform() = with(Project("newMppMultipleTargetsSamePlatform", gradleVersion)) { - testResolveAllConfigurations("app") { + testResolveAllConfigurations("app", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertContains(">> :app:junitCompileClasspath --> lib-junit.jar") assertContains(">> :app:junitCompileClasspath --> junit-4.12.jar") @@ -1489,7 +1485,7 @@ class NewMultiplatformIT : BaseGradleIT() { val groupDir = "build/repo/com/example/" - build(":mpp-lib:publish") { + build(":mpp-lib:publish", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertSuccessful() assertFileExists(groupDir + "mpp-lib") assertFileExists(groupDir + "mpp-lib-myjvm") @@ -1506,7 +1502,7 @@ class NewMultiplatformIT : BaseGradleIT() { add("-Pkotlin.mpp.keepMppDependenciesIntactInPoms=true") }.toTypedArray() - build(*params) { + build(*params, options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { assertSuccessful() if (legacyPublishing) { assertTasksExecuted(":jvm-app:uploadArchives") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt index 9cb76dd0ed7..11582abb572 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt @@ -1,5 +1,6 @@ package org.jetbrains.kotlin.gradle +import org.gradle.api.logging.configuration.WarningMode import org.jetbrains.kotlin.gradle.util.modify import org.junit.Test import java.io.File @@ -7,6 +8,10 @@ import kotlin.test.assertTrue class SimpleKotlinGradleIT : BaseGradleIT() { + override fun defaultBuildOptions(): BuildOptions { + return super.defaultBuildOptions().copy(warningMode = WarningMode.Summary) + } + @Test fun testSimpleCompile() { val project = Project("simpleProject") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt index 14395c033ea..ae78f872008 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle +import org.gradle.api.logging.configuration.WarningMode import org.jetbrains.kotlin.gradle.util.AGPVersion import org.jetbrains.kotlin.gradle.util.checkBytecodeContains import org.jetbrains.kotlin.gradle.util.modify @@ -14,6 +15,11 @@ import java.io.File import kotlin.test.assertTrue class SubpluginsIT : BaseGradleIT() { + + override fun defaultBuildOptions(): BuildOptions { + return super.defaultBuildOptions().copy(warningMode = WarningMode.Summary) + } + @Test fun testGradleSubplugin() { val project = Project("kotlinGradleSubplugin") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt index 11b64504a84..bbf0dea1eba 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.gradle.native import com.intellij.testFramework.TestDataFile -import org.gradle.api.logging.configuration.WarningMode import org.jdom.input.SAXBuilder import org.jetbrains.kotlin.gradle.BaseGradleIT import org.jetbrains.kotlin.gradle.GradleVersionRequired @@ -94,10 +93,6 @@ class GeneralNativeIT : BaseGradleIT() { override val defaultGradleVersion: GradleVersionRequired get() = GradleVersionRequired.FOR_MPP_SUPPORT - override fun defaultBuildOptions(): BuildOptions { - return super.defaultBuildOptions().copy(warningMode = WarningMode.Summary) - } - @Test fun testParallelExecutionSmoke(): Unit = with(transformNativeTestProjectWithPluginDsl("native-parallel")) { // Check that the K/N compiler can be started in-process in parallel. diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt index 00a0becad39..42d9a25933d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt @@ -17,6 +17,7 @@ fun BaseGradleIT.Project.testResolveAllConfigurations( subproject: String? = null, skipSetup: Boolean = false, excludePredicate: String = "false", + options: BaseGradleIT.BuildOptions = testCase.defaultBuildOptions(), withUnresolvedConfigurationNames: BaseGradleIT.CompiledProject.(List) -> Unit = { assertTrue("Unresolved configurations: $it") { it.isEmpty() } } ) = with(testCase) { @@ -32,7 +33,7 @@ fun BaseGradleIT.Project.testResolveAllConfigurations( } } - build(RESOLVE_ALL_CONFIGURATIONS_TASK_NAME, options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { + build(RESOLVE_ALL_CONFIGURATIONS_TASK_NAME, options = options) { assertSuccessful() assertTasksExecuted(":${subproject?.let { "$it:" }.orEmpty()}$RESOLVE_ALL_CONFIGURATIONS_TASK_NAME") val unresolvedConfigurations = unresolvedConfigurationRegex.findAll(output).map { it.groupValues[1] }.toList() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/app/build.gradle index b5432a9eb42..14dcf14ce9d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/app/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'kotlin' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile project(':lib') + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation project(':lib') } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/lib/build.gradle index ee7434e1b5d..83e41992508 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/lib/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'kotlin' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/gradleDaemonMemory/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/gradleDaemonMemory/build.gradle index 4b43348d5bb..9b88a6b1b5d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/gradleDaemonMemory/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/gradleDaemonMemory/build.gradle @@ -16,7 +16,7 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } task('exit') { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/javaUpToDate/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/javaUpToDate/build.gradle index 1e12b34c08a..b51ecf61c66 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/javaUpToDate/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/javaUpToDate/build.gradle @@ -17,5 +17,5 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle index 25453af6be8..590f2a51e9c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle @@ -13,8 +13,8 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - testCompile "junit:junit:4.12" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" + testImplementation "junit:junit:4.12" } afterEvaluate { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyToSubprojects/subproject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyToSubprojects/subproject/build.gradle index aff049022b6..3522d887da3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyToSubprojects/subproject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyToSubprojects/subproject/build.gradle @@ -1,7 +1,7 @@ dependencies { - compile 'com.google.guava:guava:12.0' - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'com.google.guava:guava:12.0' + testImplementation 'org.testng:testng:6.8' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test {