From 58c5f69792077fba5c4205fd7662437f4b6d5919 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 6 Mar 2017 14:27:18 -0800
Subject: [PATCH] Kotlin 1.1 and Kobalt 1.0.x optimization

---
 README.md                                            |  4 +++-
 example/kobalt/src/Build.kt                          |  7 +++----
 kobalt/src/Build.kt                                  |  4 ----
 .../thauvin/erik/kobalt/plugin/versioneye/Utils.kt   |  4 ++--
 .../kobalt/plugin/versioneye/VersionEyePlugin.kt     | 12 +++++++-----
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 84a9476..fddb4f6 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,9 @@ To use the plug-in include the following in `Build.kt` file:
 ```kotlin
 import net.thauvin.erik.kobalt.plugin.versioneye.*
 
-val pl = plugins("net.thauvin.erik:kobalt-versioneye:")
+val bs = buildScript {
+    plugins("net.thauvin.erik:kobalt-versioneye:")
+}
 
 val p = project {
     name = "example"
diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt
index 0f8f7e6..52cb9af 100644
--- a/example/kobalt/src/Build.kt
+++ b/example/kobalt/src/Build.kt
@@ -4,10 +4,9 @@ import com.beust.kobalt.plugin.application.*
 import com.beust.kobalt.plugin.kotlin.*
 import net.thauvin.erik.kobalt.plugin.versioneye.*
 
-val repos = repos()
-
-//val pl = plugins(file("../kobaltBuild/libs/kobalt-versioneye-0.4.3-beta.jar"))
-val pl = plugins("net.thauvin.erik:kobalt-versioneye:0.4.3-beta")
+val bs = buildScript {
+    plugins("net.thauvin.erik:kobalt-versioneye:0.4.3-beta")
+}
 
 val p = project {
 
diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index 66f39fa..eb9663c 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -1,15 +1,11 @@
 import com.beust.kobalt.plugin.packaging.assemble
 import com.beust.kobalt.plugin.publish.bintray
 import com.beust.kobalt.project
-import com.beust.kobalt.repos
 import org.apache.maven.model.Developer
 import org.apache.maven.model.License
 import org.apache.maven.model.Model
 import org.apache.maven.model.Scm
 
-val repos = repos()
-
-
 val p = project {
 
     name = "kobalt-versioneye"
diff --git a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/Utils.kt b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/Utils.kt
index b5b15f1..57a38fa 100644
--- a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/Utils.kt
@@ -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)
             }
         }
diff --git a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt
index da47178..4188480 100644
--- a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt
+++ b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt
@@ -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 ->