From 27e923991e0c652e5ac02372ed50ff5d3b64e41f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 Mar 2017 00:12:02 -0700 Subject: [PATCH] Kobalt 1.0.30 update --- .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- kobalt/src/Build.kt | 41 ++++--------------- kobalt/wrapper/kobalt-wrapper.properties | 2 +- 3 files changed, 10 insertions(+), 35 deletions(-) diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index f3cd7d1..0909c8d 100644 --- a/example/kobalt/wrapper/kobalt-wrapper.properties +++ b/example/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.6 \ No newline at end of file +kobalt.version=1.0.26 \ No newline at end of file diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index f583685..de51878 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,17 +1,11 @@ -import com.beust.kobalt.buildScript -import com.beust.kobalt.file -import com.beust.kobalt.misc.kobaltLog -import com.beust.kobalt.plugin.application.application -import com.beust.kobalt.plugin.packaging.assemble -import com.beust.kobalt.plugin.publish.autoGitTag -import com.beust.kobalt.plugin.publish.bintray -import com.beust.kobalt.project -import net.thauvin.erik.kobalt.plugin.versioneye.versionEye -import org.apache.maven.model.Developer -import org.apache.maven.model.License -import org.apache.maven.model.Model -import org.apache.maven.model.Scm -import java.io.File +import com.beust.kobalt.* +import com.beust.kobalt.misc.* +import com.beust.kobalt.plugin.application.* +import com.beust.kobalt.plugin.packaging.* +import com.beust.kobalt.plugin.publish.* +import net.thauvin.erik.kobalt.plugin.versioneye.* +import org.apache.maven.model.* +import java.io.* val semver = "0.4.4" @@ -53,21 +47,12 @@ val p = project { }) } - sourceDirectories { - path("src/main/kotlin") - } - - sourceDirectoriesTest { - path("src/test/kotlin") - } - dependencies { compile("com.beust:kobalt-plugin-api:") } dependenciesTest { compile("org.testng:testng:") - } assemble { @@ -94,14 +79,6 @@ val example = project(p) { version = "0.1" directory = "example" - sourceDirectories { - path("src/main/kotlin") - } - - sourceDirectoriesTest { - path("src/test/kotlin") - } - dependencies { compile("com.beust:jcommander:1.47") //compile("org.slf4j:slf4j-api:") @@ -111,8 +88,6 @@ val example = project(p) { compile("com.beust:kobalt-plugin-api:0.878") } - - dependenciesTest { compile("org.testng:testng:") } diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index 51854da..ab67089 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.19 \ No newline at end of file +kobalt.version=1.0.30 \ No newline at end of file