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

---
 .gitignore                                    |  7 +-
 .idea/kobalt.xml                              |  2 +-
 .idea/modules.xml                             |  1 -
 example/example.iml                           | 16 -----
 example/example2.iml                          | 16 -----
 example/kobalt/src/Build.kt                   |  1 +
 .../kobalt/wrapper/kobalt-wrapper.properties  |  2 +-
 kobalt-exec.iml                               |  1 +
 kobalt/Build.kt.iml                           |  1 +
 kobalt/src/Build.kt                           | 68 +++----------------
 kobalt/wrapper/kobalt-wrapper.properties      |  2 +-
 11 files changed, 19 insertions(+), 98 deletions(-)
 delete mode 100644 example/example.iml
 delete mode 100644 example/example2.iml

diff --git a/.gitignore b/.gitignore
index 58a18f4..e236f57 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
@@ -15,8 +15,10 @@
 /build
 /deploy
 /dist
+/example/libs/
 /gen
 /gradle.properties
+/lib
 /libs
 /local.properties
 /out
@@ -24,7 +26,6 @@
 /project.properties
 /target
 /test-output
-Thumbs.db
 ehthumbs.db
 kobaltBuild
-/example/libs/
+Thumbs.db
\ No newline at end of file
diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml
index 7a87639..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.26" />
+        <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/modules.xml b/.idea/modules.xml
index e443ce8..cc61fa9 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$/example/example2.iml" filepath="$PROJECT_DIR$/example/example2.iml" />
       <module fileurl="file://$PROJECT_DIR$/kobalt-exec.iml" filepath="$PROJECT_DIR$/kobalt-exec.iml" />
     </modules>
diff --git a/example/example.iml b/example/example.iml
deleted file mode 100644
index 713148f..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">
-    <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-exec" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/example/example2.iml b/example/example2.iml
deleted file mode 100644
index b4eb055..0000000
--- a/example/example2.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="example2" external.linked.project.path="$MODULE_DIR$/.." external.root.project.path="$MODULE_DIR$/.." external.system.id="KOBALT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <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-exec" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt
index 975a73b..a1c5abf 100644
--- a/example/kobalt/src/Build.kt
+++ b/example/kobalt/src/Build.kt
@@ -8,6 +8,7 @@ import net.thauvin.erik.kobalt.plugin.exec.*
 // ./kobaltw example2:exec --log 2
 
 val bs = buildScript {
+    //plugins(file("../kobaltBuild/libs/kobalt-exec-0.6.4.jar"))
     plugins("net.thauvin.erik:kobalt-exec:")
 }
 
diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties
index ab67089..5430a86 100644
--- a/example/kobalt/wrapper/kobalt-wrapper.properties
+++ b/example/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=1.0.30
\ No newline at end of file
+kobalt.version=1.0.69
\ No newline at end of file
diff --git a/kobalt-exec.iml b/kobalt-exec.iml
index 7f6ea6d..d3359c4 100644
--- a/kobalt-exec.iml
+++ b/kobalt-exec.iml
@@ -435,5 +435,6 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml
index 24087cd..db31b14 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 73ec2ce..76b95c2 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -1,25 +1,13 @@
-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.exec.*
-import net.thauvin.erik.kobalt.plugin.versioneye.*
-import org.apache.maven.model.*
-import java.io.*
 
-val semver = "0.6.3"
+import com.beust.kobalt.*
+import com.beust.kobalt.plugin.packaging.assemble
+import com.beust.kobalt.plugin.publish.autoGitTag
+import com.beust.kobalt.plugin.publish.bintray
+import net.thauvin.erik.kobalt.plugin.versioneye.versionEye
+import org.apache.maven.model.*
 
 val bs = buildScript {
-    val p = with(File("kobaltBuild/libs/kobalt-exec-$semver.jar")) {
-        if (exists()) {
-            kobaltLog(1, "  >>> Using: $path")
-            file(path)
-        } else {
-            "net.thauvin.erik:kobalt-exec:"
-        }
-    }
-    plugins("net.thauvin.erik:kobalt-versioneye:", p)
+    plugins("net.thauvin.erik:kobalt-versioneye:")
 }
 
 val dev by profile()
@@ -30,7 +18,7 @@ val p = project {
     name = "kobalt-exec"
     group = "net.thauvin.erik"
     artifactId = name
-    version = semver
+    version = "0.6.4"
 
     pom = Model().apply {
         description = "Command Line Execution plug-in for the Kobalt build system."
@@ -57,7 +45,6 @@ val p = project {
 
     dependenciesTest {
         compile("org.testng:testng:")
-
     }
 
     assemble {
@@ -79,41 +66,4 @@ val p = project {
         org = "Thauvin"
         team = "Owners"
     }
-}
-
-val example = project(p) {
-
-    name = "example"
-    group = "com.example"
-    artifactId = name
-    version = "0.1"
-    directory = ("example")
-
-    assemble {
-        jar {
-        }
-    }
-
-    application {
-        mainClass = "com.example.Main"
-    }
-
-    exec {
-        commandLine(listOf("echo", "Test Example 1"), os = setOf(Os.LINUX))
-        commandLine(listOf("cmd", "/c", "echo", "Test Example 1"), os = setOf(Os.WINDOWS))
-        commandLine(args = listOf("ls", "-l"), dir = "../libs", os = setOf(Os.LINUX))
-        commandLine(args = listOf("cmd", "/c", "dir /Q"), dir = "../libs", os = setOf(Os.WINDOWS))
-    }
-}
-
-val example2 = project(p) {
-    name = "example2"
-    directory = "example"
-
-    exec {
-        commandLine(listOf("cmd", "/c", "echo", "Test Example 2"), os = setOf(Os.WINDOWS))
-        commandLine(listOf("echo", "Test example 2"), os = setOf(Os.LINUX))
-        //commandLine(listOf("cmd", "/c", "tasklist | find \"cmd.exe\""), os = setOf(Os.WINDOWS), fail = setOf(Fail.NONE))
-        commandLine(listOf("/bin/sh", "-c", "ps aux | grep bash"), os = setOf(Os.LINUX))
-    }
-}
+}
\ No newline at end of file
diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties
index ab67089..5430a86 100644
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=1.0.30
\ No newline at end of file
+kobalt.version=1.0.69
\ No newline at end of file