From fc4c481d3a5175405d4f75baa804893fafce1999 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 13 Mar 2017 23:28:58 -0700
Subject: [PATCH] Updated Kobalt

---
 .gitignore                               |  4 +-
 gson-test.iml                            | 31 +++------------
 gson-test.ipr                            | 48 +++++++++---------------
 kobalt/Build.kt.iml                      | 14 ++++++-
 kobalt/src/Build.kt                      |  3 --
 kobalt/wrapper/kobalt-wrapper.properties |  2 +-
 6 files changed, 38 insertions(+), 64 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c926e9..8bd4be6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,8 @@
 **/.idea/tasks.xml
 **/.idea/workspace.xml
 *.iws
-.DS_Store
 .classpath
+.DS_Store
 .gradle
 .kobalt
 .nb-gradle
@@ -23,8 +23,8 @@
 /project.properties
 /target
 /test-output
-Thumbs.db
 ehthumbs.db
 kobaltBuild
 lib
 libs
+Thumbs.db
diff --git a/gson-test.iml b/gson-test.iml
index 69a5a30..87b87a4 100644
--- a/gson-test.iml
+++ b/gson-test.iml
@@ -11,15 +11,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="Kobalt: org.apache.ant:ant-launcher:jar:1.7.0">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="Kobalt: com.google.code.gson:gson:jar:2.7">
         <CLASSES>
@@ -30,41 +21,31 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" scope="TEST">
-      <library name="Kobalt: org.testng:testng:jar:6.9.12">
+      <library name="Kobalt: org.testng:testng:jar:(0,]">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/cache/org/testng/testng/6.9.12/testng-6.9.12.jar!/" />
+          <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" scope="TEST">
-      <library name="Kobalt: org.beanshell:bsh:jar:2.0b4">
+      <library name="Kobalt: com.beust:jcommander:jar:1.64">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/cache/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
+          <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" scope="TEST">
-      <library name="Kobalt: com.beust:jcommander:jar:1.48">
+      <library name="Kobalt: org.yaml:snakeyaml:jar:1.17">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/cache/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
+          <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" scope="TEST">
-      <library name="Kobalt: org.apache.ant:ant:jar:1.7.0">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/gson-test.ipr b/gson-test.ipr
index ce9f827..2ff1ea1 100644
--- a/gson-test.ipr
+++ b/gson-test.ipr
@@ -38,33 +38,10 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
   <component name="CopyrightManager" default="" />
   <component name="Encoding">
     <file url="PROJECT" charset="UTF-8" />
   </component>
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
       <map>
@@ -142,8 +119,6 @@
         <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
       </inspection_tool>
     </profile>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
     <version value="1.0" />
   </component>
   <component name="KobaltSettings">
@@ -151,7 +126,7 @@
       <KobaltProjectSettings>
         <option name="autoDownloadKobalt" value="true" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.898" />
+        <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -160,6 +135,10 @@
       </KobaltProjectSettings>
     </option>
   </component>
+  <component name="KotlinCommonCompilerArguments">
+    <option name="languageVersion" value="1.0" />
+    <option name="apiVersion" value="1.0" />
+  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
@@ -203,7 +182,7 @@
       <module fileurl="file://$PROJECT_DIR$/gson-test.iml" filepath="$PROJECT_DIR$/gson-test.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.8.x" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="1.8.x" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/kobaltBuild/classes" />
   </component>
   <component name="PropertiesComponent">
@@ -303,16 +282,23 @@
       <method />
     </configuration>
   </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
   <component name="libraryTable">
     <library name="kobalt.jar">
       <CLASSES>
-        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.898/kobalt/wrapper/kobalt-0.898.jar!/" />
+        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.905/kobalt/wrapper/kobalt-0.905.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
-        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.896/kobalt/wrapper/kobalt-0.896.jar!/" />
-        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.897/kobalt/wrapper/kobalt-0.897.jar!/" />
-        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.898/kobalt/wrapper/kobalt-0.898.jar!/" />
+        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.905/kobalt/wrapper/kobalt-0.905.jar!/" />
+        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.905/kobalt/wrapper/kobalt-0.905.jar!/" />
+        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.905/kobalt/wrapper/kobalt-0.905.jar!/" />
+        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.905/kobalt/wrapper/kobalt-0.905.jar!/" />
+        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.905/kobalt/wrapper/kobalt-0.905.jar!/" />
+        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.905/kobalt/wrapper/kobalt-0.905.jar!/" />
+        <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.905/kobalt/wrapper/kobalt-0.905.jar!/" />
       </SOURCES>
     </library>
     <library name="KotlinJavaRuntime">
diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml
index ee86435..eea1956 100644
--- a/kobalt/Build.kt.iml
+++ b/kobalt/Build.kt.iml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
+<module external.linked.project.id="Build.kt" 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" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kobalt.jar" level="project" />
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.11">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.11/kobalt/wrapper/kobalt-1.0.11.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index 81b6565..0214971 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -3,9 +3,6 @@ import com.beust.kobalt.plugin.packaging.*
 import com.beust.kobalt.plugin.application.*
 import com.beust.kobalt.plugin.kotlin.*
 
-val repos = repos()
-
-
 val p = project {
 
     name = "gson-test"
diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties
index 6369460..58935ba 100644
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=0.899
\ No newline at end of file
+kobalt.version=1.0.11
\ No newline at end of file