mirror of
https://github.com/ethauvin/kobalt.git
synced 2025-04-25 16:07:12 -07:00
Fixed vcs_tag.
Grab project description and url from pom, if not already specified.
This commit is contained in:
parent
e468d1cb4d
commit
62e1d55b53
1 changed files with 4 additions and 3 deletions
|
@ -62,7 +62,7 @@ class BintrayApi @Inject constructor(val http: Http,
|
||||||
@Path("publish") publish: Int,
|
@Path("publish") publish: Int,
|
||||||
@Body file: File): Call<BintrayResponse>
|
@Body file: File): Call<BintrayResponse>
|
||||||
|
|
||||||
class UpdateVersion(val desc: String?, val vcsTag: String?)
|
class UpdateVersion(val desc: String?, val vcs_tag: String?)
|
||||||
|
|
||||||
@PATCH("/packages/{owner}/maven/{repo}/versions/{version}")
|
@PATCH("/packages/{owner}/maven/{repo}/versions/{version}")
|
||||||
fun updateVersion(@Path("owner") owner: String,
|
fun updateVersion(@Path("owner") owner: String,
|
||||||
|
@ -112,9 +112,10 @@ class BintrayApi @Inject constructor(val http: Http,
|
||||||
private fun buildPackageInfo(project: Project): JsonObject {
|
private fun buildPackageInfo(project: Project): JsonObject {
|
||||||
val jsonObject = JsonObject()
|
val jsonObject = JsonObject()
|
||||||
jsonObject.addNonNull("name", project.name)
|
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("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()
|
val licenses = JsonArray()
|
||||||
project.pom?.licenses?.forEach {
|
project.pom?.licenses?.forEach {
|
||||||
licenses.add(it.name)
|
licenses.add(it.name)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue