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

Refactored duplicate code.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-03-16 19:22:28 -07:00
parent c80020c36a
commit 49538338a4
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,6 +44,16 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener
return TaskResult() return TaskResult()
} }
private fun autoGitTag(project: Project, uploadResult: TaskResult, config: AutoGitTagConfig?) : TaskResult {
if (config != null) {
with(config) {
return git.maybeTagRelease(project, uploadResult, auto, tag, message)
}
} else {
return TaskResult()
}
}
private fun validateProject(project: Project) { private fun validateProject(project: Project) {
requireNotNull(project.name, { "Project $project should have a name" }) requireNotNull(project.name, { "Project $project should have a name" })
requireNotNull(project.version, { "Project $project should have a version" }) requireNotNull(project.version, { "Project $project should have a version" })
@ -112,7 +122,6 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener
val jcenter = bintrayFactory.create(user, password, org) val jcenter = bintrayFactory.create(user, password, org)
var success = false var success = false
val configuration = bintrayConfigurations[project.name] val configuration = bintrayConfigurations[project.name]
val autoGitTagConfig = autoGitTagConfigurations[project.name]
val messages = arrayListOf<String>() val messages = arrayListOf<String>()
val tmpResult = val tmpResult =
@ -134,13 +143,11 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener
messages.add(taskResult.errorMessage!!) messages.add(taskResult.errorMessage!!)
} }
} }
if (autoGitTagConfig != null) {
with(autoGitTagConfig) { //
git.maybeTagRelease(project, TaskResult(), auto, tag, message) // Tag release, if applicable
} //
} else { autoGitTag(project, TaskResult(), autoGitTagConfigurations[project.name])
TaskResult()
}
} else { } else {
context.logger.log(project.name, 2, "Couldn't find any jcenter{} configuration, not uploading anything") context.logger.log(project.name, 2, "Couldn't find any jcenter{} configuration, not uploading anything")
TaskResult() TaskResult()
@ -160,7 +167,6 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener
private fun uploadGithub(project: Project) : TaskResult { private fun uploadGithub(project: Project) : TaskResult {
val configuration = githubConfigurations[project.name] val configuration = githubConfigurations[project.name]
val autoGitTagConfig = autoGitTagConfigurations[project.name]
// //
// Upload individual files, if applicable // Upload individual files, if applicable
@ -171,13 +177,11 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener
logk(project.name, 2, "Uploading $it tag: ${project.version}") logk(project.name, 2, "Uploading $it tag: ${project.version}")
github.uploadRelease(project.name, project.version!!, it) github.uploadRelease(project.name, project.version!!, it)
} }
if (autoGitTagConfig != null) {
with(autoGitTagConfig) { //
git.maybeTagRelease(project, TaskResult(), auto, tag, message) // Tag release, if applicable
} //
} else { autoGitTag(project, TaskResult(), autoGitTagConfigurations[project.name])
TaskResult()
}
} else { } else {
warn("Couldn't find any github{} configuration, not uploading anything") warn("Couldn't find any github{} configuration, not uploading anything")
TaskResult() TaskResult()
@ -238,7 +242,7 @@ fun Project.github(init: GithubConfig.() -> Unit): GithubConfig =
(Kobalt.findPlugin(PublishPlugin.PLUGIN_NAME) as PublishPlugin).addGithubConfiguration(name, config) (Kobalt.findPlugin(PublishPlugin.PLUGIN_NAME) as PublishPlugin).addGithubConfiguration(name, config)
} }
data class BintrayConfig(val project: Project) { data class BintrayConfig(val project: Project) {
val files = arrayListOf<Pair<String, String>>() val files = arrayListOf<Pair<String, String>>()
/** /**