erik/kobalt-versioneye
erik/kobalt-versioneye
1
0
Fork 0
Code Issues Pull requests Releases Activity

Removed redundant semicolons

Browse source
This commit is contained in:
Erik C. Thauvin 2016-07-27 16:14:36 -07:00
parent 27f1f3e9cc
commit e998c88c4f
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.idea/vcs.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

26
src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt
View file

@ -77,16 +77,15 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor<VersionE
@Task(name = "versionEye", description = "Update and check dependencies on VersionEye") @Task(name = "versionEye", description = "Update and check dependencies on VersionEye")
fun versionEye(project: Project): TaskResult { fun versionEye(project: Project): TaskResult {
if (debug) { if (debug) {
System.setProperty("http.proxyHost", "127.0.0.1") System.setProperty("http.proxyHost", "127.0.0.1")
System.setProperty("https.proxyHost", "127.0.0.1") System.setProperty("https.proxyHost", "127.0.0.1")
System.setProperty("http.proxyPort", "8888"); System.setProperty("http.proxyPort", "8888")
System.setProperty("https.proxyPort", "8888") System.setProperty("https.proxyPort", "8888")
} }
val local = project.directory + "/local.properties" val local = project.directory + "/local.properties"
configurationFor(project)?.let { config -> configurationFor(project)?.let { config ->
if (config.baseUrl.isBlank()) { if (config.baseUrl.isBlank()) {
warn("Please specify a valid VersionEye base URL.") warn("Please specify a valid VersionEye base URL.")
@ -130,7 +129,7 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor<VersionE
private fun versionEyeUpdate(name: String, config: VersionEyeConfig, p: Properties): TaskResult { private fun versionEyeUpdate(name: String, config: VersionEyeConfig, p: Properties): TaskResult {
val projectId = p.getProperty(PROJECT_ID_PROPERTY) val projectId = p.getProperty(PROJECT_ID_PROPERTY)
val apiKey = p.getProperty(API_KEY_PROPERTY); val apiKey = p.getProperty(API_KEY_PROPERTY)
val endPoint = if (projectId.isNullOrBlank()) { val endPoint = if (projectId.isNullOrBlank()) {
"api/v2/projects" "api/v2/projects"
} else { } else {
@ -151,8 +150,9 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor<VersionE
requestBody.addFormDataPart("team_name", config.team) requestBody.addFormDataPart("team_name", config.team)
} }
// @TODO remove if (debug) {
requestBody.addFormDataPart("temp", "true") requestBody.addFormDataPart("temp", "true")
}
val url = HttpUrl.parse(config.baseUrl).newBuilder() val url = HttpUrl.parse(config.baseUrl).newBuilder()
.addPathSegments(endPoint) .addPathSegments(endPoint)
@ -179,13 +179,13 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor<VersionE
@Directive @Directive
class VersionEyeConfig() { class VersionEyeConfig() {
var baseUrl = "https://www.versioneye.com/" var baseUrl = "https://www.versioneye.com/"
var failOnUnknownLicense = false; var failOnUnknownLicense = false
var licenseCheck = false; var licenseCheck = false
var name = ""; var name = ""
var organisation = ""; var organisation = ""
var securityCheck = false; var securityCheck = false
var team = ""; var team = ""
var visibility = true; var visibility = true
} }
@Directive @Directive