From c56d87e81b43c81215242c33b85688993774ed2d Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 4 Feb 2016 22:58:33 +0400 Subject: [PATCH] Update build file. --- .../resources/projects/kobalt/src/Build.kt | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/src/test/resources/projects/kobalt/src/Build.kt b/src/test/resources/projects/kobalt/src/Build.kt index 76f139a4..185de67b 100644 --- a/src/test/resources/projects/kobalt/src/Build.kt +++ b/src/test/resources/projects/kobalt/src/Build.kt @@ -1,19 +1,14 @@ -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 { +import com.beust.kobalt.plugin.packaging.assemble +import com.beust.kobalt.project + +val javaFirst = project { name = "javaFirst" group = "com.example" artifactId = name version = "0.1" directory = name - sourceDirectories { - path("src/main/java", "src/main/kotlin") - } - assemble { jar { fatJar = true @@ -24,17 +19,13 @@ val javaFirst = kotlinProject { } } -val kotlinFirst = kotlinProject { +val kotlinFirst = project { name = "kotlinFirst" group = "com.example" artifactId = name version = "0.1" directory = name - sourceDirectories { - path("src/main/java", "src/main/kotlin") - } - assemble { jar { fatJar = true @@ -45,21 +36,12 @@ val kotlinFirst = kotlinProject { } } -val javaFirst2 = javaProject { - name = "javaFirst2" +val mixed1 = project { + name = "mixed1" 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")