diff --git a/.idea/modules/example.iml b/.idea/modules/example.iml
new file mode 100644
index 0000000..9116db6
--- /dev/null
+++ b/.idea/modules/example.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/example_annotationProcessor.iml b/.idea/modules/example_annotationProcessor.iml
new file mode 100644
index 0000000..9ca3ab2
--- /dev/null
+++ b/.idea/modules/example_annotationProcessor.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/example_main.iml b/.idea/modules/example_main.iml
new file mode 100644
index 0000000..efb7655
--- /dev/null
+++ b/.idea/modules/example_main.iml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/example_test.iml b/.idea/modules/example_test.iml
new file mode 100644
index 0000000..56795dd
--- /dev/null
+++ b/.idea/modules/example_test.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/semver_test.iml b/.idea/modules/semver_test.iml
index 3b0a63b..162da03 100644
--- a/.idea/modules/semver_test.iml
+++ b/.idea/modules/semver_test.iml
@@ -9,10 +9,15 @@
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/example/.gitignore b/example/.gitignore
index d7290a0..e7edde6 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -7,6 +7,7 @@
.DS_Store
.classpath
.gradle
+.kobalt
.nb-gradle
.project
.settings
@@ -15,10 +16,12 @@
/deploy
/dist
/gen
+/gradle.properties
/local.properties
/out
/proguard-project.txt
/project.properties
/test-output
Thumbs.db
-ehthumbs.db
\ No newline at end of file
+ehthumbs.db
+kobaltBuild
\ No newline at end of file
diff --git a/example/build.gradle b/example/build.gradle
index 8915f54..92e981e 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -53,6 +53,7 @@ annotationProcessor {
project.version = getVersion(isRelease)
library 'net.thauvin.erik:semver:0.9.5-beta'
processor 'net.thauvin.erik.semver.VersionProcessor'
+ // sourcesDir 'src/generated/java'
}
compileJava {
@@ -81,7 +82,6 @@ task deploy(dependsOn: ['build', 'copyToDeploy']) {
mustRunAfter clean
}
-
task release(dependsOn: ['deploy', 'wrapper']) << {
group = 'Publishing'
description = 'Releases new version.'
diff --git a/example/example.iml b/example/example.iml
deleted file mode 100644
index cfb2ba6..0000000
--- a/example/example.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt
new file mode 100644
index 0000000..a703f44
--- /dev/null
+++ b/example/kobalt/src/Build.kt
@@ -0,0 +1,71 @@
+import java.util.Properties
+import java.io.FileInputStream
+
+import com.beust.kobalt.*
+import com.beust.kobalt.plugin.packaging.*
+import com.beust.kobalt.plugin.application.*
+import com.beust.kobalt.plugin.java.*
+import com.beust.kobalt.plugin.apt.*
+
+val repos = repos()
+
+val p = project {
+
+ fun getVersion(isIncremental: Boolean = false): String {
+ val propsFile = "version.properties"
+ val majorKey = "version.major"
+ val minorKey = "version.minor"
+ val patchKey = "version.patch"
+ val metaKey = "version.buildmeta"
+ val preKey = "version.prerelease"
+
+ val p = Properties().apply {
+ FileInputStream(propsFile).use { fis -> load(fis) }
+ }
+
+ val metadata = StringBuilder(p.getProperty(metaKey, ""))
+ if (metadata.length > 0) {
+ metadata.insert(0, '-');
+ }
+ val prerelease = StringBuilder(p.getProperty(preKey, ""))
+ if (prerelease.length > 0) {
+ prerelease.insert(0, "+");
+ }
+ return (p.getProperty(majorKey, "1") + "." + p.getProperty(minorKey, "0") + "." + p.getProperty(patchKey, "0") + prerelease + metadata)
+ }
+
+ name = "example"
+ version = getVersion()
+
+ val mainClassName = "net.thauvin.erik.semver.example.Example"
+ val processorJar = "net.thauvin.erik:semver:0.9.5-beta"
+
+ sourceDirectories {
+ path("src/main/java")
+ }
+
+ sourceDirectoriesTest {
+ path("src/test/java")
+ }
+
+ dependencies {
+ apt(processorJar)
+ compile(processorJar)
+ }
+
+ dependenciesTest {
+
+ }
+
+ assemble {
+ jar {
+ manifest {
+ attributes("Main-Class", mainClassName)
+ }
+ }
+ }
+
+ application {
+ mainClass = mainClassName
+ }
+}
diff --git a/example/kobalt/wrapper/kobalt-wrapper.jar b/example/kobalt/wrapper/kobalt-wrapper.jar
new file mode 100644
index 0000000..c178849
Binary files /dev/null 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
new file mode 100644
index 0000000..94f0c3b
--- /dev/null
+++ b/example/kobalt/wrapper/kobalt-wrapper.properties
@@ -0,0 +1 @@
+kobalt.version=0.839
diff --git a/example/kobaltw b/example/kobaltw
new file mode 100644
index 0000000..b27b3d8
--- /dev/null
+++ b/example/kobaltw
@@ -0,0 +1 @@
+java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $*
diff --git a/example/libs/example-3.1.39+beta.jar b/example/libs/example-3.1.39+beta.jar
new file mode 100644
index 0000000..7a74f49
Binary files /dev/null and b/example/libs/example-3.1.39+beta.jar differ
diff --git a/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java b/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java
index 91857be..f944f93 100644
--- a/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java
+++ b/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java
@@ -14,7 +14,7 @@ import java.util.Date;
*/
public final class GeneratedVersion {
private final static String buildmeta = "";
- private final static Date date = new Date(1466981527892L);
+ private final static Date date = new Date(1467521680486L);
private final static int major = 3;
private final static int minor = 1;
private final static int patch = 39;
diff --git a/semver.ipr b/semver.ipr
index c16e329..2739bbe 100644
--- a/semver.ipr
+++ b/semver.ipr
@@ -58,6 +58,9 @@
+
+
+
@@ -313,7 +316,10 @@
-
+
+
+
+
@@ -326,6 +332,15 @@
+
+
+
+
+
+
+
+
+
@@ -353,6 +368,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -362,12 +393,22 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file