From b936b5623540bb8533b09e3fa9e55330a16a16e7 Mon Sep 17 00:00:00 2001 From: Leonid Shalupov Date: Mon, 18 Mar 2013 23:22:41 +0400 Subject: [PATCH] fix maven build --- libraries/tools/kotlin-gradle-plugin/.gitignore | 1 + libraries/tools/kotlin-gradle-plugin/pom.xml | 2 +- ...adlePluginIntegrationTest.kt => KotlinGradlePluginIT.kt} | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin/.gitignore rename libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/{KotlinGradlePluginIntegrationTest.kt => KotlinGradlePluginIT.kt} (93%) diff --git a/libraries/tools/kotlin-gradle-plugin/.gitignore b/libraries/tools/kotlin-gradle-plugin/.gitignore new file mode 100644 index 00000000000..b97b22398a9 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/.gitignore @@ -0,0 +1 @@ +local-repo diff --git a/libraries/tools/kotlin-gradle-plugin/pom.xml b/libraries/tools/kotlin-gradle-plugin/pom.xml index c6ce7969ac1..af6d7e7f215 100644 --- a/libraries/tools/kotlin-gradle-plugin/pom.xml +++ b/libraries/tools/kotlin-gradle-plugin/pom.xml @@ -104,7 +104,7 @@ 1.8 ${project.build.directory}/it - ${project.build.directory}/local-repo + local-repo verify diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIntegrationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIntegrationTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 9a3b13be24c..1ad26bb3794 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIntegrationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -12,7 +12,7 @@ import kotlin.test.assertTrue import kotlin.test.assertEquals import kotlin.test.fail -class BasicKotlinGradleIntegrationTest { +class BasicKotlinGradleIT { var workingDir: File = File(".") @@ -30,11 +30,11 @@ class BasicKotlinGradleIntegrationTest { Test fun testSimpleCompile() { val projectDir = File(workingDir, "alfa") - val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("target/local-repo").getAbsolutePath() + val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("local-repo").getAbsolutePath() val cmd = if (SystemInfo.isWindows) listOf("cmd", "/C", "gradlew.bat", "clean", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug") else - listOf("/bin/sh", "./gradlew", "clean", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug") + listOf("/bin/bash", "./gradlew", "clean", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug") val builder = ProcessBuilder(cmd) builder.directory(projectDir)