From 7b500cc8fcd7e8b302fabbbfab4f8061e8c5a5ba Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 29 Oct 2017 23:35:09 -0700
Subject: [PATCH] Kobalt 1.0.90, Mustache 0.9.4, TestNG 6.12 updates.

---
 .idea/kobalt.xml                         |  2 +-
 .idea/modules/semver_main.iml            |  6 +--
 .idea/modules/semver_test.iml            | 16 +++++---
 build.gradle                             |  5 ++-
 kobalt/Build.kt.iml                      |  6 +--
 kobalt/src/Build.kt                      |  5 ++-
 kobalt/wrapper/kobalt-wrapper.properties |  2 +-
 semver.iml                               | 47 ++----------------------
 8 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml
index b117217..48b9f80 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.87" />
+        <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/modules/semver_main.iml b/.idea/modules/semver_main.iml
index 50f8503..30a0095 100644
--- a/.idea/modules/semver_main.iml
+++ b/.idea/modules/semver_main.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="semver:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="semver:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="net.thauvin.erik" external.system.module.type="sourceSet" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
   <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" />
@@ -9,6 +9,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.5" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/semver_test.iml b/.idea/modules/semver_test.iml
index 80f49fd..417d8d1 100644
--- a/.idea/modules/semver_test.iml
+++ b/.idea/modules/semver_test.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="semver:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="semver:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="net.thauvin.erik" external.system.module.type="sourceSet" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
   <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" />
@@ -10,10 +10,16 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="semver_main" />
-    <orderEntry type="library" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.testng:testng:6.11" level="project" />
-    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.64" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.5" level="project" />
+    <orderEntry type="library" name="Gradle: org.testng:testng:6.12" level="project" />
+    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.66" level="project" />
     <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.17" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.9.7" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache-extras.beanshell:bsh:2.0b6" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.ant:ant-launcher:1.9.7" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="semver_main" />
 </module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ac9463c..d6cd9cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id "com.jfrog.bintray" version "1.7.3"
+    id "com.github.ben-manes.versions" version "0.17.0"
 }
 apply plugin: 'java'
 apply plugin: 'idea'
@@ -59,8 +60,8 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.spullara.mustache.java:compiler:0.9.4'
-    testCompile 'org.testng:testng:6.11'
+    compile 'com.github.spullara.mustache.java:compiler:0.9.5'
+    testCompile 'org.testng:testng:6.12'
 }
 
 bintray {
diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml
index 6e7fcba..3b317ee 100644
--- a/kobalt/Build.kt.iml
+++ b/kobalt/Build.kt.iml
@@ -19,13 +19,13 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.87">
+      <library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.90">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.87/kobalt/wrapper/kobalt-1.0.87.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.87/kobalt/wrapper/kobalt-1.0.87-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 5952e22..f3440b4 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -72,11 +72,12 @@ val semver = project {
     }
 
     dependencies {
-        compile("com.github.spullara.mustache.java:compiler:0.9.4")
+        compile("com.github.spullara.mustache.java:compiler:0.9.5")
+        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.1.51")
     }
 
     dependenciesTest {
-        compile("org.testng:testng:6.11")
+        compile("org.testng:testng:6.12")
     }
 
     assemble {
diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties
index 4a5b196..21b1f73 100644
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=1.0.87
\ No newline at end of file
+kobalt.version=1.0.90
\ No newline at end of file
diff --git a/semver.iml b/semver.iml
index 14e084a..c0abab8 100644
--- a/semver.iml
+++ b/semver.iml
@@ -1,55 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="semver" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="KOBALT" external.system.module.group="" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/kobaltBuild/classes" />
-    <output-test url="file://$MODULE_DIR$/kobaltBuild/test-classes" />
+<module external.linked.project.id="semver" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="net.thauvin.erik" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/kobaltBuild" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="Kobalt: com.github.spullara.mustache.java:compiler:jar:0.9.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.kobalt/cache/com/github/spullara/mustache/java/compiler/0.9.4/compiler-0.9.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="TEST">
-      <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" scope="TEST">
-      <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" scope="TEST">
-      <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>
   </component>
 </module>
\ No newline at end of file