From 71a0fd4ee2cfd48457ebb5bb80d9c5f91aa886be Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 6 Jul 2016 22:45:51 -0700 Subject: [PATCH] Rebuild IDEA project. Added kobalt Build.kt reference to readme. --- .idea/modules/example.iml | 16 +- .idea/modules/example_annotationProcessor.iml | 15 - .idea/modules/example_main.iml | 17 - .idea/modules/example_test.iml | 15 - .idea/modules/semver.iml | 16 +- .idea/modules/semver_main.iml | 16 - .idea/modules/semver_test.iml | 23 - .kobalt/versionCheckTimestamp.txt | 1 + README.html | 2 + README.md | 3 + example/.idea/modules/example.iml | 24 ++ example/example.ipr | 392 ++++++++++++++++++ example/kobalt/Build.kt.iml | 12 + example/kobalt/src/Build.kt | 24 +- .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- example/libs/example-3.1.45+beta.jar | Bin 3269 -> 0 bytes semver.ipr | 374 ++++++++--------- 17 files changed, 641 insertions(+), 311 deletions(-) delete mode 100644 .idea/modules/example_annotationProcessor.iml delete mode 100644 .idea/modules/example_main.iml delete mode 100644 .idea/modules/example_test.iml delete mode 100644 .idea/modules/semver_main.iml delete mode 100644 .idea/modules/semver_test.iml create mode 100644 .kobalt/versionCheckTimestamp.txt create mode 100644 example/.idea/modules/example.iml create mode 100644 example/example.ipr create mode 100644 example/kobalt/Build.kt.iml delete mode 100644 example/libs/example-3.1.45+beta.jar 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 2929792ea6a070d578fc686b575bf34c98800bca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3269 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + @@ -173,136 +132,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file