From 4efc2ba2d62ae6e95d25588bd2b7c0559be79a01 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 24 May 2019 01:13:41 -0700 Subject: [PATCH] Updated the examples. --- .../annotation-processor/java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../kotlin/build.gradle.kts | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/java/version.properties | 6 ++-- examples/kotlin/build.gradle.kts | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/kotlin/version.properties | 6 ++-- examples/test/build.gradle | 4 +-- examples/test/locked | 0 examples/test/locked.properties | 8 +++++ examples/version.properties | 8 +++++ .../thauvin/erik/gradle/semver/UtilsSpec.kt | 33 ++++++++++--------- 15 files changed, 51 insertions(+), 34 deletions(-) create mode 100644 examples/test/locked create mode 100644 examples/test/locked.properties create mode 100644 examples/version.properties diff --git a/examples/annotation-processor/java/build.gradle b/examples/annotation-processor/java/build.gradle index c888202..4fae1e3 100644 --- a/examples/annotation-processor/java/build.gradle +++ b/examples/annotation-processor/java/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'application' - id 'net.thauvin.erik.gradle.semver' version '1.0.0' + id 'net.thauvin.erik.gradle.semver' version '1.0.1' id 'com.github.ben-manes.versions' version '0.21.0' } diff --git a/examples/annotation-processor/java/gradle/wrapper/gradle-wrapper.properties b/examples/annotation-processor/java/gradle/wrapper/gradle-wrapper.properties index 5f1b120..f4d7b2b 100644 --- a/examples/annotation-processor/java/gradle/wrapper/gradle-wrapper.properties +++ b/examples/annotation-processor/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/annotation-processor/kotlin/build.gradle.kts b/examples/annotation-processor/kotlin/build.gradle.kts index d4e2bb3..363fdbf 100644 --- a/examples/annotation-processor/kotlin/build.gradle.kts +++ b/examples/annotation-processor/kotlin/build.gradle.kts @@ -1,8 +1,8 @@ plugins { kotlin("jvm").version("1.3.30") application - id("org.jetbrains.kotlin.kapt").version("1.3.30") - id("net.thauvin.erik.gradle.semver").version("1.0.0") + id("org.jetbrains.kotlin.kapt").version("1.3.31") + id("net.thauvin.erik.gradle.semver").version("1.0.1") id("com.github.ben-manes.versions").version("0.21.0") } diff --git a/examples/annotation-processor/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/annotation-processor/kotlin/gradle/wrapper/gradle-wrapper.properties index 5f1b120..f4d7b2b 100644 --- a/examples/annotation-processor/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/annotation-processor/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 86321ed..b6b7234 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'application' - id 'net.thauvin.erik.gradle.semver' version '1.0.0' + id 'net.thauvin.erik.gradle.semver' version '1.0.1' id 'com.github.ben-manes.versions' version '0.21.0' } diff --git a/examples/java/gradle/wrapper/gradle-wrapper.properties b/examples/java/gradle/wrapper/gradle-wrapper.properties index 5f1b120..f4d7b2b 100644 --- a/examples/java/gradle/wrapper/gradle-wrapper.properties +++ b/examples/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/java/version.properties b/examples/java/version.properties index 63d6e86..4a0739e 100644 --- a/examples/java/version.properties +++ b/examples/java/version.properties @@ -1,8 +1,8 @@ #Generated by the Semver Plugin for Gradle -#Tue Apr 23 16:37:45 PDT 2019 -version.buildmeta=20190423163745 +#Fri May 24 01:11:52 PDT 2019 +version.buildmeta=20190524011152 version.major=1 version.minor=1 version.patch=8 version.prerelease=alpha -version.semver=1.1.8-alpha+20190423163745 +version.semver=1.1.8-alpha+20190524011152 diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index a4f2a2f..d7ece1c 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -4,9 +4,9 @@ import java.time.LocalDateTime import java.time.format.DateTimeFormatter plugins { - kotlin("jvm").version("1.3.30") + kotlin("jvm").version("1.3.31") application - id("net.thauvin.erik.gradle.semver").version("1.0.0") + id("net.thauvin.erik.gradle.semver").version("1.0.1") id("com.github.ben-manes.versions").version("0.21.0") } diff --git a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties index 5f1b120..f4d7b2b 100644 --- a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/kotlin/version.properties b/examples/kotlin/version.properties index 67e57ae..42b96ca 100644 --- a/examples/kotlin/version.properties +++ b/examples/kotlin/version.properties @@ -1,8 +1,8 @@ #Generated by the Semver Plugin for Gradle -#Tue Apr 23 16:38:50 PDT 2019 -version.buildmeta=20190423163850 +#Fri May 24 01:12:52 PDT 2019 +version.buildmeta=20190524011252 version.major=1 version.minor=2 version.patch=4 version.prerelease=beta -version.semver=1.2.4-beta+20190423163850 +version.semver=1.2.4-beta+20190524011252 diff --git a/examples/test/build.gradle b/examples/test/build.gradle index 65879f0..ba95d75 100644 --- a/examples/test/build.gradle +++ b/examples/test/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenLocal() } dependencies { - classpath "net.thauvin.erik.gradle:semver:1.0.0" + classpath "net.thauvin.erik.gradle:semver:1.0.1" } } @@ -45,7 +45,7 @@ run { } semver { - properties = "$projectDir/${f.name}" + properties = "${f.name}" keysPrefix = f.name.substring(0, f.name.indexOf(".") + 1) buildMetaKey = "meta" semverKey = "fullversion" diff --git a/examples/test/locked b/examples/test/locked new file mode 100644 index 0000000..e69de29 diff --git a/examples/test/locked.properties b/examples/test/locked.properties new file mode 100644 index 0000000..03fc5bd --- /dev/null +++ b/examples/test/locked.properties @@ -0,0 +1,8 @@ +#Generated by the Semver Plugin for Gradle +#Fri Apr 19 13:31:37 PDT 2019 +version.fullversion=11.0.0-alpha+20190419133137 +version.major=11 +version.meta=20190419133137 +version.minor=0 +version.patch=0 +version.prerelease=alpha diff --git a/examples/version.properties b/examples/version.properties new file mode 100644 index 0000000..e60c0e6 --- /dev/null +++ b/examples/version.properties @@ -0,0 +1,8 @@ +#Generated by the Semver Plugin for Gradle +#Thu May 23 22:24:06 PDT 2019 +version.fullversion=1.0.0 +version.major=1 +version.meta= +version.minor=0 +version.patch=0 +version.prerelease= diff --git a/src/test/kotlin/net/thauvin/erik/gradle/semver/UtilsSpec.kt b/src/test/kotlin/net/thauvin/erik/gradle/semver/UtilsSpec.kt index 018c2b0..2c787e7 100644 --- a/src/test/kotlin/net/thauvin/erik/gradle/semver/UtilsSpec.kt +++ b/src/test/kotlin/net/thauvin/erik/gradle/semver/UtilsSpec.kt @@ -48,7 +48,6 @@ object UtilsSpec : Spek({ val version = Version() val config = SemverConfig() val propsFile = File("test.properties") - val propsLocked = File("locked.properties") lateinit var props: Properties Scenario("Save/Load Properties") { @@ -171,8 +170,25 @@ object UtilsSpec : Spek({ } } + Scenario("Load locked properties") { + lateinit var locked: File + + Given("the locked location") { + locked = File("locked") + } + + Then("loading locked properties") { + assertFailsWith { + Utils.loadProperties(File(locked, propsFile.name)) + } + locked.delete() + } + } + Scenario("Save to locked properties") { + lateinit var propsLocked: File Given("the locked properties") { + propsLocked = File("locked.properties") propsLocked.createNewFile() propsLocked.setReadOnly() config.properties = propsLocked.name @@ -185,20 +201,5 @@ object UtilsSpec : Spek({ propsLocked.delete() } } - - Scenario("Load locked properties") { - lateinit var locked: File - - Given("the locked location") { - locked = File("locked") - } - - Then("loading locked properties") { - assertFailsWith { - Utils.loadProperties(File(locked, propsLocked.name)) - } - locked.delete() - } - } } })