erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 00:17:11 -07:00
Code Releases Activity

Renamed auto paramter to enabled for autoGitTag directive.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-03-18 11:32:14 -07:00
parent 4e432e2e77
commit 17bd4a0cec
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Git.kt
View file

@ -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\"")

4
src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
View file

@ -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