diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 2fa4070..283fcb4 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,24 +2,24 @@ - - - - - - - - - + + + + + + + + + - + - - + + - - + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index e707cdd..de03161 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/modules/annotation-processor/java/annotation-processor-java_main.iml b/.idea/modules/annotation-processor/java/annotation-processor-java_main.iml index e27c1b1..63956e7 100644 --- a/.idea/modules/annotation-processor/java/annotation-processor-java_main.iml +++ b/.idea/modules/annotation-processor/java/annotation-processor-java_main.iml @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml b/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml index 56e1e5c..38c2600 100644 --- a/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml +++ b/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml @@ -1,6 +1,6 @@ - + diff --git a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_main.iml b/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_main.iml index 025644b..c9f697a 100644 --- a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_main.iml +++ b/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_main.iml @@ -23,7 +23,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_test.iml b/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_test.iml index 72008aa..4a71ebf 100644 --- a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_test.iml +++ b/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_test.iml @@ -23,7 +23,7 @@ - + diff --git a/.idea/modules/ap-examples-java_main.iml b/.idea/modules/ap-examples-java_main.iml index c9833e4..f0872d0 100644 --- a/.idea/modules/ap-examples-java_main.iml +++ b/.idea/modules/ap-examples-java_main.iml @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/ap-examples-java_test.iml b/.idea/modules/ap-examples-java_test.iml index 2e20acb..1168954 100644 --- a/.idea/modules/ap-examples-java_test.iml +++ b/.idea/modules/ap-examples-java_test.iml @@ -1,6 +1,6 @@ - + diff --git a/.idea/modules/ap-examples-kotlin_main.iml b/.idea/modules/ap-examples-kotlin_main.iml index ba500a4..9b5da31 100644 --- a/.idea/modules/ap-examples-kotlin_main.iml +++ b/.idea/modules/ap-examples-kotlin_main.iml @@ -23,7 +23,7 @@ - + @@ -49,8 +49,8 @@ - + \ No newline at end of file diff --git a/.idea/modules/ap-examples-kotlin_test.iml b/.idea/modules/ap-examples-kotlin_test.iml index 2f272d8..93dfa26 100644 --- a/.idea/modules/ap-examples-kotlin_test.iml +++ b/.idea/modules/ap-examples-kotlin_test.iml @@ -23,7 +23,7 @@ - + diff --git a/.idea/modules/examples-java_main.iml b/.idea/modules/examples-java_main.iml index 20dbdd5..e92db06 100644 --- a/.idea/modules/examples-java_main.iml +++ b/.idea/modules/examples-java_main.iml @@ -1,6 +1,6 @@ - + diff --git a/.idea/modules/examples-java_test.iml b/.idea/modules/examples-java_test.iml index eeccd0b..ea3879f 100644 --- a/.idea/modules/examples-java_test.iml +++ b/.idea/modules/examples-java_test.iml @@ -1,6 +1,6 @@ - + @@ -11,8 +11,8 @@ - + diff --git a/.idea/modules/examples-kotlin_main.iml b/.idea/modules/examples-kotlin_main.iml index 2c50ac8..9b8f986 100644 --- a/.idea/modules/examples-kotlin_main.iml +++ b/.idea/modules/examples-kotlin_main.iml @@ -23,7 +23,7 @@ - + diff --git a/.idea/modules/examples-kotlin_test.iml b/.idea/modules/examples-kotlin_test.iml index a17c71e..775c9ac 100644 --- a/.idea/modules/examples-kotlin_test.iml +++ b/.idea/modules/examples-kotlin_test.iml @@ -23,7 +23,7 @@ - + diff --git a/.idea/modules/semver.iml b/.idea/modules/semver.iml index ff76db3..92e92ce 100644 --- a/.idea/modules/semver.iml +++ b/.idea/modules/semver.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/semver_main.iml b/.idea/modules/semver_main.iml index 4a9749c..3a0683d 100644 --- a/.idea/modules/semver_main.iml +++ b/.idea/modules/semver_main.iml @@ -1,5 +1,5 @@ - + @@ -28,7 +28,7 @@ - + @@ -39,7 +39,40 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48,7 +81,7 @@ - + @@ -57,7 +90,18 @@ - + + + + + + + + + + + + @@ -66,25 +110,87 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + @@ -99,6 +205,15 @@ + + + + + + + + + @@ -108,66 +223,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -184,20 +246,10 @@ - + - - - - - - - - - - - + @@ -206,7 +258,52 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/modules/semver_test.iml b/.idea/modules/semver_test.iml index 9c0a069..4276081 100644 --- a/.idea/modules/semver_test.iml +++ b/.idea/modules/semver_test.iml @@ -1,17 +1,10 @@ - + - + - - + @@ -116,11 +109,10 @@ - - + @@ -135,15 +127,6 @@ - - - - - - - - - @@ -156,7 +139,7 @@ - + @@ -165,7 +148,51 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -174,7 +201,7 @@ - + @@ -183,40 +210,24 @@ - + + - - - - - - - - - - - - - - - - - - - + + @@ -226,7 +237,6 @@ - @@ -239,6 +249,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/annotation-processor/java/build.gradle b/examples/annotation-processor/java/build.gradle index b9a588e..9fedd3c 100644 --- a/examples/annotation-processor/java/build.gradle +++ b/examples/annotation-processor/java/build.gradle @@ -1,10 +1,7 @@ -buildscript { - repositories { - mavenLocal() - } - dependencies { - classpath "net.thauvin.erik.gradle:semver:0.9.2-beta" - } +plugins { + id 'java' + id 'application' + id "net.thauvin.erik.gradle.semver" version "0.9.3-beta" } // ./gradlew @@ -12,13 +9,6 @@ buildscript { // ./gradlew clean incrementMinor run // ./gradlew clean incrementMajor run -plugins { - id 'java' - id 'application' -} - -apply plugin: 'net.thauvin.erik.gradle.semver' - mainClassName = 'com.example.Example' defaultTasks 'run' diff --git a/examples/annotation-processor/java/src/generated/com/example/GeneratedVersion.java b/examples/annotation-processor/java/src/generated/com/example/GeneratedVersion.java index e55ff84..164d180 100644 --- a/examples/annotation-processor/java/src/generated/com/example/GeneratedVersion.java +++ b/examples/annotation-processor/java/src/generated/com/example/GeneratedVersion.java @@ -16,7 +16,7 @@ public final class GeneratedVersion { public final static String BUILDMETA_PREFIX = "+"; public final static String PROJECT = ""; - public final static Date BUILDDATE = new Date(1530516790148L); + public final static Date BUILDDATE = new Date(1530560225038L); public final static int MAJOR = 1; public final static int MINOR = 0; public final static int PATCH = 0; diff --git a/examples/annotation-processor/java/version.properties b/examples/annotation-processor/java/version.properties index 4b31e45..e430d9a 100644 --- a/examples/annotation-processor/java/version.properties +++ b/examples/annotation-processor/java/version.properties @@ -1,7 +1,7 @@ #Generated by the Semver Plugin for Gradle -#Mon Jul 02 00:24:34 PDT 2018 +#Mon Jul 02 12:23:13 PDT 2018 version.prerelease= +version.minor=0 version.buildmeta= version.patch=0 version.major=2 -version.minor=0 diff --git a/examples/annotation-processor/kotlin/build.gradle.kts b/examples/annotation-processor/kotlin/build.gradle.kts index aaf2387..0b36410 100644 --- a/examples/annotation-processor/kotlin/build.gradle.kts +++ b/examples/annotation-processor/kotlin/build.gradle.kts @@ -1,28 +1,16 @@ import net.thauvin.erik.gradle.semver.SemverConfig -buildscript { - repositories { - mavenLocal() - } - dependencies { - classpath("net.thauvin.erik.gradle:semver:0.9.2-beta") - } -} - plugins { kotlin("jvm") version "1.2.50" application id("org.jetbrains.kotlin.kapt") version "1.2.50" + id("net.thauvin.erik.gradle.semver") version "0.9.3-beta" } -apply { - plugin("net.thauvin.erik.gradle.semver") -} - - // ./gradlew -// ./gradlew runJava -// ./gradlew run runJava +// ./gradlew clean incrementPatch run +// ./gradlew clean incrementMinor run +// ./gradlew clean incrementMajor run defaultTasks(ApplicationPlugin.TASK_RUN_NAME) diff --git a/examples/annotation-processor/kotlin/version.properties b/examples/annotation-processor/kotlin/version.properties index 0de31e8..2ba0606 100644 --- a/examples/annotation-processor/kotlin/version.properties +++ b/examples/annotation-processor/kotlin/version.properties @@ -1,7 +1,7 @@ #Generated by the Semver Plugin for Gradle -#Mon Jul 02 01:47:00 PDT 2018 +#Mon Jul 02 12:30:21 PDT 2018 version.prerelease= -version.buildmeta= -version.patch=0 -version.major=11 version.minor=1 +version.buildmeta= +version.patch=2 +version.major=11 diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 989cdcf..ccb0fbe 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -1,10 +1,7 @@ -buildscript { - repositories { - mavenLocal() - } - dependencies { - classpath "net.thauvin.erik.gradle:semver:0.9.2-beta" - } +plugins { + id 'java' + id 'application' + id "net.thauvin.erik.gradle.semver" version "0.9.3-beta" } // ./gradlew @@ -12,13 +9,6 @@ buildscript { // ./gradlew incrementMinor run // ./gradlew incrementMajor run -plugins { - id 'java' - id 'application' -} - -apply plugin: 'net.thauvin.erik.gradle.semver' - mainClassName = 'App' compileJava.options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated") diff --git a/examples/java/version.properties b/examples/java/version.properties index f2b2f94..730b32d 100644 --- a/examples/java/version.properties +++ b/examples/java/version.properties @@ -1,7 +1,7 @@ #Generated by the Semver Plugin for Gradle -#Sun Jul 01 21:42:08 PDT 2018 +#Mon Jul 02 12:31:48 PDT 2018 version.prerelease= +version.minor=0 version.buildmeta= version.patch=0 version.major=1 -version.minor=0 diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index e25978e..b8f8b13 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -1,21 +1,9 @@ import net.thauvin.erik.gradle.semver.SemverConfig -buildscript { - repositories { - mavenLocal() - } - dependencies { - classpath("net.thauvin.erik.gradle:semver:0.9.2-beta") - } -} - plugins { kotlin("jvm") version "1.2.50" application -} - -apply { - plugin("net.thauvin.erik.gradle.semver") + id("net.thauvin.erik.gradle.semver") version "0.9.3-beta" } // ./gradlew diff --git a/examples/kotlin/version.properties b/examples/kotlin/version.properties index 07c320f..c2bc416 100644 --- a/examples/kotlin/version.properties +++ b/examples/kotlin/version.properties @@ -1,7 +1,7 @@ #Generated by the Semver Plugin for Gradle -#Sun Jul 01 22:34:20 PDT 2018 +#Mon Jul 02 12:34:38 PDT 2018 version.prerelease= +version.minor=0 version.buildmeta= version.patch=0 version.major=1 -version.minor=0 diff --git a/examples/test/build.gradle b/examples/test/build.gradle index 81eac11..1cb336e 100644 --- a/examples/test/build.gradle +++ b/examples/test/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenLocal() } dependencies { - classpath "net.thauvin.erik.gradle:semver:0.9.2-beta" + classpath "net.thauvin.erik.gradle:semver:0.9.3-beta" } }