From d14b93df8f1b35bd12cda805ea37617812ff97ba Mon Sep 17 00:00:00 2001 From: Josh McCullough Date: Mon, 10 Feb 2020 09:15:31 -0500 Subject: [PATCH] allow promotion to release without code changes -- fixes #108 --- .../groovy/net/vivin/gradle/versioning/VersionUtils.groovy | 2 +- .../gradle/versioning/VersionUtilsSpecification.groovy | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/net/vivin/gradle/versioning/VersionUtils.groovy b/src/main/groovy/net/vivin/gradle/versioning/VersionUtils.groovy index 3db3dff..cd95134 100644 --- a/src/main/groovy/net/vivin/gradle/versioning/VersionUtils.groovy +++ b/src/main/groovy/net/vivin/gradle/versioning/VersionUtils.groovy @@ -109,7 +109,7 @@ class VersionUtils { result = versionFromTags } else { - if(version.bump || version.newPreRelease || version.promoteToRelease) { + if(version.bump || version.newPreRelease) { throw new BuildException('Cannot bump the version, create a new pre-release version, or promote a pre-release version because HEAD is currently pointing to a tag that identifies an existing version. To be able to create a new version, you must make changes', null) } diff --git a/src/test/groovy/net/vivin/gradle/versioning/VersionUtilsSpecification.groovy b/src/test/groovy/net/vivin/gradle/versioning/VersionUtilsSpecification.groovy index 5be0987..a3dfb03 100644 --- a/src/test/groovy/net/vivin/gradle/versioning/VersionUtilsSpecification.groovy +++ b/src/test/groovy/net/vivin/gradle/versioning/VersionUtilsSpecification.groovy @@ -243,7 +243,11 @@ class VersionUtilsSpecification extends Specification { [[false, false, false, null, false], [false, false, false, null, true], [false, false, true, null, false], - [false, false, true, null, true]]).findAll { + [false, false, true, null, true], + [false, true, false, null, true], + [false, true, false, null, false], + [false, true, true, null, true], + [false, true, true, null, false]]).findAll { // exclude the 12 cases that fail due to another reason !(it[1] && (it[0] || it[3])) }