diff --git a/src/test/resources/projects/javaFirst/kobalt/src/Build.kt b/src/test/resources/projects/javaFirst/kobalt/src/Build.kt deleted file mode 100644 index 3bc14f76..00000000 --- a/src/test/resources/projects/javaFirst/kobalt/src/Build.kt +++ /dev/null @@ -1,27 +0,0 @@ -import com.beust.kobalt.* -import com.beust.kobalt.plugin.packaging.assemble -import com.beust.kobalt.plugin.kotlin.* - -val repos = repos() - - -val p = kotlinProject { - - name = "mixed" - group = "com.example" - artifactId = name - version = "0.1" - - sourceDirectories { - path("src/main/java", "src/main/kotlin") - } - - assemble { - jar { - fatJar = true - manifest { - attributes("Main-Class", "example.KotlinMainKt") - } - } - } -} diff --git a/src/test/resources/projects/kobalt/src/Build.kt b/src/test/resources/projects/kobalt/src/Build.kt new file mode 100644 index 00000000..76f139a4 --- /dev/null +++ b/src/test/resources/projects/kobalt/src/Build.kt @@ -0,0 +1,72 @@ +import com.beust.kobalt.* +import com.beust.kobalt.plugin.packaging.assemble +import com.beust.kobalt.plugin.java.* +import com.beust.kobalt.plugin.kotlin.* + +val javaFirst = kotlinProject { + name = "javaFirst" + group = "com.example" + artifactId = name + version = "0.1" + directory = name + + sourceDirectories { + path("src/main/java", "src/main/kotlin") + } + + assemble { + jar { + fatJar = true + manifest { + attributes("Main-Class", "example.KotlinMainKt") + } + } + } +} + +val kotlinFirst = kotlinProject { + name = "kotlinFirst" + group = "com.example" + artifactId = name + version = "0.1" + directory = name + + sourceDirectories { + path("src/main/java", "src/main/kotlin") + } + + assemble { + jar { + fatJar = true + manifest { + attributes("Main-Class", "example.KotlinMainKt") + } + } + } +} + +val javaFirst2 = javaProject { + name = "javaFirst2" + group = "com.guatec" + artifactId = name + version = "0.1" + directory = name + buildDirectory = "javaBuild" + + sourceDirectories { + path("src/main/java", "src/main/kotlin") + } + + sourceDirectoriesTest { + path("src/test/java", "src/test/kotlin") + } + + dependenciesTest { + compile("org.testng:testng:6.9.5") + } + + assemble { + jar { + } + } +} diff --git a/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.jar b/src/test/resources/projects/kobalt/wrapper/kobalt-wrapper.jar similarity index 100% rename from src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.jar rename to src/test/resources/projects/kobalt/wrapper/kobalt-wrapper.jar diff --git a/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties b/src/test/resources/projects/kobalt/wrapper/kobalt-wrapper.properties similarity index 100% rename from src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties rename to src/test/resources/projects/kobalt/wrapper/kobalt-wrapper.properties diff --git a/src/test/resources/projects/javaFirst/kobaltw b/src/test/resources/projects/kobaltw old mode 100755 new mode 100644 similarity index 100% rename from src/test/resources/projects/javaFirst/kobaltw rename to src/test/resources/projects/kobaltw diff --git a/src/test/resources/projects/kotlinFirst/kobalt/src/Build.kt b/src/test/resources/projects/kotlinFirst/kobalt/src/Build.kt deleted file mode 100644 index 3bc14f76..00000000 --- a/src/test/resources/projects/kotlinFirst/kobalt/src/Build.kt +++ /dev/null @@ -1,27 +0,0 @@ -import com.beust.kobalt.* -import com.beust.kobalt.plugin.packaging.assemble -import com.beust.kobalt.plugin.kotlin.* - -val repos = repos() - - -val p = kotlinProject { - - name = "mixed" - group = "com.example" - artifactId = name - version = "0.1" - - sourceDirectories { - path("src/main/java", "src/main/kotlin") - } - - assemble { - jar { - fatJar = true - manifest { - attributes("Main-Class", "example.KotlinMainKt") - } - } - } -} diff --git a/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.jar b/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.jar deleted file mode 100644 index 6a522ad5..00000000 Binary files a/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.jar and /dev/null differ diff --git a/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties b/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties deleted file mode 100644 index 4955abc4..00000000 --- a/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -kobalt.version=0.408 \ No newline at end of file diff --git a/src/test/resources/projects/kotlinFirst/kobaltw b/src/test/resources/projects/kotlinFirst/kobaltw deleted file mode 100755 index 1fd228db..00000000 --- a/src/test/resources/projects/kotlinFirst/kobaltw +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $*