diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index d1806324a76..0334de032f7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt @@ -5,7 +5,7 @@ import org.junit.Test class Kotlin2JsGradlePluginIT : BaseGradleIT() { @Test fun testBuildAndClean() { - val project = Project("kotlin2JsProject", "1.6") + val project = Project("kotlin2JsProject", "2.10") project.build("build") { assertSuccessful() @@ -63,7 +63,7 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() { @Test fun testNoOutputFileFails() { - val project = Project("kotlin2JsNoOutputFileProject", "1.6") + val project = Project("kotlin2JsNoOutputFileProject", "2.10") project.build("build") { assertFailed() assertReportExists() diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle index c2481522888..f4ae20cf4ba 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle @@ -30,7 +30,7 @@ compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/app.js" compileKotlin2Js.kotlinOptions.suppressWarnings = true compileKotlin2Js.kotlinOptions.verbose = true -task copyJsFilesFromDependencies(dependsOn: build) { +build.doLast { configurations.compile.each { File file -> copy { includeEmptyDirs = false