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

Added Bintray's package name and issue tracker URL.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-05-05 08:45:21 -07:00
parent 62e1d55b53
commit 706f27de40
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/kotlin/com/beust/kobalt/plugin/publish/BintrayApi.kt
View file

@ -96,12 +96,13 @@ class BintrayApi @Inject constructor(val http: Http,
.create(Api::class.java) .create(Api::class.java)
} }
fun validatePackage(project: Project) { fun validatePackage(project: Project, config: BintrayConfig) {
val execute = service.getPackage(org ?: username!!, project.name).execute() val pkgName = config.name ?: project.name
val execute = service.getPackage(org ?: username!!, pkgName).execute()
if (execute.errorBody()?.string()?.contains("'${project.name}' was not found") ?: false) { if (execute.errorBody()?.string()?.contains("'$pkgName' was not found") ?: false) {
warn("Package does not exist on bintray. Creating now.") warn("Package does not exist on bintray. Creating now.")
val result = service.createPackage(org ?: username!!, buildPackageInfo(project)) val result = service.createPackage(org ?: username!!, buildPackageInfo(project, config))
.execute() .execute()
if (result.errorBody() != null) { if (result.errorBody() != null) {
throw KobaltException("Error while creating package:\n" + result.errorBody().string()) throw KobaltException("Error while creating package:\n" + result.errorBody().string())
@ -109,13 +110,14 @@ class BintrayApi @Inject constructor(val http: Http,
} }
} }
private fun buildPackageInfo(project: Project): JsonObject { private fun buildPackageInfo(project: Project, config: BintrayConfig): JsonObject {
val jsonObject = JsonObject() val jsonObject = JsonObject()
jsonObject.addNonNull("name", project.name) jsonObject.addNonNull("name", config.name ?: project.name)
jsonObject.addNonNull("desc", jsonObject.addNonNull("desc",
if (project.description.isNotBlank()) project.description else project.pom?.description) if (project.description.isNotBlank()) project.description else project.pom?.description)
jsonObject.addNonNull("vcs_url", project.pom?.scm?.url) jsonObject.addNonNull("vcs_url", project.pom?.scm?.url)
jsonObject.addNonNull("website_url", if (! project.url.isNullOrBlank()) project.url else project.pom?.url) jsonObject.addNonNull("website_url", project.url ?: project.pom?.url)
jsonObject.addNonNull("issue_tracker_url", config.issueTrackerUrl)
val licenses = JsonArray() val licenses = JsonArray()
project.pom?.licenses?.forEach { project.pom?.licenses?.forEach {
licenses.add(it.name) licenses.add(it.name)
@ -125,7 +127,7 @@ class BintrayApi @Inject constructor(val http: Http,
} }
fun uploadMaven(project: Project, files: List<File>, config: BintrayConfig): TaskResult { fun uploadMaven(project: Project, files: List<File>, config: BintrayConfig): TaskResult {
validatePackage(project) validatePackage(project, config)
return upload(project, files, config, generateMd5 = true) return upload(project, files, config, generateMd5 = true)
} }

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

@ -268,9 +268,18 @@ data class BintrayConfig(val project: Project) {
files.add(Pair(filePath, url)) files.add(Pair(filePath, url))
} }
/**
* The package name on Bintray which is not always the project name.
*/
@Directive
var name: String? = null
@Directive @Directive
var description: String? = null var description: String? = null
@Directive
var issueTrackerUrl: String? = null
@Directive @Directive
var vcsTag: String? = null var vcsTag: String? = null
} }