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

Cleanup.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-05-05 10:33:21 -07:00
parent 706f27de40
commit f43c186da1
1 changed files with 10 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

@ -15,6 +15,7 @@ import com.google.gson.Gson
import com.google.gson.JsonArray
import com.google.gson.JsonObject
import com.google.gson.TypeAdapter
import com.google.gson.annotations.SerializedName
import com.google.gson.reflect.TypeToken
import com.google.inject.assistedinject.Assisted
import okhttp3.*
@ -62,7 +63,7 @@ class BintrayApi @Inject constructor(val http: Http,
@Path("publish") publish: Int,
@Body file: File): Call<BintrayResponse>
class UpdateVersion(val desc: String?, val vcs_tag: String?)
class UpdateVersion(val desc: String?, @SerializedName("vcs_tag") val vcsTag: String?)
@PATCH("/packages/{owner}/maven/{repo}/versions/{version}")
fun updateVersion(@Path("owner") owner: String,
@ -111,13 +112,14 @@ class BintrayApi @Inject constructor(val http: Http,
}
private fun buildPackageInfo(project: Project, config: BintrayConfig): JsonObject {
val jsonObject = JsonObject()
jsonObject.addNonNull("name", config.name ?: project.name)
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 ?: project.pom?.url)
jsonObject.addNonNull("issue_tracker_url", config.issueTrackerUrl)
val jsonObject = JsonObject().apply {
addNonNull("name", config.name ?: project.name)
addNonNull("desc",
if (project.description.isNotBlank()) project.description else project.pom?.description)
addNonNull("vcs_url", project.pom?.scm?.url)
addNonNull("website_url", project.url ?: project.pom?.url)
addNonNull("issue_tracker_url", config.issueTrackerUrl)
}
val licenses = JsonArray()
project.pom?.licenses?.forEach {
licenses.add(it.name)