diff --git a/.idea/modules/example.iml b/.idea/modules/example.iml index 9116db6..eeab07b 100644 --- a/.idea/modules/example.iml +++ b/.idea/modules/example.iml @@ -1,12 +1,24 @@ - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/example_annotationProcessor.iml b/.idea/modules/example_annotationProcessor.iml deleted file mode 100644 index 9ca3ab2..0000000 --- a/.idea/modules/example_annotationProcessor.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/example_main.iml b/.idea/modules/example_main.iml deleted file mode 100644 index efb7655..0000000 --- a/.idea/modules/example_main.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/example_test.iml b/.idea/modules/example_test.iml deleted file mode 100644 index 56795dd..0000000 --- a/.idea/modules/example_test.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/semver.iml b/.idea/modules/semver.iml index 59dbed9..600c897 100644 --- a/.idea/modules/semver.iml +++ b/.idea/modules/semver.iml @@ -1,12 +1,26 @@ - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/semver_main.iml b/.idea/modules/semver_main.iml deleted file mode 100644 index 9a94367..0000000 --- a/.idea/modules/semver_main.iml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/semver_test.iml b/.idea/modules/semver_test.iml deleted file mode 100644 index 162da03..0000000 --- a/.idea/modules/semver_test.iml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.kobalt/versionCheckTimestamp.txt b/.kobalt/versionCheckTimestamp.txt new file mode 100644 index 0000000..1a0362c --- /dev/null +++ b/.kobalt/versionCheckTimestamp.txt @@ -0,0 +1 @@ +2016-07-07T05:15:22.444Z \ No newline at end of file diff --git a/README.html b/README.html index 79ebf0e..f775bec 100644 --- a/README.html +++ b/README.html @@ -273,7 +273,9 @@ compileJava {

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

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

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

Auto-Increment

Incrementing the version is best left to your favorite build system.

For a solution using Gradle, please have a look at the build.gradle file in the example module directory. To run the example with patch version auto-incrementing, issue the following command:

diff --git a/README.md b/README.md index a5e83c7..e325760 100644 --- a/README.md +++ b/README.md @@ -187,9 +187,12 @@ To install and run from [Kobalt](http://beust.com/kobalt/), add the following to ```gradle dependencies { apt("net.thauvin.erik:semver:0.9.5-beta") + compile("net.thauvin.erik:semver:0.9.5-beta") } ``` +Please look at the [Build.kt](https://github.com/ethauvin/semver/blob/master/example/kobalt/src/Build.kt) file in the [example](https://github.com/ethauvin/semver/tree/master/example) module directory for a sample. + ### Auto-Increment Incrementing the version is best left to your favorite build system. diff --git a/example/.idea/modules/example.iml b/example/.idea/modules/example.iml new file mode 100644 index 0000000..01812f4 --- /dev/null +++ b/example/.idea/modules/example.iml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/example.ipr b/example/example.ipr new file mode 100644 index 0000000..0af353e --- /dev/null +++ b/example/example.ipr @@ -0,0 +1,392 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Android Lint + + + Java + + + Portability issuesJava + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8.x + + + + + + + + \ No newline at end of file diff --git a/example/kobalt/Build.kt.iml b/example/kobalt/Build.kt.iml new file mode 100644 index 0000000..7bc9dd6 --- /dev/null +++ b/example/kobalt/Build.kt.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index dc2d27a..ff97c57 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -1,23 +1,15 @@ +import com.beust.kobalt.plugin.application.application +import com.beust.kobalt.plugin.apt.apt +import com.beust.kobalt.plugin.packaging.assemble +import com.beust.kobalt.project import java.io.FileInputStream -import java.io.FileOutputStream -import java.lang.NumberFormatException -import java.util.Properties - -import com.beust.kobalt.* -import com.beust.kobalt.api.annotation.Task -import com.beust.kobalt.api.Project -import com.beust.kobalt.plugin.application.* -import com.beust.kobalt.plugin.apt.* -import com.beust.kobalt.plugin.java.* -import com.beust.kobalt.plugin.packaging.* - -val repos = repos() +import java.util.* val p = project { name = "example" - fun getVersion(isIncrement: Boolean = false): String { + fun versionFor(): String { val propsFile = "version.properties" val majorKey = "version.major" val minorKey = "version.minor" @@ -42,7 +34,7 @@ val p = project { + prerelease + metadata) } - version = getVersion() + version = versionFor() val mainClassName = "net.thauvin.erik.semver.example.Example" val processorJar = "net.thauvin.erik:semver:0.9.5-beta" @@ -75,4 +67,4 @@ val p = project { application { mainClass = mainClassName } -} +} \ No newline at end of file diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index 94f0c3b..e446beb 100644 --- a/example/kobalt/wrapper/kobalt-wrapper.properties +++ b/example/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.839 +kobalt.version=0.840 \ No newline at end of file diff --git a/example/libs/example-3.1.45+beta.jar b/example/libs/example-3.1.45+beta.jar deleted file mode 100644 index 2929792..0000000 Binary files a/example/libs/example-3.1.45+beta.jar and /dev/null differ diff --git a/semver.ipr b/semver.ipr index 2739bbe..0374e21 100644 --- a/semver.ipr +++ b/semver.ipr @@ -1,43 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + @@ -173,136 +132,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file