From 090746abb496cf8eb28f43aca064af11bafcb1fb Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 10 May 2017 12:19:04 -0700 Subject: [PATCH] SemVer 1.0.0 update. --- build.gradle | 2 +- kobalt/src/Build.kt | 20 ++++++++++++------- .../net/thauvin/erik/mobibot/ReleaseInfo.java | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) rename src/generated/java/{sources => }/net/thauvin/erik/mobibot/ReleaseInfo.java (96%) diff --git a/build.gradle b/build.gradle index d8a6857..6572b46 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ defaultTasks 'deploy' def packageName = 'net.thauvin.erik.mobibot' def deployDir = 'deploy' def isRelease = 'release' in gradle.startParameter.taskNames -def semverJar = 'net.thauvin.erik:semver:0.9.7' +def semverJar = 'net.thauvin.erik:semver:1.0.0' def getVersion(isIncrement = false) { def propsFile = 'version.properties' diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 31a977b..d1366b1 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -5,6 +5,7 @@ import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.misc.log import com.beust.kobalt.plugin.application.application import com.beust.kobalt.plugin.apt.apt +import com.beust.kobalt.plugin.java.javadoc import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.plugin.packaging.install import com.beust.kobalt.plugin.publish.autoGitTag @@ -13,7 +14,6 @@ import java.io.FileInputStream import java.util.* val bs = buildScript { - repos(file("K:/maven/repository")) } val mainClassName = "net.thauvin.erik.mobibot.Mobibot" @@ -47,7 +47,7 @@ val p = project { version = versionFor() - val processorJar = "net.thauvin.erik:semver:0.9.7" + val processorJar = "net.thauvin.erik:semver:1.0.0" val lib = "lib" dependencies { @@ -110,14 +110,20 @@ val p = project { } install { - target = deploy include(from("kobaltBuild/libs"), to(target), glob("**/*")) include(from("properties"), to(target), glob("**/*.properties")) collect(compileDependencies) - .filter { !it.file.name.startsWith("junit") } - .forEach { - copy(from(it.file.absolutePath), to("$target/$lib")) - } + .filter { !it.file.name.startsWith("junit") } + .forEach { + copy(from(it.file.absolutePath), to("$target/$lib")) + } + } + + javadoc { + title = project.name + ' ' + project.version + tags("created") + author = true + links("http://www.jibble.org/javadocs/pircbot/", "http://docs.oracle.com/javase/8/docs/api/") } } diff --git a/src/generated/java/sources/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java similarity index 96% rename from src/generated/java/sources/net/thauvin/erik/mobibot/ReleaseInfo.java rename to src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java index 3a5ec39..df4e122 100644 --- a/src/generated/java/sources/net/thauvin/erik/mobibot/ReleaseInfo.java +++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java @@ -18,7 +18,7 @@ public final class ReleaseInfo { public final static String PROJECT = "mobibot"; public final static LocalDateTime BUILDDATE = - LocalDateTime.ofInstant(Instant.ofEpochMilli(1493616818868L), ZoneId.systemDefault()); + LocalDateTime.ofInstant(Instant.ofEpochMilli(1493879846880L), ZoneId.systemDefault()); public final static int MAJOR = 0; public final static int MINOR = 7; public final static int PATCH = 1;