From 9031ebe5eba6117d10d27b2d0f1901c0d92e9183 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 6 Nov 2017 12:43:28 -0800
Subject: [PATCH] Kobalt dependencies updates.

---
 .idea/kobalt.xml                         |  2 +-
 .idea/kotlinc.xml                        |  7 +++++++
 .idea/modules/example-kotlin.iml         |  1 +
 .idea/modules/example-kotlin_main.iml    | 16 +++++++--------
 .idea/modules/example-kotlin_test.iml    | 14 ++++++-------
 kobalt/Build.kt.iml                      |  6 +++---
 kobalt/src/Build.kt                      | 25 +++++++++++++++---------
 kobalt/wrapper/kobalt-wrapper.properties |  2 +-
 8 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml
index d83e315..7f1760d 100644
--- a/.idea/kobalt.xml
+++ b/.idea/kobalt.xml
@@ -6,7 +6,7 @@
         <option name="autoDownloadKobalt" value="true" />
         <option name="downloadSources" value="false" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83" />
+        <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.90" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..5806fb3
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMapEmbedSources" />
+    <option name="sourceMapPrefix" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules/example-kotlin.iml b/.idea/modules/example-kotlin.iml
index 0c42eb0..0628f62 100644
--- a/.idea/modules/example-kotlin.iml
+++ b/.idea/modules/example-kotlin.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$/../..">
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/modules/example-kotlin_main.iml b/.idea/modules/example-kotlin_main.iml
index 6807d7c..3975b75 100644
--- a/.idea/modules/example-kotlin_main.iml
+++ b/.idea/modules/example-kotlin_main.iml
@@ -5,27 +5,27 @@
       <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
+          <option name="destination" value="$MODULE_DIR$/../../build/kotlin-classes/main" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
-          <option name="moduleName" value="example-kotlin_main" />
-          <option name="jvmTarget" value="1.6" />
+          <option name="moduleName" value="example-kotlin" />
           <option name="addCompilerBuiltIns" value="true" />
           <option name="loadBuiltInsFromDependencies" value="true" />
           <option name="languageVersion" value="1.1" />
           <option name="apiVersion" value="1.1" />
+          <option name="pluginOptions">
+            <array />
+          </option>
           <option name="pluginClasspaths">
             <array />
           </option>
           <option name="coroutinesWarn" value="true" />
-          <option name="pluginOptions">
-            <array />
-          </option>
         </compilerArguments>
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <output url="file://$MODULE_DIR$/../../out/production/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
@@ -34,9 +34,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:0.9.7" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.51" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/example-kotlin_test.iml b/.idea/modules/example-kotlin_test.iml
index b358c0d..3d56d48 100644
--- a/.idea/modules/example-kotlin_test.iml
+++ b/.idea/modules/example-kotlin_test.iml
@@ -5,27 +5,27 @@
       <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
+          <option name="destination" value="$MODULE_DIR$/../../build/kotlin-classes/test" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
-          <option name="moduleName" value="example-kotlin_main" />
-          <option name="jvmTarget" value="1.6" />
+          <option name="moduleName" value="example-kotlin" />
           <option name="addCompilerBuiltIns" value="true" />
           <option name="loadBuiltInsFromDependencies" value="true" />
           <option name="languageVersion" value="1.1" />
           <option name="apiVersion" value="1.1" />
+          <option name="pluginOptions">
+            <array />
+          </option>
           <option name="pluginClasspaths">
             <array />
           </option>
           <option name="coroutinesWarn" value="true" />
-          <option name="pluginOptions">
-            <array />
-          </option>
         </compilerArguments>
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
@@ -35,7 +35,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="example-kotlin_main" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.51" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="example-kotlin_main" />
diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml
index 7cf6bc1..c700f28 100644
--- a/kobalt/Build.kt.iml
+++ b/kobalt/Build.kt.iml
@@ -10,13 +10,13 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
-      <library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.83">
+      <library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.90">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83/kobalt/wrapper/kobalt-1.0.83.jar!/" />
+          <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.90/kobalt/wrapper/kobalt-1.0.90.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83/kobalt/wrapper/kobalt-1.0.83-sources.jar!/" />
+          <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.90/kobalt/wrapper/kobalt-1.0.90-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index 9ad09b6..a241cd6 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -1,8 +1,12 @@
-import com.beust.kobalt.*
-import com.beust.kobalt.plugin.apt.*
-import com.beust.kobalt.plugin.packaging.*
-import com.beust.kobalt.plugin.application.*
-import com.beust.kobalt.plugin.kotlin.*
+
+import com.beust.kobalt.buildScript
+import com.beust.kobalt.localMaven
+import com.beust.kobalt.plugin.application.application
+import com.beust.kobalt.plugin.apt.apt
+import com.beust.kobalt.plugin.apt.kapt
+import com.beust.kobalt.plugin.java.javaCompiler
+import com.beust.kobalt.plugin.packaging.assemble
+import com.beust.kobalt.project
 
 // ./kobaltw run runJava
 
@@ -10,8 +14,8 @@ val bs = buildScript {
     repos(localMaven())
 }
 
-val kotlin_version = "1.1.2"
-val processorJar = "net.thauvin.erik:semver:1.0.0"
+val kotlin_version = "1.1.51"
+val processorJar = "net.thauvin.erik:semver:1.0.1"
 
 // ./kobalt run runJava
 
@@ -29,14 +33,17 @@ val p = project {
     dependencies {
         apt(processorJar)
         compileOnly(processorJar)
-        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version",
-                "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version")
+        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
     }
 
     dependenciesTest {
         // compile("org.testng:testng:6.11")
     }
 
+    javaCompiler {
+        args("-source", "1.8", "-target", "1.8")
+    }
+
     assemble {
         jar {
         }
diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties
index cdcb2d1..21b1f73 100644
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=1.0.86
\ No newline at end of file
+kobalt.version=1.0.90
\ No newline at end of file