From fbdd6661ead04a684337032f11d9f310204355d1 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 15 Apr 2019 21:24:20 -0700 Subject: [PATCH] Cleanup/ --- examples/java/kobalt/src/Build.kt | 34 ++----------------- .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/examples/java/kobalt/src/Build.kt b/examples/java/kobalt/src/Build.kt index 911a863..1bfdcf6 100644 --- a/examples/java/kobalt/src/Build.kt +++ b/examples/java/kobalt/src/Build.kt @@ -2,10 +2,7 @@ import com.beust.kobalt.* import com.beust.kobalt.plugin.application.* import com.beust.kobalt.plugin.apt.* import com.beust.kobalt.plugin.java.javaCompiler -import com.beust.kobalt.plugin.publish.* import com.beust.kobalt.plugin.packaging.* -import java.io.FileInputStream -import java.util.* // ./kobaltw run @@ -13,36 +10,13 @@ val bs = buildScript { repos(localMaven()) } -fun StringBuilder.prepend(s: String): StringBuilder { - if (this.isNotEmpty()) { - this.insert(0, s) - } - return this -} - val example = project { name = "example" - - fun versionFor(): String { - val propsFile = "version.properties" - val majorKey = "version.major" - val minorKey = "version.minor" - val patchKey = "version.patch" - val metaKey = "version.buildmeta" - val preKey = "version.prerelease" - - val p = Properties().apply { FileInputStream(propsFile).use { fis -> load(fis) } } - - return (p.getProperty(majorKey, "1") + "." + p.getProperty(minorKey, "0") + "." + p.getProperty(patchKey, "0") - + StringBuilder(p.getProperty(preKey, "")).prepend("-") - + StringBuilder(p.getProperty(metaKey, "")).prepend("+")) - } - - version = versionFor() + version = "1.0" val mainClassName = "com.example.Example" - val processorJar = "net.thauvin.erik:semver:1.0.1" + val processorJar = "net.thauvin.erik:semver:1.2.0" dependencies { apt(processorJar) @@ -53,10 +27,6 @@ val example = project { //outputDir = "../src/generated/java/" } - install { - target = "deploy" - } - javaCompiler { args("-source", "1.8", "-target", "1.8") } diff --git a/examples/java/kobalt/wrapper/kobalt-wrapper.properties b/examples/java/kobalt/wrapper/kobalt-wrapper.properties index 0ca8045..0d568d3 100644 --- a/examples/java/kobalt/wrapper/kobalt-wrapper.properties +++ b/examples/java/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.122 \ No newline at end of file +kobalt.version=1.0.122