From b6fbb252288432841974aa83480fd631d185b9e9 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 26 Mar 2017 22:58:55 -0700 Subject: [PATCH] Updated to Kobalt 1.0.30 --- example/kobalt/src/Build.kt | 14 ------ .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- kobalt/src/Build.kt | 47 ++++--------------- kobalt/wrapper/kobalt-wrapper.properties | 2 +- 4 files changed, 11 insertions(+), 54 deletions(-) diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 1486fd7..95b8ee2 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -19,20 +19,6 @@ val example = project { artifactId = name version = "0.1" - sourceDirectories { - path("src/main/java") - } - - sourceDirectoriesTest { - path("src/test/java") - } - - dependencies { - } - - dependenciesTest { - } - assemble { jar { } diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index f3cd7d1..ab67089 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.30 \ No newline at end of file diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 1920cc5..d834453 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,18 +1,11 @@ -import com.beust.kobalt.buildScript -import com.beust.kobalt.file -import com.beust.kobalt.localMaven -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.5.2" @@ -29,7 +22,7 @@ val bs = buildScript { repos(localMaven()) } -val dev = false +val dev by profile() val kobaltDependency = if (dev) "kobalt" else "kobalt-plugin-api" val p = project { @@ -57,14 +50,6 @@ val p = project { }) } - sourceDirectories { - path("src/main/kotlin") - } - - sourceDirectoriesTest { - path("src/test/kotlin") - } - dependencies { compile("com.beust:$kobaltDependency:") compile("org.apache.maven:maven-settings-builder:3.3.9") @@ -110,20 +95,6 @@ val example = project(p) { version = "0.1" directory = "example" - sourceDirectories { - path("src/main/java") - } - - sourceDirectoriesTest { - path("src/test/java") - } - - dependencies { - } - - dependenciesTest { - } - assemble { jar { } 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