From 17bd4a0cec4bb0bb72296c79848d140c807d4262 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 18 Mar 2017 11:32:14 -0700 Subject: [PATCH] Renamed auto paramter to enabled for autoGitTag directive. --- .../src/main/kotlin/com/beust/kobalt/misc/Git.kt | 8 ++++---- .../com/beust/kobalt/plugin/publish/PublishPlugin.kt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Git.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Git.kt index 264cdc2a..0507130b 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Git.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Git.kt @@ -6,10 +6,10 @@ import com.google.inject.Inject import java.io.File class Git @Inject constructor() { - fun maybeTagRelease(project: Project, uploadResult: TaskResult, auto: Boolean, annotated: Boolean, tag: String, message: String) : TaskResult { + fun maybeTagRelease(project: Project, uploadResult: TaskResult, enabled: Boolean, annotated: Boolean, tag: String, message: String) : TaskResult { val result = - if (uploadResult.success && auto) { - val tagSuccess = tagRelease(project, auto, annotated, tag, message) + if (uploadResult.success && enabled) { + val tagSuccess = tagRelease(project, annotated, tag, message) if (! tagSuccess) { TaskResult(false, "Couldn't tag the project") } else { @@ -21,7 +21,7 @@ class Git @Inject constructor() { return result } - private fun tagRelease(project: Project, auto: Boolean, annotated: Boolean, tag: String, message: String) : Boolean { + private fun tagRelease(project: Project, annotated: Boolean, tag: String, message: String) : Boolean { val version = if (tag.isNullOrBlank()) project.version else tag val success = try { log(2, "Tagging this release as \"$version\"") diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt index a7d13dce..23519c43 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt @@ -47,7 +47,7 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener private fun autoGitTag(project: Project, uploadResult: TaskResult, config: AutoGitTagConfig?) : TaskResult { if (config != null) { with(config) { - return git.maybeTagRelease(project, uploadResult, auto, annotated, tag, message) + return git.maybeTagRelease(project, uploadResult, enabled, annotated, tag, message) } } else { return TaskResult() @@ -217,7 +217,7 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener data class AutoGitTagConfig(val project: Project) { @Directive - var auto: Boolean = true + var enabled: Boolean = true @Directive var annotated: Boolean = false