diff --git a/.idea/modules/example.iml b/.idea/modules/example.iml index 3004a6f..5caf6e3 100644 --- a/.idea/modules/example.iml +++ b/.idea/modules/example.iml @@ -1,5 +1,5 @@ - + @@ -16,9 +16,12 @@ - - - - + + + + + + + \ No newline at end of file diff --git a/README.html b/README.html index 7a4c269..3791922 100644 --- a/README.html +++ b/README.html @@ -239,13 +239,13 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<dependency>
     <groupId>net.thauvin.erik</groupId>
     <artifactId>semver</artifactId>
-    <version>0.9.6-beta</version>
+    <version>0.9.7</version>
 </dependency>

Gradle

Class Generation

To install and run from Gradle, add the following to the build.gradle file:

dependencies {
-    compile 'net.thauvin.erik:semver:0.9.6-beta'
+    compile 'net.thauvin.erik:semver:0.9.7'
 }

The GeneratedVersion class will be automatically created in the build directory upon compiling.

Class & Source Generation

@@ -255,11 +255,11 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf }

Then add the following to the build.gradle file:

dependencies {
-    compileOnly 'net.thauvin.erik:semver:0.9.6-beta'
+    compileOnly 'net.thauvin.erik:semver:0.9.7'
 }
 
 annotationProcessor {
-    library 'net.thauvin.erik:semver:0.9.6-beta'
+    library 'net.thauvin.erik:semver:0.9.7'
     processor 'net.thauvin.erik.semver.VersionProcessor'
     // sourcesDir 'src/generated/java'
 }
@@ -273,8 +273,8 @@ compileJava {
 

Kobalt

To install and run from Kobalt, add the following to the Build.kt file:

dependencies {
-    apt("net.thauvin.erik:semver:0.9.6-beta")
-    compile("net.thauvin.erik:semver:0.9.6-beta")
+    apt("net.thauvin.erik:semver:0.9.7")
+    compile("net.thauvin.erik:semver:0.9.7")
 }

Please look at the Build.kt file in the example module directory for a sample.

Auto-Increment

diff --git a/README.md b/README.md index 719b7f4..b37691b 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ To install and run from [Maven](http://maven.apache.org/), configure an artifact net.thauvin.erik semver - 0.9.6-beta + 0.9.7 ``` @@ -143,7 +143,7 @@ To install and run from [Gradle](https://gradle.org/), add the following to the ```gradle dependencies { - compile 'net.thauvin.erik:semver:0.9.6-beta' + compile 'net.thauvin.erik:semver:0.9.7' } ``` @@ -163,11 +163,11 @@ Then add the following to the `build.gradle` file: ```gradle dependencies { - compileOnly 'net.thauvin.erik:semver:0.9.6-beta' + compileOnly 'net.thauvin.erik:semver:0.9.7' } annotationProcessor { - library 'net.thauvin.erik:semver:0.9.6-beta' + library 'net.thauvin.erik:semver:0.9.7' processor 'net.thauvin.erik.semver.VersionProcessor' // sourcesDir 'src/generated/java' } @@ -188,8 +188,8 @@ To install and run from [Kobalt](http://beust.com/kobalt/), add the following to ```gradle dependencies { - apt("net.thauvin.erik:semver:0.9.6-beta") - compile("net.thauvin.erik:semver:0.9.6-beta") + apt("net.thauvin.erik:semver:0.9.7") + compile("net.thauvin.erik:semver:0.9.7") } ``` diff --git a/example/build.gradle b/example/build.gradle index c6937a3..f7625e6 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -45,13 +45,13 @@ repositories { } dependencies { - compileOnly 'net.thauvin.erik:semver:0.9.6-beta' + compileOnly 'net.thauvin.erik:semver:0.9.7' } annotationProcessor { // Update version, increment on release. project.version = getVersion(isRelease) - library 'net.thauvin.erik:semver:0.9.6-beta' + library 'net.thauvin.erik:semver:0.9.7' processor 'net.thauvin.erik.semver.VersionProcessor' // sourcesDir 'src/generated/java' } diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 70328c6..47b6356 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -39,7 +39,7 @@ val example = project { version = versionFor() val mainClassName = "net.thauvin.erik.semver.example.Example" - val processorJar = "net.thauvin.erik:semver:0.9.6-beta" + val processorJar = "net.thauvin.erik:semver:0.9.7" sourceDirectories { path("src/main/java") diff --git a/example/kobalt/wrapper/kobalt-wrapper.jar b/example/kobalt/wrapper/kobalt-wrapper.jar index d3f775a..5390ba7 100644 Binary files a/example/kobalt/wrapper/kobalt-wrapper.jar and b/example/kobalt/wrapper/kobalt-wrapper.jar differ diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index fa9f1f9..f314d6a 100644 --- a/example/kobalt/wrapper/kobalt-wrapper.properties +++ b/example/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.867 \ No newline at end of file +kobalt.version=0.882 \ No newline at end of file diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 96dc880..84e6fe3 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -11,9 +11,9 @@ import java.io.FileInputStream import java.util.* import net.thauvin.erik.kobalt.plugin.exec.* -val repos = repos(localMaven()) +//val repos = repos(localMaven()) -val pl = plugins("net.thauvin.erik:kobalt-exec:0.6.0-beta") +val pl = plugins("net.thauvin.erik:kobalt-exec:0.6.2") fun StringBuilder.prepend(s: String): StringBuilder { if (this.length > 0) { @@ -82,7 +82,6 @@ val semver = project { } } - val example = project { name = "example" @@ -90,7 +89,7 @@ val example = project { version = versionFor(directory) val mainClassName = "net.thauvin.erik.semver.example.Example" - val processorJar = "net.thauvin.erik:semver:0.9.6-beta" + val processorJar = "net.thauvin.erik:semver:0.9.7" sourceDirectories { path("src/main/java") @@ -124,4 +123,4 @@ val example = project { application { mainClass = mainClassName } -} +} \ No newline at end of file diff --git a/kobalt/wrapper/kobalt-wrapper.jar b/kobalt/wrapper/kobalt-wrapper.jar index d3f775a..5390ba7 100644 Binary files a/kobalt/wrapper/kobalt-wrapper.jar and b/kobalt/wrapper/kobalt-wrapper.jar differ diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index fa9f1f9..164fe5e 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.867 \ No newline at end of file +kobalt.version=0.889 \ No newline at end of file diff --git a/semver.ipr b/semver.ipr index 26de8dd..387f1ab 100644 --- a/semver.ipr +++ b/semver.ipr @@ -364,15 +364,6 @@ - - - - - - - - - diff --git a/src/main/java/net/thauvin/erik/semver/VersionInfo.java b/src/main/java/net/thauvin/erik/semver/VersionInfo.java index 678573d..a6819df 100644 --- a/src/main/java/net/thauvin/erik/semver/VersionInfo.java +++ b/src/main/java/net/thauvin/erik/semver/VersionInfo.java @@ -213,7 +213,12 @@ public class VersionInfo { * @return The version string. */ public String getVersion() { - return Integer.toString(major) + '.' + Integer.toString(minor) + '.' + Integer.toString(patch) + ( - prerelease.length() > 0 ? '-' + prerelease : "") + (buildmeta.length() > 0 ? '+' + buildmeta : ""); + return Integer.toString(major) + + '.' + + Integer.toString(minor) + + '.' + + Integer.toString(patch) + + (prerelease.length() > 0 ? '-' + prerelease : "") + + (buildmeta.length() > 0 ? '+' + buildmeta : ""); } } \ No newline at end of file diff --git a/version.properties b/version.properties index 94e8df4..9128115 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ #Thu, 28 Jan 2016 17:33:17 -0800 version.major=0 version.minor=9 -version.patch=6 +version.patch=7 version.buildmeta= -version.prerelease=beta +version.prerelease= \ No newline at end of file