diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt index bf31f60..c052689 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt @@ -53,9 +53,9 @@ fun Project.prop(name: String, default: String): String = if (hasProperty(name)) prop(name) else default -fun Project.prop(name: String, default: String?): String? = +fun Project.nprop(name: String): String? = if (hasProperty(name)) prop(name) - else default + else null // Utility to run actions on values fun T.runAction(action: Action?): T { diff --git a/convention/src/main/kotlin/jf.autoversion.gradle.kts b/convention/src/main/kotlin/jf.autoversion.gradle.kts index 6aa0ac0..bb83ca0 100644 --- a/convention/src/main/kotlin/jf.autoversion.gradle.kts +++ b/convention/src/main/kotlin/jf.autoversion.gradle.kts @@ -66,7 +66,7 @@ tasks.register("copyVersionNumber", CopyTextTask::class) { tasks.register("bumpVersion", BumpVersionTask::class) { gitDir = File(projectDir, ".git") isRelease = this@Jf_autoversion_gradle.isRelease - nextVersionType = project.provider { prop("nextVersionType", null) } + nextVersionType = project.provider { nprop("nextVersionType") } nextRelease = project.provider { project.nextRelease } lastRelease = project.provider { project.lastRelease } }