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

Make Kotlin2JsGradlePluginIT test compatible with gradle 2.x

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-04-18 21:33:38 +03:00
parent 51104a5c2b
commit 23c21396f7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+2 -2
View File
@@ -5,7 +5,7 @@ import org.junit.Test
class Kotlin2JsGradlePluginIT : BaseGradleIT() { class Kotlin2JsGradlePluginIT : BaseGradleIT() {
@Test @Test
fun testBuildAndClean() { fun testBuildAndClean() {
val project = Project("kotlin2JsProject", "1.6") val project = Project("kotlin2JsProject", "2.10")
project.build("build") { project.build("build") {
assertSuccessful() assertSuccessful()
@@ -63,7 +63,7 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
@Test @Test
fun testNoOutputFileFails() { fun testNoOutputFileFails() {
val project = Project("kotlin2JsNoOutputFileProject", "1.6") val project = Project("kotlin2JsNoOutputFileProject", "2.10")
project.build("build") { project.build("build") {
assertFailed() assertFailed()
assertReportExists() assertReportExists()
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle
+1 -1
View File
@@ -30,7 +30,7 @@ compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/web/js/app.js"
compileKotlin2Js.kotlinOptions.suppressWarnings = true compileKotlin2Js.kotlinOptions.suppressWarnings = true
compileKotlin2Js.kotlinOptions.verbose = true compileKotlin2Js.kotlinOptions.verbose = true
task copyJsFilesFromDependencies(dependsOn: build) { build.doLast {
configurations.compile.each { File file -> configurations.compile.each { File file ->
copy { copy {
includeEmptyDirs = false includeEmptyDirs = false