diff --git a/.idea/modules/examples-java_test.iml b/.idea/modules/examples-java_test.iml index ea3879f..569706d 100644 --- a/.idea/modules/examples-java_test.iml +++ b/.idea/modules/examples-java_test.iml @@ -11,8 +11,8 @@ - + diff --git a/.idea/modules/semver.iml b/.idea/modules/semver.iml index 92e92ce..41ae9a8 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 3a0683d..41fc643 100644 --- a/.idea/modules/semver_main.iml +++ b/.idea/modules/semver_main.iml @@ -1,5 +1,5 @@ - + @@ -36,28 +36,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -69,24 +47,6 @@ - - - - - - - - - - - - - - - - - - @@ -101,7 +61,34 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -190,7 +177,18 @@ - + + + + + + + + + + + + @@ -199,16 +197,18 @@ - + - + + + - + @@ -223,9 +223,6 @@ - - - @@ -235,21 +232,12 @@ - + + - - - - - - - - - - - + @@ -264,10 +252,22 @@ + + + - + + + + + + + + + + diff --git a/.idea/modules/semver_test.iml b/.idea/modules/semver_test.iml index 4276081..76d5b1b 100644 --- a/.idea/modules/semver_test.iml +++ b/.idea/modules/semver_test.iml @@ -1,10 +1,17 @@ - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -227,7 +234,6 @@ - @@ -237,6 +243,7 @@ + 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 164d180..cce75d1 100644 --- a/examples/annotation-processor/java/src/generated/com/example/GeneratedVersion.java +++ b/examples/annotation-processor/java/src/generated/com/example/GeneratedVersion.java @@ -16,9 +16,9 @@ public final class GeneratedVersion { public final static String BUILDMETA_PREFIX = "+"; public final static String PROJECT = ""; - public final static Date BUILDDATE = new Date(1530560225038L); + public final static Date BUILDDATE = new Date(1530571116045L); public final static int MAJOR = 1; - public final static int MINOR = 0; + public final static int MINOR = 1; public final static int PATCH = 0; public final static String PRERELEASE = ""; public final static String BUILDMETA = ""; diff --git a/examples/java/version.properties b/examples/java/version.properties index 730b32d..b1704b5 100644 --- a/examples/java/version.properties +++ b/examples/java/version.properties @@ -1,7 +1,7 @@ #Generated by the Semver Plugin for Gradle -#Mon Jul 02 12:31:48 PDT 2018 +#Mon Jul 02 21:58:49 PDT 2018 version.prerelease= -version.minor=0 version.buildmeta= -version.patch=0 +version.patch=2 version.major=1 +version.minor=0 diff --git a/examples/test/build.gradle b/examples/test/build.gradle index 1cb336e..a05b3ea 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.3-beta" + classpath "net.thauvin.erik.gradle:semver:0.9.4-beta" } } @@ -37,7 +37,7 @@ run { } semver { - properties = "test.properties" - keysPrefix = "test." + properties = "example.properties" + keysPrefix = "example." buildMetaKey = "meta" } \ No newline at end of file diff --git a/examples/test/example.properties b/examples/test/example.properties new file mode 100644 index 0000000..d002a26 --- /dev/null +++ b/examples/test/example.properties @@ -0,0 +1,7 @@ +#Generated by the Semver Plugin for Gradle +#Mon Jul 02 23:03:45 PDT 2018 +example.major=1 +example.meta=007 +example.prerelease= +example.minor=1 +example.patch=1 diff --git a/examples/test/test.properties b/examples/test/test.properties deleted file mode 100644 index ea8ca13..0000000 --- a/examples/test/test.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Generated by the Semver Plugin for Gradle -#Sun Jul 01 13:20:13 PDT 2018 -test.major=1 -test.prerelease= -test.meta= -test.patch=0 -test.minor=0 diff --git a/examples/test/version.properties b/examples/test/version.properties index d7c2a53..0a909a3 100644 --- a/examples/test/version.properties +++ b/examples/test/version.properties @@ -1,7 +1,7 @@ #Generated by the Semver Plugin for Gradle -#Sun Jul 01 13:11:20 PDT 2018 +#Mon Jul 02 22:37:14 PDT 2018 version.prerelease= version.buildmeta= -version.patch=0 +version.patch=3 version.major=1 version.minor=0 diff --git a/examples/version.properties b/examples/version.properties new file mode 100644 index 0000000..cd564a3 --- /dev/null +++ b/examples/version.properties @@ -0,0 +1,7 @@ +#Generated by the Semver Plugin for Gradle +#Mon Jul 02 15:38:33 PDT 2018 +version.prerelease= +version.minor=1 +version.buildmeta= +version.patch=0 +version.major=1