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

Updated to Kobalt 0.882

Browse source
This commit is contained in:
Erik C. Thauvin 2016-08-02 14:41:46 -07:00
parent 4c25c756f5
commit c4baf11bcd
13 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.idea/modules/example.iml generated
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="example" external.linked.project.path="$MODULE_DIR$/../../example" external.root.project.path="$MODULE_DIR$/../../example" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.45-beta" type="JAVA_MODULE" version="4"> <module external.linked.project.id="example" external.linked.project.path="$MODULE_DIR$/../../example" external.root.project.path="$MODULE_DIR$/../../example" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.49-beta" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false"> <component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../example/build/classes/main" /> <output url="file://$MODULE_DIR$/../../example/build/classes/main" />
<output-test url="file://$MODULE_DIR$/../../example/build/classes/test" /> <output-test url="file://$MODULE_DIR$/../../example/build/classes/test" />
@ -16,9 +16,12 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:0.9.6-beta" level="project" /> <orderEntry type="module-library" scope="PROVIDED">
<orderEntry type="library" scope="PROVIDED" name="Gradle: commons-lang:commons-lang:2.4" level="project" /> <library name="Gradle: semver-0.9.7:7">
<orderEntry type="library" scope="PROVIDED" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" /> <CLASSES />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.velocity:velocity:1.7" level="project" /> <JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component> </component>
</module> </module>

12
README.html
View file

@ -239,13 +239,13 @@ 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> <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;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;artifactId&gt;</span>semver<span class="kw">&lt;/artifactId&gt;</span>
<span class="kw">&lt;version&gt;</span>0.9.6-beta<span class="kw">&lt;/version&gt;</span> <span class="kw">&lt;version&gt;</span>0.9.7<span class="kw">&lt;/version&gt;</span>
<span class="kw">&lt;/dependency&gt;</span></code></pre></div> <span class="kw">&lt;/dependency&gt;</span></code></pre></div>
<h3 id="gradle">Gradle</h3> <h3 id="gradle">Gradle</h3>
<h4 id="class-generation">Class Generation</h4> <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> <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 { <pre class="gradle"><code>dependencies {
compile &#39;net.thauvin.erik:semver:0.9.6-beta&#39; compile &#39;net.thauvin.erik:semver:0.9.7&#39;
}</code></pre> }</code></pre>
<p>The <code>GeneratedVersion</code> class will be automatically created in the <code>build</code> directory upon compiling.</p> <p>The <code>GeneratedVersion</code> class will be automatically created in the <code>build</code> directory upon compiling.</p>
<h4 id="class-source-generation">Class &amp; Source Generation</h4> <h4 id="class-source-generation">Class &amp; Source Generation</h4>
@ -255,11 +255,11 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
}</code></pre> }</code></pre>
<p>Then add the following to the <code>build.gradle</code> file:</p> <p>Then add the following to the <code>build.gradle</code> file:</p>
<pre class="gradle"><code>dependencies { <pre class="gradle"><code>dependencies {
compileOnly &#39;net.thauvin.erik:semver:0.9.6-beta&#39; compileOnly &#39;net.thauvin.erik:semver:0.9.7&#39;
} }
annotationProcessor { annotationProcessor {
library &#39;net.thauvin.erik:semver:0.9.6-beta&#39; library &#39;net.thauvin.erik:semver:0.9.7&#39;
processor &#39;net.thauvin.erik.semver.VersionProcessor&#39; processor &#39;net.thauvin.erik.semver.VersionProcessor&#39;
// sourcesDir &#39;src/generated/java&#39; // sourcesDir &#39;src/generated/java&#39;
} }
@ -273,8 +273,8 @@ compileJava {
<h3 id="kobalt">Kobalt</h3> <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> <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 { <pre class="gradle"><code>dependencies {
apt(&quot;net.thauvin.erik:semver:0.9.6-beta&quot;) apt(&quot;net.thauvin.erik:semver:0.9.7&quot;)
compile(&quot;net.thauvin.erik:semver:0.9.6-beta&quot;) compile(&quot;net.thauvin.erik:semver:0.9.7&quot;)
}</code></pre> }</code></pre>
<p>Please look at the <a href="https://github.com/ethauvin/semver/blob/master/example/kobalt/src/Build.kt">Build.kt</a> file in the <a href="https://github.com/ethauvin/semver/tree/master/example">example</a> module directory for a sample.</p> <p>Please look at the <a href="https://github.com/ethauvin/semver/blob/master/example/kobalt/src/Build.kt">Build.kt</a> file in the <a href="https://github.com/ethauvin/semver/tree/master/example">example</a> module directory for a sample.</p>
<h3 id="auto-increment">Auto-Increment</h3> <h3 id="auto-increment">Auto-Increment</h3>

12
README.md
View file

@ -131,7 +131,7 @@ To install and run from [Maven](http://maven.apache.org/), configure an artifact
<dependency> <dependency>
<groupId>net.thauvin.erik</groupId> <groupId>net.thauvin.erik</groupId>
<artifactId>semver</artifactId> <artifactId>semver</artifactId>
<version>0.9.6-beta</version> <version>0.9.7</version>
</dependency> </dependency>
``` ```
@ -143,7 +143,7 @@ To install and run from [Gradle](https://gradle.org/), add the following to the
```gradle ```gradle
dependencies { 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 ```gradle
dependencies { dependencies {
compileOnly 'net.thauvin.erik:semver:0.9.6-beta' compileOnly 'net.thauvin.erik:semver:0.9.7'
} }
annotationProcessor { annotationProcessor {
library 'net.thauvin.erik:semver:0.9.6-beta' library 'net.thauvin.erik:semver:0.9.7'
processor 'net.thauvin.erik.semver.VersionProcessor' processor 'net.thauvin.erik.semver.VersionProcessor'
// sourcesDir 'src/generated/java' // sourcesDir 'src/generated/java'
} }
@ -188,8 +188,8 @@ To install and run from [Kobalt](http://beust.com/kobalt/), add the following to
```gradle ```gradle
dependencies { dependencies {
apt("net.thauvin.erik:semver:0.9.6-beta") apt("net.thauvin.erik:semver:0.9.7")
compile("net.thauvin.erik:semver:0.9.6-beta") compile("net.thauvin.erik:semver:0.9.7")
} }
``` ```

4
example/build.gradle
View file

@ -45,13 +45,13 @@ repositories {
} }
dependencies { dependencies {
compileOnly 'net.thauvin.erik:semver:0.9.6-beta' compileOnly 'net.thauvin.erik:semver:0.9.7'
} }
annotationProcessor { annotationProcessor {
// Update version, increment on release. // Update version, increment on release.
project.version = getVersion(isRelease) 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' processor 'net.thauvin.erik.semver.VersionProcessor'
// sourcesDir 'src/generated/java' // sourcesDir 'src/generated/java'
} }

2
example/kobalt/src/Build.kt
View file

@ -39,7 +39,7 @@ val example = project {
version = versionFor() version = versionFor()
val mainClassName = "net.thauvin.erik.semver.example.Example" 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 { sourceDirectories {
path("src/main/java") path("src/main/java")

BIN
example/kobalt/wrapper/kobalt-wrapper.jar
View file

Binary file not shown.

2
example/kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1 @@
kobalt.version=0.867 kobalt.version=0.882

9
kobalt/src/Build.kt
View file

@ -11,9 +11,9 @@ import java.io.FileInputStream
import java.util.* import java.util.*
import net.thauvin.erik.kobalt.plugin.exec.* 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 { fun StringBuilder.prepend(s: String): StringBuilder {
if (this.length > 0) { if (this.length > 0) {
@ -82,7 +82,6 @@ val semver = project {
} }
} }
val example = project { val example = project {
name = "example" name = "example"
@ -90,7 +89,7 @@ val example = project {
version = versionFor(directory) version = versionFor(directory)
val mainClassName = "net.thauvin.erik.semver.example.Example" 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 { sourceDirectories {
path("src/main/java") path("src/main/java")
@ -124,4 +123,4 @@ val example = project {
application { application {
mainClass = mainClassName mainClass = mainClassName
} }
} }

BIN
kobalt/wrapper/kobalt-wrapper.jar
View file

Binary file not shown.

2
kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1 @@
kobalt.version=0.867 kobalt.version=0.889

9
semver.ipr
View file

@ -364,15 +364,6 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/2b8c4b3035e45520ef42033e823c7d33e4b4402c/commons-lang-2.4-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/2b8c4b3035e45520ef42033e823c7d33e4b4402c/commons-lang-2.4-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: net.thauvin.erik:semver:0.9.6-beta">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.6-beta/semver-0.9.6-beta.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.6-beta/semver-0.9.6-beta-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.apache.ant:ant-launcher:1.7.0"> <library name="Gradle: org.apache.ant:ant-launcher:1.7.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.7.0/e7e30789211e074aa70ef3eaea59bd5b22a7fa7a/ant-launcher-1.7.0.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.7.0/e7e30789211e074aa70ef3eaea59bd5b22a7fa7a/ant-launcher-1.7.0.jar!/" />

9
src/main/java/net/thauvin/erik/semver/VersionInfo.java
View file

@ -213,7 +213,12 @@ public class VersionInfo {
* @return The version string. * @return The version string.
*/ */
public String getVersion() { public String getVersion() {
return Integer.toString(major) + '.' + Integer.toString(minor) + '.' + Integer.toString(patch) + ( return Integer.toString(major)
prerelease.length() > 0 ? '-' + prerelease : "") + (buildmeta.length() > 0 ? '+' + buildmeta : ""); + '.'
+ Integer.toString(minor)
+ '.'
+ Integer.toString(patch)
+ (prerelease.length() > 0 ? '-' + prerelease : "")
+ (buildmeta.length() > 0 ? '+' + buildmeta : "");
} }
} }

4
version.properties
View file

@ -1,6 +1,6 @@
#Thu, 28 Jan 2016 17:33:17 -0800 #Thu, 28 Jan 2016 17:33:17 -0800
version.major=0 version.major=0
version.minor=9 version.minor=9
version.patch=6 version.patch=7
version.buildmeta= version.buildmeta=
version.prerelease=beta version.prerelease=