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

Kotlin 1.1 and Kobalt 1.0.x optimization

Browse source
This commit is contained in:
Erik C. Thauvin 2017-03-06 14:27:18 -08:00
parent 05ec95cfac
commit 58c5f69792
5 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/Utils.kt
View file

@ -1,7 +1,7 @@
/*
* Utils.kt
*
* Copyright (c) 2016, Erik C. Thauvin (erik@thauvin.net)
* Copyright (c) 2016-2017, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -52,7 +52,7 @@ open class Utils {
// Log text if applicable
fun log(text: StringBuilder, flag: Boolean, level: Int = 1) {
if (flag && text.length > 0) {
if (flag && text.isNotEmpty()) {
log(level, text)
}
}

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

@ -1,7 +1,7 @@
/*
* VersionEyePlugin.kt
*
* Copyright (c) 2016, Erik C. Thauvin (erik@thauvin.net)
* Copyright (c) 2016-2017, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -278,10 +278,10 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor<VersionE
val onWhitelist = license.get("on_whitelist")
val onCwl = license.get("on_cwl")
if (!onWhitelist.isJsonNull) {
if (onWhitelist.asString.equals("false")) {
if (onWhitelist.asString == "false") {
if (onCwl.isJsonNull) {
whitelisted++
} else if (!onCwl.toString().equals("true")) {
} else if (onCwl.toString() != "true") {
whitelisted++
}
}
@ -314,7 +314,7 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor<VersionE
// Security vulnerabilities
val security = dep.get("security_vulnerabilities")
if (!security.isJsonNull) {
if (securityInfo.length > 0) {
if (securityInfo.isNotEmpty()) {
securityInfo.append(lf)
}
val count = security.asJsonArray.size()
@ -370,7 +370,7 @@ enum class Fail {
}
@Directive
class VersionEyeConfig() {
class VersionEyeConfig {
var baseUrl = "https://www.versioneye.com/"
var colors = true
val failSet: MutableSet<Fail> = mutableSetOf(Fail.securityCheck)
@ -381,6 +381,7 @@ class VersionEyeConfig() {
var verbose = true
var visibility = "public"
@Suppress("unused")
fun failOn(vararg args: Fail) {
if (failSet.isNotEmpty()) {
failSet.clear()
@ -389,6 +390,7 @@ class VersionEyeConfig() {
}
}
@Suppress("unused")
@Directive
fun Project.versionEye(init: VersionEyeConfig.() -> Unit) {
VersionEyeConfig().let { config ->