erik/semver
erik/semver
1
1
Fork 0
Code Issues Pull requests Releases Activity

Updated version to 1.1.1

Browse source
This commit is contained in:
Erik C. Thauvin 2019-03-30 21:02:11 -07:00
parent 6f2ce396f3
commit be84f36395
13 changed files with 59 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -5,6 +5,7 @@
.classpath
.DS_Store
.gradle
.history
.kobalt
.nb-gradle
.project
@ -45,4 +46,4 @@
ehthumbs.db
kobaltBuild
kobaltw*-test
Thumbs.db
Thumbs.db

10
.idea/modules/examples-kotlin_main.iml generated
View file

@ -5,6 +5,13 @@
<configuration version="3" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings />
<compilerArguments>
<option name="destination" value="$MODULE_DIR$/../../examples/kotlin/build/classes/kotlin/main" />
<option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.1.1/semver-1.1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.21/4bcc2012b84840e19e1e28074284cac908be0295/kotlin-stdlib-1.3.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.21/f30e4a9897913e53d778f564110bafa1fef46643/kotlin-stdlib-common-1.3.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
<option name="noStdlib" value="true" />
<option name="noReflect" value="true" />
<option name="moduleName" value="examples-kotlin" />
<option name="addCompilerBuiltIns" value="true" />
<option name="loadBuiltInsFromDependencies" value="true" />
<option name="languageVersion" value="1.3" />
<option name="apiVersion" value="1.3" />
<option name="pluginOptions">
@ -13,6 +20,9 @@
<option name="pluginClasspaths">
<array />
</option>
<option name="errors">
<ArgumentParseErrors />
</option>
</compilerArguments>
</configuration>
</facet>

17
.idea/modules/examples-kotlin_test.iml generated
View file

@ -5,6 +5,20 @@
<configuration version="3" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings />
<compilerArguments>
<option name="destination" value="$MODULE_DIR$/../../examples/kotlin/build/classes/kotlin/test" />
<option name="classpath" value="$MODULE_DIR$/../../examples/kotlin/build/classes/java/main;K:/java/semver/examples/kotlin/build/classes/kotlin/main;K:/java/semver/examples/kotlin/build/tmp/kapt3/classes/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.21/4bcc2012b84840e19e1e28074284cac908be0295/kotlin-stdlib-1.3.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.21/f30e4a9897913e53d778f564110bafa1fef46643/kotlin-stdlib-common-1.3.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
<option name="noStdlib" value="true" />
<option name="noReflect" value="true" />
<option name="moduleName" value="examples-kotlin" />
<option name="addCompilerBuiltIns" value="true" />
<option name="loadBuiltInsFromDependencies" value="true" />
<option name="friendPaths">
<array>
<option value="$MODULE_DIR$/../../examples/kotlin/build/tmp/kapt3/classes/main" />
<option value="$MODULE_DIR$/../../examples/kotlin/build/classes/java/main" />
<option value="$MODULE_DIR$/../../examples/kotlin/build/classes/kotlin/main" />
</array>
</option>
<option name="languageVersion" value="1.3" />
<option name="apiVersion" value="1.3" />
<option name="pluginOptions">
@ -13,6 +27,9 @@
<option name="pluginClasspaths">
<array />
</option>
<option name="errors">
<ArgumentParseErrors />
</option>
</compilerArguments>
</configuration>
</facet>

10
README.md
View file

@ -171,7 +171,7 @@ To install and run from [Maven](http://maven.apache.org/), configure an artifact
<dependency>
<groupId>net.thauvin.erik</groupId>
<artifactId>semver</artifactId>
<version>1.1.0-beta</version>
<version>1.1.1</version>
</dependency>
```
@ -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")
}
```

6
build.gradle
View file

@ -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'
}

14
docs/README.html
View file

@ -346,7 +346,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<span class="dt">example.meta</span><span class="ot">=</span>
<span class="co"># ...</span></code></pre></div>
<blockquote>
<p>⚠️ <code>keysPrefix</code> is a new element in <code>1.1.0</code> and may break older versions when using custom property keys.<br />
<p>⚠️ <code>keysPrefix</code> is a new element staring in <code>1.1.0</code> and may break older versions when using custom property keys.<br />
⚡ A quick fix is to include <code>keysPrefix=&quot;&quot;</code> in the annotation to remove the default <code>version.</code> prefix.</p>
</blockquote>
<h2 id="usage-with-maven-grail-kobalt-and-kotlin">Usage with Maven, Grail, Kobalt and Kotlin</h2>
@ -355,14 +355,14 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<div class="sourceCode"><pre class="sourceCode xml"><code class="sourceCode xml"><span class="kw">&lt;dependency&gt;</span>
<span class="kw">&lt;groupId&gt;</span>net.thauvin.erik<span class="kw">&lt;/groupId&gt;</span>
<span class="kw">&lt;artifactId&gt;</span>semver<span class="kw">&lt;/artifactId&gt;</span>
<span class="kw">&lt;version&gt;</span>1.1.0-beta<span class="kw">&lt;/version&gt;</span>
<span class="kw">&lt;version&gt;</span>1.1.1<span class="kw">&lt;/version&gt;</span>
<span class="kw">&lt;/dependency&gt;</span></code></pre></div>
<h3 id="gradle">Gradle</h3>
<h4 id="class-generation">Class Generation</h4>
<p>To install and run from <a href="https://gradle.org/">Gradle</a>, add the following to the <code>build.gradle</code> file:</p>
<pre class="gradle"><code>dependencies {
annotationProcessor &#39;net.thauvin.erik:semver:1.1.0-beta&#39;
compileOnly &#39;net.thauvin.erik:semver:1.1.0-beta&#39;
annotationProcessor &#39;net.thauvin.erik:semver:1.1.1&#39;
compileOnly &#39;net.thauvin.erik:semver:1.1.1&#39;
}</code></pre>
<p>The <code>GeneratedVersion</code> class will be automatically created in the <code>build/generated</code> directory upon compiling.</p>
<h4 id="class-source-generation">Class &amp; Source Generation</h4>
@ -373,8 +373,8 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<h3 id="kobalt">Kobalt</h3>
<p>To install and run from <a href="http://beust.com/kobalt/">Kobalt</a>, add the following to the <code>Build.kt</code> file:</p>
<pre class="gradle"><code>dependencies {
apt(&quot;net.thauvin.erik:semver:1.1.0-beta&quot;)
compileOnly(&quot;net.thauvin.erik:semver:1.1.0-beta&quot;)
apt(&quot;net.thauvin.erik:semver:1.1.1&quot;)
compileOnly(&quot;net.thauvin.erik:semver:1.1.1&quot;)
}</code></pre>
<p>Please look at the <a href="https://github.com/ethauvin/semver/blob/master/examples/kotlin/kobalt/src/Build.kt">Build.kt</a> file in the <a href="https://github.com/ethauvin/semver/tree/master/examples/kotlin">Kotlin example</a> module directory for a sample.</p>
<h3 id="kotlin">Kotlin</h3>
@ -389,6 +389,6 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<p>Please look at the <a href="https://github.com/ethauvin/semver/tree/master/examples/kotlin">Kotlin example</a> project for samples on using Gradle (<a href="https://github.com/ethauvin/semver/blob/master/examples/kotlin/build.gradle.kts">build.gradle.kts</a>) and Kobalt (<a href="https://github.com/ethauvin/semver/blob/master/examples/kotlin/kobalt/src/Build.kt">Build.kt</a>).</p>
<h2 id="auto-increment">Auto-Increment</h2>
<p>Incrementing the version is best left to your favorite build system. For a solution using Gradle, please have a look at the <a href="https://github.com/ethauvin/semver-gradle"><strong>Semver Version Plugin for Gradle</strong></a>.</p>
<p>There are also full <a href="https://github.com/ethauvin/semver-gradle/tree/master/examples/annotation-processor">examples</a> in both <a href="https://github.com/ethauvin/semver-gradle/tree/master/examples/annotation-processor/java">Java</a> and <a href="https://github.com/ethauvin/semver-gradle/tree/master/examples/annotation-processor">Kotlin</a> showing how to use both the plugin and annotation processor concurrently.</p>
<p>There are also full <a href="https://github.com/ethauvin/semver-gradle/tree/master/examples/annotation-processor">examples</a> in both <a href="https://github.com/ethauvin/semver-gradle/tree/master/examples/annotation-processor/java">Java</a> and <a href="https://github.com/ethauvin/semver-gradle/tree/master/examples/annotation-processor/kotlin">Kotlin</a> showing how to use both the plugin and annotation processor concurrently.</p>
</body>
</html>

2
examples/java/build.gradle
View file

@ -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

2
examples/java/src/generated/java/com/example/GeneratedVersion.java
View file

@ -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;

8
examples/java/version.properties
View file

@ -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

2
examples/kotlin/build.gradle.kts
View file

@ -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)

6
kobalt/src/Build.kt
View file

@ -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 {

4
pom.xml
View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.thauvin.erik</groupId>
<artifactId>semver</artifactId>
<version>1.1.0-beta</version>
<version>1.1.1</version>
<name>semver</name>
<description>Semantic Version Annotation Processor</description>
<url>https://github.com/ethauvin/semver</url>
@ -30,7 +30,7 @@
<dependency>
<groupId>com.github.spullara.mustache.java</groupId>
<artifactId>compiler</artifactId>
<version>0.9.5</version>
<version>0.9.6</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>

6
version.properties
View file

@ -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=