Johannes/Scripts
1
0
Fork 0
Code Issues Packages Projects Releases Activity

fix(autoversion): avoid is prefix
All checks were successful
ci/woodpecker/push/gradle Pipeline was successful
Details
ci/woodpecker/push/pages Pipeline was successful
Details

Browse Source
This commit is contained in:
Johannes Frohnmeyer 2024-05-26 11:54:01 +02:00
parent 711b93913b
commit f393bccf63
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
convention/src/main/kotlin/io/gitlab/jfronny/scripts/BumpVersionTask.kt
View File

@ -14,7 +14,7 @@ abstract class BumpVersionTask : DefaultTask() {
} }
@get:InputDirectory abstract val gitDir: DirectoryProperty @get:InputDirectory abstract val gitDir: DirectoryProperty
@get:Input abstract val isRelease: Property<Boolean> @get:Input abstract val releaseWasSet: Property<Boolean> //TODO rename back to isRelease
@get:Input abstract val nextVersionType: Property<String> @get:Input abstract val nextVersionType: Property<String>
@get:Input abstract val nextRelease: Property<SemanticVersion> @get:Input abstract val nextRelease: Property<SemanticVersion>
@get:Input abstract val lastRelease: Property<String> @get:Input abstract val lastRelease: Property<String>
@ -22,7 +22,7 @@ abstract class BumpVersionTask : DefaultTask() {
@TaskAction @TaskAction
fun action() { fun action() {
if (!gitDir.asFile.get().exists()) throw IllegalStateException("Cannot bump without repository") 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 val vt = nextVersionType
.map { VersionType.byName(it) ?: throw IllegalStateException("Unrecognized version type: $this") } .map { VersionType.byName(it) ?: throw IllegalStateException("Unrecognized version type: $this") }
.getOrThrow { IllegalStateException("bumpVersion requires you to set -PversionType=release|beta|alpha") } .getOrThrow { IllegalStateException("bumpVersion requires you to set -PversionType=release|beta|alpha") }

2
convention/src/main/kotlin/jf.autoversion.gradle.kts
View File

@ -65,7 +65,7 @@ tasks.register("copyVersionNumber", CopyTextTask::class) {
tasks.register("bumpVersion", BumpVersionTask::class) { tasks.register("bumpVersion", BumpVersionTask::class) {
gitDir = File(projectDir, ".git") gitDir = File(projectDir, ".git")
isRelease = this@Jf_autoversion_gradle.isRelease releaseWasSet = this@Jf_autoversion_gradle.isRelease
nextVersionType = project.provider { nprop("nextVersionType") } nextVersionType = project.provider { nprop("nextVersionType") }
nextRelease = project.provider { project.nextRelease } nextRelease = project.provider { project.nextRelease }
lastRelease = project.provider { project.lastRelease } lastRelease = project.provider { project.lastRelease }