diff --git a/build.gradle b/build.gradle index c304443..0a753fd 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { dependencies { kapt processorJar compileOnly processorJar - compileOnly 'org.apache.velocity:velocity:1.7' + compileOnly 'com.github.spullara.mustache.java:compiler:0.9.4' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/lib/semver-0.9.7.jar b/lib/semver-0.9.7.jar index a406da1..f6d0450 100644 Binary files a/lib/semver-0.9.7.jar and b/lib/semver-0.9.7.jar differ diff --git a/version.properties b/version.properties index c99f89d..cd5de1a 100644 --- a/version.properties +++ b/version.properties @@ -2,6 +2,6 @@ version.prerelease=beta version.project=Example version.minor=1 -version.buildmeta= +version.buildmeta=001 version.patch=49 version.major=3 diff --git a/version.vm b/version.vm deleted file mode 100644 index 460f668..0000000 --- a/version.vm +++ /dev/null @@ -1,36 +0,0 @@ -package ${packageName} - -import java.util.* - -open class ${className} -private constructor() { - companion object { - val project = "${project}" - - val buildDate = Date(${epoch}L) - val major = ${major} - val minor = ${minor} - val patch = ${patch} - val buildMeta = "${buildmeta}" - val preRelease = "${prerelease}" - - val version: String - get() = ("\$major.\$minor.\$patch" + preReleaseWithPrefix() + buildMetaWithPrefix()) - - fun preReleaseWithPrefix(prefix: String = "-"): String { - return if (preRelease.isNotEmpty() && prefix.isNotEmpty()) { - "$prefix$preRelease" - } else { - preRelease - } - } - - fun buildMetaWithPrefix(prefix: String = "+"): String { - return if (buildMeta.isNotEmpty() && prefix.isNotEmpty()) { - "$prefix$buildMeta" - } else { - buildMeta - } - } - } -} \ No newline at end of file