From 21cf5efe8e368635ce07f8a2a50acfd89933284e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 18 Apr 2017 17:50:31 -0700
Subject: [PATCH] Kobalt 1.0.69 update.

---
 .idea/kobalt.xml                              |   2 +-
 .idea/misc.xml                                |   2 +-
 .idea/modules.xml                             |   1 -
 example/example.iml                           |  16 --
 example/kobalt/src/Build.kt                   |   1 +
 .../kobalt/wrapper/kobalt-wrapper.properties  |   2 +-
 kobalt-maven-local.iml                        | 236 +++++++++++++++++-
 kobalt/Build.kt.iml                           |   1 +
 kobalt/src/Build.kt                           |  39 +--
 kobalt/wrapper/kobalt-wrapper.properties      |   2 +-
 10 files changed, 235 insertions(+), 67 deletions(-)
 delete mode 100644 example/example.iml

diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml
index a9df893..07b6593 100644
--- a/.idea/kobalt.xml
+++ b/.idea/kobalt.xml
@@ -5,7 +5,7 @@
       <KobaltProjectSettings>
         <option name="autoDownloadKobalt" value="true" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.30" />
+        <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.69" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f738a13..8318a84 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="1.8.x" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8.x" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/kobaltBuild/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 10b9e60..5b5cc73 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/kobalt/Build.kt.iml" filepath="$PROJECT_DIR$/kobalt/Build.kt.iml" />
-      <module fileurl="file://$PROJECT_DIR$/example/example.iml" filepath="$PROJECT_DIR$/example/example.iml" />
       <module fileurl="file://$PROJECT_DIR$/kobalt-maven-local.iml" filepath="$PROJECT_DIR$/kobalt-maven-local.iml" />
     </modules>
   </component>
diff --git a/example/example.iml b/example/example.iml
deleted file mode 100644
index 6ca0d8f..0000000
--- a/example/example.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="example" external.linked.project.path="$MODULE_DIR$/.." external.root.project.path="$MODULE_DIR$/.." external.system.id="KOBALT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../kobaltBuild/classes" />
-    <output-test url="file://$MODULE_DIR$/../kobaltBuild/test-classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/kobaltBuild" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kobalt-maven-local" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt
index f26eccc..741195e 100644
--- a/example/kobalt/src/Build.kt
+++ b/example/kobalt/src/Build.kt
@@ -6,6 +6,7 @@ import com.beust.kobalt.plugin.java.*
 // ./kobaltw run --log 2
 
 val bs = buildScript {
+    //plugins(file("../libs/kobalt-maven-local-0.5.2.jar"))
     plugins("net.thauvin.erik:kobalt-maven-local:")
     repos(localMaven())
 }
diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties
index 11e416c..5430a86 100644
--- a/example/kobalt/wrapper/kobalt-wrapper.properties
+++ b/example/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=1.0.60
\ No newline at end of file
+kobalt.version=1.0.69
\ No newline at end of file
diff --git a/kobalt-maven-local.iml b/kobalt-maven-local.iml
index be24ab1..2e06f5a 100644
--- a/kobalt-maven-local.iml
+++ b/kobalt-maven-local.iml
@@ -372,15 +372,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Kobalt: com.beust:jcommander:jar:1.48">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/cache/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="Kobalt: com.squareup.retrofit2:converter-gson:jar:2.1.0">
         <CLASSES>
@@ -465,7 +456,232 @@
     <orderEntry type="module-library">
       <library name="Kobalt: com.beust:kobalt-plugin-api:jar:(0,]">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/cache/com/beust/kobalt-plugin-api/1.0.8/kobalt-plugin-api-1.0.8.jar!/" />
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/beust/kobalt-plugin-api/1.0.68/kobalt-plugin-api-1.0.68.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.jetbrains.kotlin:kotlin-stdlib:jar:1.1.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/jetbrains/kotlin/kotlin-stdlib/1.1.1/kotlin-stdlib-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.testng.testng-remote:testng-remote:jar:1.3.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/testng/testng-remote/testng-remote/1.3.2/testng-remote-1.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: commons-io:commons-io:jar:2.5">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/commons-io/commons-io/2.5/commons-io-2.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.platform:junit-platform-surefire-provider:jar:1.0.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/platform/junit-platform-surefire-provider/1.0.0-M4/junit-platform-surefire-provider-1.0.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.platform:junit-platform-runner:jar:1.0.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/platform/junit-platform-runner/1.0.0-M4/junit-platform-runner-1.0.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.platform:junit-platform-console:jar:1.0.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/platform/junit-platform-console/1.0.0-M4/junit-platform-console-1.0.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.jupiter:junit-jupiter-engine:jar:5.0.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/jupiter/junit-jupiter-engine/5.0.0-M4/junit-jupiter-engine-5.0.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.vintage:junit-vintage-engine:jar:4.12.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/vintage/junit-vintage-engine/4.12.0-M4/junit-vintage-engine-4.12.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.commons:commons-compress:jar:1.13">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/commons/commons-compress/1.13/commons-compress-1.13.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.jetbrains:annotations:jar:13.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.auto.service:auto-service:jar:1.0-rc3">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/auto/service/auto-service/1.0-rc3/auto-service-1.0-rc3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.testng:testng:jar:6.11">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/testng/testng/6.11/testng-6.11.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.platform:junit-platform-launcher:jar:1.0.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/platform/junit-platform-launcher/1.0.0-M4/junit-platform-launcher-1.0.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven.surefire:surefire-api:jar:2.19.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/surefire/surefire-api/2.19.1/surefire-api-2.19.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven.surefire:common-java5:jar:2.19.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/surefire/common-java5/2.19.1/common-java5-2.19.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.platform:junit-platform-suite-api:jar:1.0.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/platform/junit-platform-suite-api/1.0.0-M4/junit-platform-suite-api-1.0.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: junit:junit:jar:4.12">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/junit/junit/4.12/junit-4.12.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.jupiter:junit-jupiter-api:jar:5.0.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/jupiter/junit-jupiter-api/5.0.0-M4/junit-jupiter-api-5.0.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.auto:auto-common:jar:0.3">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/auto/auto-common/0.3/auto-common-0.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.beust:jcommander:jar:1.64">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/beust/jcommander/1.64/jcommander-1.64.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.yaml:snakeyaml:jar:1.17">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/yaml/snakeyaml/1.17/snakeyaml-1.17.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.platform:junit-platform-engine:jar:1.0.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/platform/junit-platform-engine/1.0.0-M4/junit-platform-engine-1.0.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.hamcrest:hamcrest-core:jar:1.3">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.junit.platform:junit-platform-commons:jar:1.0.0-M4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/junit/platform/junit-platform-commons/1.0.0-M4/junit-platform-commons-1.0.0-M4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.opentest4j:opentest4j:jar:1.0.0-M2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/opentest4j/opentest4j/1.0.0-M2/opentest4j-1.0.0-M2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml
index a1b0982..b7fe907 100644
--- a/kobalt/Build.kt.iml
+++ b/kobalt/Build.kt.iml
@@ -36,5 +36,6 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index d132b36..2af62e6 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -1,25 +1,12 @@
 import com.beust.kobalt.*
-import com.beust.kobalt.misc.*
 import com.beust.kobalt.plugin.application.*
 import com.beust.kobalt.plugin.packaging.*
 import com.beust.kobalt.plugin.publish.*
 import net.thauvin.erik.kobalt.plugin.versioneye.*
 import org.apache.maven.model.*
-import java.io.*
-
-val semver = "0.5.2"
 
 val bs = buildScript {
-    val p = with(File("kobaltBuild/libs/kobalt-maven-local-$semver.jar")) {
-        if (exists()) {
-            kobaltLog(1, "  >>> Using: $path")
-            file(path)
-        } else {
-            "net.thauvin.erik:kobalt-maven-local:"
-        }
-    }
-    plugins("net.thauvin.erik:kobalt-versioneye:", p)
-    repos(localMaven())
+    plugins("net.thauvin.erik:kobalt-versioneye:")
 }
 
 val dev by profile()
@@ -29,7 +16,7 @@ val p = project {
     name = "kobalt-maven-local"
     group = "net.thauvin.erik"
     artifactId = name
-    version = semver
+    version = "0.5.2"
 
     pom = Model().apply {
         description = "Maven Local Repository plug-in for the Kobalt build system."
@@ -51,8 +38,8 @@ val p = project {
     }
 
     dependencies {
-        compile("com.beust:$kobaltDependency:")
         compile("org.apache.maven:maven-settings-builder:3.3.9")
+        compile("com.beust:$kobaltDependency:")
     }
 
     dependenciesTest {
@@ -83,24 +70,4 @@ val p = project {
         org = "thauvin"
         team = "Owners"
     }
-}
-
-val example = project(p) {
-
-    println("  >>> LOCAL MAVEN REPO: " + localMaven().removePrefix("file:/"))
-
-    name = "example"
-    group = "com.example"
-    artifactId = name
-    version = "0.1"
-    directory = "example"
-
-    assemble {
-        jar {
-        }
-    }
-
-    application {
-        mainClass = "com.example.Main"
-    }
 }
\ No newline at end of file
diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties
index c912f2c..5430a86 100644
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=1.0.66
\ No newline at end of file
+kobalt.version=1.0.69
\ No newline at end of file