diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index ad7e7bf5edb..b3d93a9730b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -299,7 +299,7 @@ abstract class BaseGradleIT { } fun CompiledProject.assertNoWarnings() { - val warnings = "w: .*$".toRegex().findAll(output).map { it.groupValues[0] } + val warnings = "w: .*".toRegex().findAll(output).map { it.groupValues[0] } if (warnings.any()) { val message = (listOf("Output should not contain any warnings:") + warnings).joinToString(SYSTEM_LINE_SEPARATOR) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt index 09e729c1686..5a21db1593f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt @@ -7,7 +7,7 @@ import java.io.File class ExecutionStrategyJsIT : ExecutionStrategyIT() { override fun setupProject(project: Project) { - project.setupWorkingDir() + super.setupProject(project) val buildGradle = File(project.projectDir, "app/build.gradle") buildGradle.modify { it.replace("apply plugin: \"kotlin\"", "apply plugin: \"kotlin2js\"") + "\ncompileKotlin2Js.kotlinOptions.outputFile = \"web/js/out.js\"" } @@ -62,6 +62,10 @@ open class ExecutionStrategyIT : BaseGradleIT() { } protected open fun setupProject(project: Project) { + project.setupWorkingDir() + File(project.projectDir, "app/build.gradle").appendText( + "\ntasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile).all { kotlinOptions.allWarningsAsErrors = true }" + ) } protected open fun CompiledProject.checkOutput() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinBuiltins/app/src/main/kotlin/f.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinBuiltins/app/src/main/kotlin/f.kt index bec949b8acf..a9b416ecab5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinBuiltins/app/src/main/kotlin/f.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinBuiltins/app/src/main/kotlin/f.kt @@ -1,3 +1,4 @@ package foo -fun f(fn: (x: Int)->Unit) {} \ No newline at end of file +@Suppress("unused_parameter") +fun f(fn: (x: Int)->Unit) { } \ No newline at end of file