diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/BumpVersionTask.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/BumpVersionTask.kt index 753a827..73466da 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/BumpVersionTask.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/BumpVersionTask.kt @@ -14,7 +14,7 @@ abstract class BumpVersionTask : DefaultTask() { } @get:InputDirectory abstract val gitDir: DirectoryProperty - @get:Input abstract val isRelease: Property + @get:Input abstract val releaseWasSet: Property //TODO rename back to isRelease @get:Input abstract val nextVersionType: Property @get:Input abstract val nextRelease: Property @get:Input abstract val lastRelease: Property @@ -22,7 +22,7 @@ abstract class BumpVersionTask : DefaultTask() { @TaskAction fun action() { if (!gitDir.asFile.get().exists()) throw IllegalStateException("Cannot bump without repository") - if (isRelease.get()) throw IllegalStateException("Cannot bump while 'release' is set") + if (releaseWasSet.get()) throw IllegalStateException("Cannot bump while 'release' is set") val vt = nextVersionType .map { VersionType.byName(it) ?: throw IllegalStateException("Unrecognized version type: $this") } .getOrThrow { IllegalStateException("bumpVersion requires you to set -PversionType=release|beta|alpha") } diff --git a/convention/src/main/kotlin/jf.autoversion.gradle.kts b/convention/src/main/kotlin/jf.autoversion.gradle.kts index bb83ca0..92344e9 100644 --- a/convention/src/main/kotlin/jf.autoversion.gradle.kts +++ b/convention/src/main/kotlin/jf.autoversion.gradle.kts @@ -65,7 +65,7 @@ tasks.register("copyVersionNumber", CopyTextTask::class) { tasks.register("bumpVersion", BumpVersionTask::class) { gitDir = File(projectDir, ".git") - isRelease = this@Jf_autoversion_gradle.isRelease + releaseWasSet = this@Jf_autoversion_gradle.isRelease nextVersionType = project.provider { nprop("nextVersionType") } nextRelease = project.provider { project.nextRelease } lastRelease = project.provider { project.lastRelease }