From 62e1d55b5321afbba8f476e14f8cf2b2c47bfcc7 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 4 May 2017 16:20:37 -0700 Subject: [PATCH] Fixed vcs_tag. Grab project description and url from pom, if not already specified. --- .../kotlin/com/beust/kobalt/plugin/publish/BintrayApi.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/BintrayApi.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/BintrayApi.kt index 878d0e1c..70d22fdc 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/publish/BintrayApi.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/BintrayApi.kt @@ -62,7 +62,7 @@ class BintrayApi @Inject constructor(val http: Http, @Path("publish") publish: Int, @Body file: File): Call - class UpdateVersion(val desc: String?, val vcsTag: String?) + class UpdateVersion(val desc: String?, val vcs_tag: String?) @PATCH("/packages/{owner}/maven/{repo}/versions/{version}") fun updateVersion(@Path("owner") owner: String, @@ -112,9 +112,10 @@ class BintrayApi @Inject constructor(val http: Http, private fun buildPackageInfo(project: Project): JsonObject { val jsonObject = JsonObject() jsonObject.addNonNull("name", project.name) - jsonObject.addNonNull("desc", project.description) + jsonObject.addNonNull("desc", + if (project.description.isNotBlank()) project.description else project.pom?.description) jsonObject.addNonNull("vcs_url", project.pom?.scm?.url) - jsonObject.addNonNull("website_url", project.url) + jsonObject.addNonNull("website_url", if (! project.url.isNullOrBlank()) project.url else project.pom?.url) val licenses = JsonArray() project.pom?.licenses?.forEach { licenses.add(it.name)