diff --git a/.gitignore b/.gitignore index ff3d427..48c9251 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .classpath .DS_Store .gradle +.history .kobalt .nb-gradle .project @@ -45,4 +46,4 @@ ehthumbs.db kobaltBuild kobaltw*-test -Thumbs.db \ No newline at end of file +Thumbs.db diff --git a/.idea/modules/examples-kotlin_main.iml b/.idea/modules/examples-kotlin_main.iml index f6c1db1..7ea61a1 100644 --- a/.idea/modules/examples-kotlin_main.iml +++ b/.idea/modules/examples-kotlin_main.iml @@ -5,6 +5,13 @@ + + diff --git a/.idea/modules/examples-kotlin_test.iml b/.idea/modules/examples-kotlin_test.iml index f6c1db1..de16718 100644 --- a/.idea/modules/examples-kotlin_test.iml +++ b/.idea/modules/examples-kotlin_test.iml @@ -5,6 +5,20 @@ + + diff --git a/README.md b/README.md index f795dcc..9517013 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ To install and run from [Maven](http://maven.apache.org/), configure an artifact net.thauvin.erik semver - 1.1.0-beta + 1.1.1 ``` @@ -183,8 +183,8 @@ To install and run from [Gradle](https://gradle.org/), add the following to the ```gradle dependencies { - annotationProcessor 'net.thauvin.erik:semver:1.1.0-beta' - compileOnly 'net.thauvin.erik:semver:1.1.0-beta' + annotationProcessor 'net.thauvin.erik:semver:1.1.1' + compileOnly 'net.thauvin.erik:semver:1.1.1' } ``` @@ -208,8 +208,8 @@ To install and run from [Kobalt](http://beust.com/kobalt/), add the following to ```gradle dependencies { - apt("net.thauvin.erik:semver:1.1.0-beta") - compileOnly("net.thauvin.erik:semver:1.1.0-beta") + apt("net.thauvin.erik:semver:1.1.1") + compileOnly("net.thauvin.erik:semver:1.1.1") } ``` diff --git a/build.gradle b/build.gradle index 1296529..542f99d 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,8 @@ plugins { id 'java' id 'maven-publish' id 'com.jfrog.bintray' version '1.8.4' - id 'com.github.ben-manes.versions' version '0.20.0' - id 'net.thauvin.erik.gradle.semver' version '0.9.8-beta' + id 'com.github.ben-manes.versions' version '0.21.0' + id 'net.thauvin.erik.gradle.semver' version '0.9.9-beta' id 'com.github.spotbugs' version '1.7.1' } @@ -36,7 +36,7 @@ repositories { } dependencies { - implementation 'com.github.spullara.mustache.java:compiler:0.9.5' + implementation 'com.github.spullara.mustache.java:compiler:0.9.6' compileOnly 'com.github.spotbugs:spotbugs-annotations:3.1.12' testImplementation 'org.testng:testng:6.14.3' } diff --git a/docs/README.html b/docs/README.html index a53c851..2d2e30e 100644 --- a/docs/README.html +++ b/docs/README.html @@ -346,7 +346,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf example.meta= # ...
-

⚠️ keysPrefix is a new element in 1.1.0 and may break older versions when using custom property keys.
+

⚠️ keysPrefix is a new element staring in 1.1.0 and may break older versions when using custom property keys.
⚡ A quick fix is to include keysPrefix="" in the annotation to remove the default version. prefix.

Usage with Maven, Grail, Kobalt and Kotlin

@@ -355,14 +355,14 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf 
<dependency>
     <groupId>net.thauvin.erik</groupId>
     <artifactId>semver</artifactId>
-    <version>1.1.0-beta</version>
+    <version>1.1.1</version>
 </dependency>

Gradle

Class Generation

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

dependencies {
-    annotationProcessor 'net.thauvin.erik:semver:1.1.0-beta'
-    compileOnly 'net.thauvin.erik:semver:1.1.0-beta'
+    annotationProcessor 'net.thauvin.erik:semver:1.1.1'
+    compileOnly 'net.thauvin.erik:semver:1.1.1'
 }

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

Class & Source Generation

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

Kobalt

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

dependencies {
-    apt("net.thauvin.erik:semver:1.1.0-beta")
-    compileOnly("net.thauvin.erik:semver:1.1.0-beta")
+    apt("net.thauvin.erik:semver:1.1.1")
+    compileOnly("net.thauvin.erik:semver:1.1.1")
 }

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

Kotlin

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

Please look at the Kotlin example project for samples on using Gradle (build.gradle.kts) and Kobalt (Build.kt).

Auto-Increment

Incrementing the version is best left to your favorite build system. For a solution using Gradle, please have a look at the Semver Version Plugin for Gradle.

-

There are also full examples in both Java and Kotlin showing how to use both the plugin and annotation processor concurrently.

+

There are also full examples in both Java and Kotlin showing how to use both the plugin and annotation processor concurrently.

diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 031d82e..4b2766d 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'application' defaultTasks 'run' -def semverProcessor = 'net.thauvin.erik:semver:1.1.0-beta' +def semverProcessor = 'net.thauvin.erik:semver:1.1.1' sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/examples/java/src/generated/java/com/example/GeneratedVersion.java b/examples/java/src/generated/java/com/example/GeneratedVersion.java index e1c1f06..81fa282 100644 --- a/examples/java/src/generated/java/com/example/GeneratedVersion.java +++ b/examples/java/src/generated/java/com/example/GeneratedVersion.java @@ -16,7 +16,7 @@ public final class GeneratedVersion { public final static String BUILDMETA_PREFIX = "+"; public final static String PROJECT = "Example"; - public final static Date BUILDDATE = new Date(1541197895495L); + public final static Date BUILDDATE = new Date(1553998304899L); public final static int MAJOR = 2; public final static int MINOR = 17; public final static int PATCH = 52; diff --git a/examples/java/version.properties b/examples/java/version.properties index d8f031d..0821cbd 100644 --- a/examples/java/version.properties +++ b/examples/java/version.properties @@ -1,8 +1,8 @@ #Generated by the Semver Plugin for Gradle -#Wed Jul 11 00:11:38 PDT 2018 -version.prerelease=beta -version.minor=17 +#Sat Mar 30 15:48:08 PDT 2019 version.buildmeta=007 -version.patch=52 version.major=2 +version.minor=17 +version.patch=52 +version.prerelease=beta version.project=Example diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index bce5e95..284263c 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -10,7 +10,7 @@ plugins { defaultTasks(ApplicationPlugin.TASK_RUN_NAME) -var semverProcessor = "net.thauvin.erik:semver:1.1.0-beta" +var semverProcessor = "net.thauvin.erik:semver:1.1.1" dependencies { kapt(semverProcessor) diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 34c9ad8..6936aca 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -73,9 +73,9 @@ val semver = project { } dependencies { - compile("com.github.spullara.mustache.java:compiler:0.9.5") - compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.2.10") - compileOnly("com.github.spotbugs:spotbugs-annotations:3.1.8") + compile("com.github.spullara.mustache.java:compiler:0.9.6") + compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.3.21") + compileOnly("com.github.spotbugs:spotbugs-annotations:3.1.12") } dependenciesTest { diff --git a/pom.xml b/pom.xml index a1d98eb..e43ce3f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.thauvin.erik semver - 1.1.0-beta + 1.1.1 semver Semantic Version Annotation Processor https://github.com/ethauvin/semver @@ -30,7 +30,7 @@ com.github.spullara.mustache.java compiler - 0.9.5 + 0.9.6 org.testng diff --git a/version.properties b/version.properties index 1f51dae..9a9096f 100644 --- a/version.properties +++ b/version.properties @@ -1,7 +1,7 @@ #Generated by the Semver Plugin for Gradle -#Sat Nov 03 17:10:00 PDT 2018 +#Sat Mar 30 18:10:32 PDT 2019 version.buildmeta= version.major=1 version.minor=1 -version.patch=0 -version.prerelease=beta +version.patch=1 +version.prerelease=