Centralized versions in main Gradle build file.

Grade build

.gitignore

@@ -11,3 +11,5 @@ libs
 out
 .DS_Store
 lib/kotlin-*
+build
+.history

build.gradle

@@ -0,0 +1,58 @@
+allprojects {
+    group = 'com.beust'
+    version = '1.1.0'
+}
+
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'maven-publish'
+
+    ext {
+        bndlib = '3.5.0'
+        findbugs = '3.0.2'
+        groovy = '2.4.12'
+        gson = '2.8.2'
+        guice = '4.2.2'
+        inject = '1'
+        jaxb = '2.3.0'
+        jcommander = '1.72'
+        kotlin = '1.2.71'
+        maven = '3.5.2'
+        mavenResolver = '1.1.0'
+        okhttp = '3.9.1'
+        okio = '1.13.0'
+        retrofit = '2.3.0'
+        slf4j = '1.7.3'
+        spark = '2.6.0'
+        testng = '6.12'
+
+        junit = '4.12'
+        junitJupiter = '5.1.0'
+        junitPlatform = '1.1.0'
+    }
+
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        jcenter()
+        maven {
+            url = 'https://dl.bintray.com/cbeust/maven'
+        }
+
+        maven {
+            url = 'https://repo.maven.apache.org/maven2'
+        }
+    }
+
+    sourceCompatibility = '1.7'
+
+    task sourcesJar(type: Jar) {
+        from sourceSets.main.allJava
+        archiveClassifier = 'sources'
+    }
+
+    task javadocJar(type: Jar) {
+        from javadoc
+        archiveClassifier = 'javadoc'
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

kobalt/src/Build.kt

@@ -21,16 +21,16 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
 val bs = buildScript {
-    repos("http://dl.bintray.com/cbeust/maven")
+    repos("https://dl.bintray.com/cbeust/maven")
 }
 
 object Versions {
-    val kotlin = "1.2.20"
-    val okhttp = "3.9.0"
+    val kotlin = "1.2.71"
+    val okhttp = "3.9.1"
     val okio = "1.13.0"
     val retrofit = "2.3.0"
     val gson = "2.8.2"
-    val guice = "4.1.0"
+    val guice = "4.2.2"
     val maven = "3.5.2"
     val mavenResolver = "1.1.0"
     val slf4j = "1.7.3"
@@ -40,9 +40,8 @@ object Versions {
 
     // JUnit 5
     val junit = "4.12"
-    val junitPlatform = "1.0.0-M4"
-    val junitJupiter = "5.0.0-M4"
-    val junitVintageVersion = "$junit.0-M4"
+    val junitPlatform = "1.1.0"
+    val junitJupiter = "5.1.0"
 }
 
 fun mavenResolver(vararg m: String)
@@ -93,7 +92,7 @@ val kobaltPluginApi = project {
     version = readVersion()
     directory = "modules/kobalt-plugin-api"
     description = "A build system in Kotlin"
-    url = "http://beust.com/kobalt"
+    url = "https://beust.com/kobalt"
 
     pom = createPom(name, "A build system in Kotlin")
 
@@ -103,7 +102,7 @@ val kobaltPluginApi = project {
                 "com.google.inject:guice:${Versions.guice}",
                 "com.google.inject.extensions:guice-assistedinject:4.1.0",
                 "javax.inject:javax.inject:1",
-                "com.google.guava:guava:23.3-jre",
+                "com.google.guava:guava:27.0.1-jre",
                 "org.apache.maven:maven-model:${Versions.maven}",
                 "io.reactivex:rxjava:1.3.3",
                 "com.squareup.okio:okio:${Versions.okio}",
@@ -123,7 +122,7 @@ val kobaltPluginApi = project {
                 "org.junit.platform:junit-platform-engine:${Versions.junitPlatform}",
                 "org.junit.platform:junit-platform-console:${Versions.junitPlatform}",
                 "org.junit.jupiter:junit-jupiter-engine:${Versions.junitJupiter}",
-                "org.junit.vintage:junit-vintage-engine:${Versions.junitVintageVersion}",
+                "org.junit.vintage:junit-vintage-engine:${Versions.junitJupiter}",
                 "org.apache.commons:commons-compress:1.15",
                 "commons-io:commons-io:2.6",
 
@@ -175,8 +174,8 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
                 "com.google.code.gson:gson:${Versions.gson}",
                 "com.squareup.retrofit2:retrofit:${Versions.retrofit}",
                 "com.squareup.retrofit2:converter-gson:${Versions.retrofit}",
-                "com.squareup.okhttp3:okhttp-ws:3.4.2",
-                "biz.aQute.bnd:bndlib:2.4.0",
+//                "com.squareup.okhttp3:okhttp-ws:3.4.2",
+                "biz.aQute.bnd:biz.aQute.bndlib:3.5.0",
                 *mavenResolver("spi"),
 
                 "com.squareup.okhttp3:logging-interceptor:3.9.0",
@@ -310,13 +309,13 @@ fun taskCopyVersionForWrapper(project: Project) : TaskResult {
 fun createPom(projectName: String, projectDescription: String) = Model().apply {
     name = projectName
     description = projectDescription
-    url = "http://beust.com/kobalt"
+    url = "https://beust.com/kobalt"
     licenses = listOf(License().apply {
         name = "Apache-2.0"
-        url = "http://www.apache.org/licenses/LICENSE-2.0"
+        url = "https://www.apache.org/licenses/LICENSE-2.0"
     })
     scm = Scm().apply {
-        url = "http://github.com/cbeust/kobalt"
+        url = "https://github.com/cbeust/kobalt"
         connection = "https://github.com/cbeust/kobalt.git"
         developerConnection = "git@github.com:cbeust/kobalt.git"
     }
@@ -324,4 +323,4 @@ fun createPom(projectName: String, projectDescription: String) = Model().apply {
         name = "Cedric Beust"
         email = "cedric@beust.com"
     })
-}
+}

kobalt/wrapper/kobalt-wrapper.properties

@@ -1 +1 @@
-kobalt.version=1.0.101
+kobalt.version=1.0.122

modules/kobalt-plugin-api/build.gradle

@@ -0,0 +1,85 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.2.71'
+    id 'com.github.johnrengelman.shadow' version '5.0.0'
+}
+
+dependencies {
+    implementation "biz.aQute.bnd:biz.aQute.bndlib:$bndlib"
+    implementation "com.google.code.findbugs:jsr305:$findbugs"
+    implementation "com.sparkjava:spark-core:$spark"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp"
+    implementation 'commons-io:commons-io:2.6'
+    implementation 'io.reactivex:rxjava:1.3.3'
+    implementation "javax.inject:javax.inject:$inject"
+    implementation "javax.xml.bind:jaxb-api:$jaxb"
+    implementation 'org.apache.commons:commons-compress:1.15'
+    implementation 'org.apache.maven:maven-aether-provider:3.3.9'
+    implementation "org.apache.maven.resolver:maven-resolver-api:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-connector-basic:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-impl:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-spi:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-transport-file:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-transport-http:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-util:$mavenResolver"
+    implementation "org.codehaus.groovy:groovy:$groovy"
+    implementation 'org.eclipse.jgit:org.eclipse.jgit:4.9.0.201710071750-r'
+    implementation "org.junit.jupiter:junit-jupiter-engine:$junitJupiter"
+    implementation "org.junit.platform:junit-platform-console:$junitPlatform"
+    implementation "org.junit.platform:junit-platform-engine:$junitPlatform"
+    implementation "org.junit.platform:junit-platform-runner:$junitPlatform"
+    implementation "org.junit.platform:junit-platform-surefire-provider:$junitPlatform"
+    implementation "org.junit.vintage:junit-vintage-engine:$junitJupiter"
+    implementation "org.slf4j:slf4j-simple:$slf4j"
+    implementation "org.testng:testng:$testng"
+    implementation 'org.testng.testng-remote:testng-remote:1.3.2'
+    implementation "com.beust:jcommander:$jcommander"
+    implementation "com.google.code.gson:gson:$gson"
+    implementation "com.google.inject:guice:$guice"
+    implementation "com.google.inject.extensions:guice-assistedinject:$guice"
+    implementation "com.squareup.okio:okio:$okio"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit"
+    implementation "org.apache.maven:maven-model:$maven"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin"
+}
+
+shadowJar {
+    classifier = null
+}
+
+test {
+    useTestNG()
+}
+
+publishing {
+    publications {
+        shadow(MavenPublication) { publication ->
+            project.shadow.component(publication)
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                name = project.name
+                description = 'A build system in Kotlin'
+                url = 'https://beust.com/kobalt'
+                licenses {
+                    license {
+                        name = 'Apache-2.0'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0'
+                    }
+                }
+                developers {
+                    developer {
+                        name = 'Cedric Beust'
+                        email = 'cedric@beust.com'
+                    }
+                }
+                scm {
+                    connection = 'scm:https://github.com/cbeust/kobalt.git'
+                    developerConnection = 'scm:git@github.com:cbeust/kobalt.git'
+                    url = 'https://github.com/cbeust/kobalt'
+                }
+            }
+        }
+    }
+}

modules/kobalt-plugin-api/pom.xml

@@ -0,0 +1,279 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.beust</groupId>
+        <artifactId>kobalt-pom</artifactId>
+        <version>1.1.0</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>kobalt-plugin-api</artifactId>
+    <packaging>jar</packaging>
+    <version>1.1.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-aether-provider</artifactId>
+            <version>3.3.9</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.aether</groupId>
+                    <artifactId>impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.aether</groupId>
+                    <artifactId>spi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.aether</groupId>
+                    <artifactId>util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.aether</groupId>
+                    <artifactId>api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-api</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-spi</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-util</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-impl</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-connector-basic</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-transport-http</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-transport-file</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.reactivex</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>1.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okio</groupId>
+            <artifactId>okio</artifactId>
+            <version>${okio.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-assistedinject</artifactId>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+            <version>1.72</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>retrofit</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-gson</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>biz.aQute.bndlib</artifactId>
+            <version>3.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-core</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>2.4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-surefire-provider</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-console</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junitJupiter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junitJupiter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng.testng-remote</groupId>
+            <artifactId>testng-remote</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>4.9.0.201710071750-r</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <!-- java 9 -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals> <goal>compile</goal> </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals> <goal>test-compile</goal> </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <executions>
+                    <!-- Replacing default-compile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <!-- Replacing default-testCompile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                        <goals> <goal>compile</goal> </goals>
+                    </execution>
+                    <execution>
+                        <id>java-test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals> <goal>testCompile</goal> </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt

@@ -61,6 +61,9 @@ class Args {
     @Parameter(names = arrayOf("--noIncremental"), description = "Turn off incremental builds")
     var noIncremental: Boolean = false
 
+    @Parameter(names = arrayOf("--offline"), description = "Don't try to download dependencies even if there is no cached version")
+    var offline: Boolean = false
+
     @Parameter(names = arrayOf("--plugins"), description = "Comma-separated list of plug-in Maven id's")
     var pluginIds: String? = null
 
@@ -101,5 +104,8 @@ class Args {
 
     @Parameter(names = arrayOf("--update"), description = "Update to the latest version of Kobalt")
     var update: Boolean = false
+
+    @Parameter(names = arrayOf("--version"), description = "Display the current version of Kobalt")
+    var version: Boolean = false
 }
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt

@@ -9,13 +9,13 @@ object Constants {
     val BUILD_FILE_NAME = "Build.kt"
     val BUILD_FILE_DIRECTORY = "kobalt/src"
     val BUILD_FILE_PATH = KFiles.joinDir(BUILD_FILE_DIRECTORY, BUILD_FILE_NAME)
-    val KOTLIN_COMPILER_VERSION = "1.2.20"
+    val KOTLIN_COMPILER_VERSION = "1.2.70"
 
     internal val DEFAULT_REPOS = listOf<HostConfig>(
             //            "https://maven-central.storage.googleapis.com/",
-            HostConfig("http://repo1.maven.org/maven2/", "Maven"),
+            HostConfig("https://repo1.maven.org/maven2/", "Maven"),
             HostConfig("https://jcenter.bintray.com/", "JCenter")
-//            "http://repository.jetbrains.com/all/", // <-- contains snapshots
+//            "https://repository.jetbrains.com/all/", // <-- contains snapshots
 
             // snapshots
 //            "https://oss.sonatype.org/content/repositories/snapshots/"

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/MetaArchive.kt

@@ -9,7 +9,6 @@ import java.io.Closeable
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
-import java.nio.file.Files
 import java.util.jar.Manifest
 import org.apache.commons.compress.archivers.zip.ZipFile as ApacheZipFile
 
@@ -19,18 +18,39 @@ import org.apache.commons.compress.archivers.zip.ZipFile as ApacheZipFile
  */
 class MetaArchive(outputFile: File, val manifest: Manifest?) : Closeable {
     companion object {
-        val MANIFEST_MF = "META-INF/MANIFEST.MF"
+        const val MANIFEST_MF = "META-INF/MANIFEST.MF"
     }
 
-    private val zos = ZipArchiveOutputStream(outputFile).apply {
+    private val zos= ZipArchiveOutputStream(outputFile).apply {
         encoding = "UTF-8"
     }
 
+    init {
+        // If no manifest was passed, create an empty one so it's the first one in the archive
+        val m = manifest ?: Manifest()
+        val manifestFile = File.createTempFile("kobalt", "tmpManifest")
+        addEntry(ZipArchiveEntry("META-INF/"), null)
+        if (manifest != null) {
+            FileOutputStream(manifestFile).use { fos ->
+                m.write(fos)
+            }
+        }
+        val entry = zos.createArchiveEntry(manifestFile, MetaArchive.MANIFEST_MF)
+        addEntry(entry, FileInputStream(manifestFile))
+    }
+
+
     fun addFile(f: File, entryFile: File, path: String?) {
+        maybeCreateParentDirectories(f)
+        addFile2(f, entryFile, path)
+    }
+
+    private fun addFile2(f: File, entryFile: File, path: String?) {
         val file = f.normalize()
         FileInputStream(file).use { inputStream ->
             val actualPath = KFiles.fixSlashes(if (path != null) path + entryFile.path else entryFile.path)
             ZipArchiveEntry(actualPath).let { entry ->
+                maybeCreateParentDirectories(File(actualPath))
                 maybeAddEntry(entry) {
                     addEntry(entry, inputStream)
                 }
@@ -38,6 +58,30 @@ class MetaArchive(outputFile: File, val manifest: Manifest?) : Closeable {
         }
     }
 
+    private val createdDirs = hashSetOf<String>()
+
+    /**
+     * For an entry a/b/c/File, an entry needs to be created for each individual directory:
+     * a/
+     * a/b/
+     * a/b/c
+     * a/b/c/File
+     */
+    private fun maybeCreateParentDirectories(file: File) {
+        val toCreate = arrayListOf<String>()
+        var current = file.parentFile
+        while (current != null && current.path != ".") {
+            if (!createdDirs.contains(current.path)) {
+                toCreate.add(0, KFiles.fixSlashes(current) + "/")
+                createdDirs.add(current.path)
+            }
+            current = current.parentFile
+        }
+        toCreate.forEach { dir ->
+            addEntry(ZipArchiveEntry(dir), null)
+        }
+    }
+
     fun addArchive(jarFile: File) {
         ApacheZipFile(jarFile).use { jar ->
             val jarEntries = jar.entries
@@ -49,40 +93,33 @@ class MetaArchive(outputFile: File, val manifest: Manifest?) : Closeable {
         }
     }
 
-    private val DEFAULT_JAR_EXCLUDES =
-            Glob("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA")
 
-    private val seen = hashSetOf<String>()
 
-    private fun okToAdd(name: String): Boolean = ! seen.contains(name)
-            && ! KFiles.isExcluded(name, DEFAULT_JAR_EXCLUDES)
-
-    override fun close() {
-        if (manifest != null) {
-            Files.createTempFile("aaa", "bbb").toFile().let { manifestFile ->
-                FileOutputStream(manifestFile).use { fos ->
-                    manifest.write(fos)
-                }
-
-                val entry = zos.createArchiveEntry(manifestFile, MetaArchive.MANIFEST_MF)
-                addEntry(entry, FileInputStream(manifestFile))
-            }
-        }
-        zos.close()
+    private fun okToAdd(name: String) : Boolean {
+        val result = !KFiles.isExcluded(name,
+                Glob("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", MANIFEST_MF))
+//        if (name.startsWith("META-INF")) println((if (result) "ADDING" else "NOT ADDING") + " $name")
+        return result
     }
 
-    private fun addEntry(entry: ArchiveEntry, inputStream: FileInputStream) {
+    override fun close() = zos.close()
+
+    private fun addEntry(entry: ArchiveEntry, inputStream: FileInputStream?) {
         zos.putArchiveEntry(entry)
-        inputStream.use { ins ->
+        inputStream?.use { ins ->
             ins.copyTo(zos, 50 * 1024)
         }
         zos.closeArchiveEntry()
     }
 
+    private val seen = hashSetOf<String>()
+
     private fun maybeAddEntry(entry: ArchiveEntry, action:() -> Unit) {
-        if (okToAdd(entry.name)) {
-            action()
+        entry.name.let { name ->
+            if (!seen.contains(name) && okToAdd(name)) {
+                action()
+            }
+            seen.add(name)
         }
-        seen.add(entry.name)
     }
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt

@@ -2,7 +2,7 @@ package com.beust.kobalt.internal
 
 class DocUrl {
     companion object {
-        private const val HOST = "http://beust.com/kobalt/"
+        private const val HOST = "https://beust.com/kobalt/"
         private fun url(path: String) = HOST + path
 
         val PUBLISH_PLUGIN_URL = url("plug-ins/index.html#publishing")

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt

@@ -112,10 +112,11 @@ abstract class GenericTestRunner: ITestRunnerContributor {
             configName: String) : TestResult {
         var result = false
 
-        context.logger.log(project.name, 1, "Running tests with " + runnerName)
+        context.logger.log(project.name, 1, "Running tests with $runnerName")
 
         val testConfig = project.testConfigs.firstOrNull { it.name == configName }
 
+        var errorCode = -1
         if (testConfig != null) {
             val args = args(project, context, classpath, testConfig)
             if (args.size > 0) {
@@ -136,12 +137,7 @@ abstract class GenericTestRunner: ITestRunnerContributor {
                 context.logger.log(project.name, 2, "Running tests with classpath size ${classpath.size}")
                 context.logger.log(project.name, 2, "Launching " + allArgs.joinToString(" "))
                 val process = pb.start()
-                val errorCode = process.waitFor()
-                if (errorCode == 0) {
-                    context.logger.log(project.name, 1, "All tests passed")
-                } else {
-                    context.logger.log(project.name, 1, "Test failures")
-                }
+                errorCode = process.waitFor()
                 result = result || errorCode == 0
             } else {
                 context.logger.log(project.name, 1, "  No tests to run")
@@ -152,6 +148,13 @@ abstract class GenericTestRunner: ITestRunnerContributor {
         }
 
         onFinish(project)
+
+        if (errorCode == 0) {
+            context.logger.log(project.name, 1, "All tests passed")
+        } else {
+            context.logger.log(project.name, 1, longMessage!!)
+        }
+
         return TestResult(result, shortMessage, longMessage)
     }
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JUnit5Runner.kt

@@ -35,7 +35,8 @@ class JUnit5Runner @Inject constructor(kFiles: KFiles) : GenericTestRunner() {
 
     override fun affinity(project: Project, context: KobaltContext) : Int {
         val result =
-                if (project.testDependencies.any { it.id.contains("jupiter") }) IAffinity.DEFAULT_POSITIVE_AFFINITY + 100
+                if (project.testDependencies.any { it.id.contains("junit5") || it.id.contains("jupiter") })
+                    IAffinity.DEFAULT_POSITIVE_AFFINITY + 100
                 else 0
         return result
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt

@@ -187,8 +187,8 @@ open class JvmCompilerPlugin @Inject constructor(
             var done = false
             // The directory where the classes get compiled
             val buildDirectory =
-                    if (isTest) File(project.buildDirectory, KFiles.TEST_CLASSES_DIR)
-                    else File(project.classesDir(context))
+                    if (isTest) File(KFiles.joinDir(project.buildDirectory, KFiles.TEST_CLASSES_DIR))
+                    else File(KFiles.joinDir(project.classesDir(context)))
 
             allCompilersSorted.doWhile({ ! done }) { compiler ->
                 val compilerResults = compilerUtils.invokeCompiler(project, context, compiler,

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KotlinJarFiles.kt

@@ -16,6 +16,5 @@ class KotlinJarFiles @Inject constructor(val dependencyManager: DependencyManage
     }
 
     val stdlib: File get() = getKotlinCompilerJar("stdlib")
-    val runtime: File get() = getKotlinCompilerJar("runtime")
     val compiler: File get() = getKotlinCompilerJar("compiler-embeddable")
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt

@@ -14,11 +14,14 @@ import org.testng.remote.strprotocol.MessageHelper
 import org.testng.remote.strprotocol.MessageHub
 import org.testng.remote.strprotocol.TestResultMessage
 import org.w3c.dom.Attr
+import org.w3c.dom.NodeList
 import org.xml.sax.InputSource
 import java.io.File
 import java.io.FileReader
 import java.io.IOException
 import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.xpath.XPathConstants
+import javax.xml.xpath.XPathFactory
 
 class TestNgRunner : GenericTestRunner() {
 
@@ -27,7 +30,10 @@ class TestNgRunner : GenericTestRunner() {
     override val annotationPackage = "org.testng"
     override val runnerName = "TestNG"
 
-    fun defaultOutput(project: Project) = KFiles.joinDir(project.buildDirectory, "test-output")
+    private fun defaultOutputWithoutProjectDir(project: Project)
+            = KFiles.joinDir(project.buildDirectory, "test-output")
+    private fun defaultOutput(project: Project)
+            = KFiles.joinDir(project.directory, project.buildDirectory, "test-output")
 
     override fun args(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
             testConfig: TestConfig) = arrayListOf<String>().apply {
@@ -39,7 +45,9 @@ class TestNgRunner : GenericTestRunner() {
 
         if (testConfig.testArgs.none { it == "-d" }) {
             add("-d")
-            add(defaultOutput(project))
+            // Don't include the project directory here since the generic runner will cd to that directory before
+            // running the tests
+            add(defaultOutputWithoutProjectDir(project))
         }
 
         if (testConfig.testArgs.size == 0) {
@@ -77,6 +85,15 @@ class TestNgRunner : GenericTestRunner() {
             var failed = 0
             var skipped = 0
             var passed = 0
+            val xp = XPathFactory.newInstance().newXPath()
+            val testMethods = xp.compile("/testng-results/suite/test/class/test-method[@status='FAIL']")
+                    .evaluate(doc, XPathConstants.NODESET)
+                    as NodeList
+            val failedMethods = arrayListOf<String>()
+            repeat(testMethods.length) {
+                val tm = testMethods.item(it)
+                failedMethods.add(tm.attributes.getNamedItem("signature").textContent)
+            }
             repeat(root.attributes.length) {
                 val attribute = root.attributes.item(it)
                 if (attribute is Attr) when (attribute.name) {
@@ -90,6 +107,7 @@ class TestNgRunner : GenericTestRunner() {
                 shortMessage = "$passed tests"
             } else if (failed > 0) {
                 shortMessage = "$failed failed" + (if (skipped > 0) ", $skipped skipped" else "") + " tests"
+                longMessage = "Failed tests:\n  " + failedMethods.joinToString("\n  ")
             }
         }
     }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Booter.kt

@@ -2,6 +2,7 @@ package com.beust.kobalt.maven.aether
 
 import com.beust.kobalt.internal.KobaltSettings
 import com.google.common.eventbus.EventBus
+import com.beust.kobalt.Args
 import org.eclipse.aether.DefaultRepositorySystemSession
 import org.eclipse.aether.RepositorySystem
 import org.eclipse.aether.repository.LocalRepository
@@ -32,8 +33,9 @@ object Booter {
 //    }
 
     fun newRepositorySystemSession(system: RepositorySystem, repo: File, settings: KobaltSettings,
-            eventBus: EventBus): DefaultRepositorySystemSession {
+            args: Args, eventBus: EventBus): DefaultRepositorySystemSession {
         val session = MavenRepositorySystemUtils.newSession(settings)
+        session.isOffline = args.offline
 
         val localRepo = LocalRepository(repo.absolutePath)
         session.localRepositoryManager = system.newLocalRepositoryManager(session, localRepo)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt

@@ -52,7 +52,7 @@ class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
             }
             fun error(s1: String, s2: String) {
                 throw KobaltException("Found \"$s1\" but not \"$s2\" in local.properties for ${Kurl.KEY}.$host",
-                        docUrl = "http://beust.com/kobalt/documentation/index.html#maven-repos-authenticated")
+                        docUrl = "https://beust.com/kobalt/documentation/index.html#maven-repos-authenticated")
             }
             if (! hostInfo.username.isNullOrBlank() && hostInfo.password.isNullOrBlank()) {
                 error("username", "password")
@@ -141,7 +141,7 @@ class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
     fun create(id: String, optional: Boolean) = AetherDependency(DefaultArtifact(id), optional, args)
 
     private val system = Booter.newRepositorySystem()
-    private val session = Booter.newRepositorySystemSession(system, localRepo.localRepo, settings, eventBus)
+    private val session = Booter.newRepositorySystemSession(system, localRepo.localRepo, settings, args, eventBus)
 
     private fun createRepo(hostConfig: HostConfig) : RemoteRepository {
         val builder = RemoteRepository.Builder(hostConfig.name, "default", hostConfig.url)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt

@@ -55,10 +55,13 @@ class KFiles {
                     val previousVersion = latestInstalledVersion().version
                     val previousJar = joinDir(distributionsDir, "kobalt-" + previousVersion,
                             "kobalt/wrapper/kobalt-$previousVersion.jar")
-                    val v = latestInstalledVersion()
+                    latestInstalledVersion()
                     val result = listOf("", "modules/kobalt-plugin-api", "modules/wrapper").map {
-                        File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "kobaltBuild", "classes")))
-                            .absolutePath
+                        File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "kobaltBuild", "classes"))) //kobalt build dirs
+                                .absolutePath
+                    } + listOf("modules/kobalt", "modules/kobalt-plugin-api", "modules/wrapper").map {
+                        File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "target", "classes"))) //maven build dirs
+                                .absolutePath
                     } + listOf(previousJar)
                     debug("Couldn't find ${jarFile.absolutePath}, using\n  " + result.joinToString(" "))
                     return result.filter { File(it).exists() }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt

@@ -51,7 +51,7 @@ fun Any.error(text: CharSequence, e: Throwable? = null) {
 
 object KobaltLogger {
     var LOG_LEVEL: Int = 1
-    
+
     val isQuiet: Boolean get() = (LOG_LEVEL == Constants.LOG_QUIET_LEVEL)
 
     val logger: Logger get() =
@@ -60,6 +60,14 @@ object KobaltLogger {
         } else {
             Logger(false)
         }
+
+    fun setLogLevel(args: Args) {
+        LOG_LEVEL = when {
+            args.log < Constants.LOG_QUIET_LEVEL -> Constants.LOG_DEFAULT_LEVEL
+            args.log > Constants.LOG_MAX_LEVEL -> Constants.LOG_MAX_LEVEL
+            else -> args.log
+        }
+    }
 }
 
 class Logger(val dev: Boolean) {

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt

@@ -24,7 +24,7 @@ class KobaltWrapperProperties @Inject constructor() {
     }
 
     private fun defaultUrlFor(version: String) =
-            "http://beust.com/kobalt/kobalt-$version.zip"
+            "https://beust.com/kobalt/kobalt-$version.zip"
 
     private val file: File
             get() = File("$WRAPPER_DIR/$KOBALT_WRAPPER_PROPERTIES")

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/NewRunCommand.kt

@@ -79,7 +79,11 @@ open class NewRunCommand(val info: RunCommandInfo) {
         val process = pb.start()
 
         // Run the command and collect the return code and streams
-        val returnCode = process.waitFor(30, TimeUnit.SECONDS)
+        val processFinished = process.waitFor(120, TimeUnit.SECONDS)
+
+        if (!processFinished)
+            kobaltError("process timed out!")
+
         val input =
                 if (process.inputStream.available() > 0) fromStream(process.inputStream)
                 else listOf()
@@ -87,10 +91,12 @@ open class NewRunCommand(val info: RunCommandInfo) {
                 if (process.errorStream.available() > 0) fromStream(process.errorStream)
                 else listOf()
 
+        kobaltLog(3, "info contains errors: " + (info.containsErrors != null))
+
         // Check to see if the command succeeded
         val isSuccess =
                 if (info.containsErrors != null) ! info.containsErrors!!(error)
-                else isSuccess(if (info.ignoreExitValue) true else returnCode, input, error)
+                else isSuccess(if (info.ignoreExitValue) true else processFinished, input, error)
 
         if (isSuccess) {
             if (!info.useErrorStreamAsErrorIndicator) {

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/StringVersion.kt

@@ -29,8 +29,12 @@ class StringVersion(val version: String) : Comparable<StringVersion> {
                 if (v1 < v2) return -1
                 else if (v1 > v2) return 1
             } catch(ex: NumberFormatException) {
-                warn("Couldn't parse version $version or $other")
-                return -1
+                if (version == other.toString()) {
+                    return 0
+                } else {
+                    log(2, "Couldn't parse version $version or $other")
+                    return -1
+                }
             }
         }
         return 0

modules/kobalt/build.gradle

@@ -0,0 +1,79 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.2.71'
+    id 'com.github.johnrengelman.shadow' version '5.0.0'
+}
+
+dependencies {
+    implementation project(':wrapper')
+    implementation project(':kobalt-plugin-api')
+    implementation "biz.aQute.bnd:biz.aQute.bndlib:$bndlib"
+    implementation 'com.github.spullara.mustache.java:compiler:0.9.5'
+    implementation "com.google.code.findbugs:jsr305:$findbugs"
+    implementation "com.sparkjava:spark-core:$spark"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp"
+    implementation 'com.sun.activation:javax.activation:1.2.0'
+    implementation "com.sun.xml.bind:jaxb-core:$jaxb"
+    implementation "com.sun.xml.bind:jaxb-impl:$jaxb"
+    implementation "javax.inject:javax.inject:$inject"
+    implementation "javax.xml.bind:jaxb-api:$jaxb"
+    implementation "org.apache.maven.resolver:maven-resolver-spi:$mavenResolver"
+    implementation "org.codehaus.groovy:groovy:$groovy"
+    implementation "com.beust:jcommander:$jcommander"
+    implementation "com.google.code.gson:gson:$gson"
+    implementation "com.google.inject:guice:$guice"
+    implementation "com.google.inject.extensions:guice-assistedinject:$guice"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit"
+    implementation "org.apache.maven:maven-model:$maven"
+    implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin"
+    testImplementation 'org.assertj:assertj-core:3.8.0'
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin"
+    testImplementation "org.testng:testng:$testng"
+}
+
+sourceSets {
+    main.kotlin.srcDirs += "${rootProject.projectDir}../../src/main/kotlin"
+    test.kotlin.srcDirs += "${rootProject.projectDir}../../src/test/kotlin"
+}
+
+shadowJar {
+    classifier = null
+}
+
+test {
+    useTestNG()
+}
+
+publishing {
+    publications {
+        shadow(MavenPublication) { publication ->
+            project.shadow.component(publication)
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                name = project.name
+                description = 'A build system in Kotlin'
+                url = 'https://beust.com/kobalt'
+                licenses {
+                    license {
+                        name = 'Apache-2.0'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0'
+                    }
+                }
+                developers {
+                    developer {
+                        name = 'Cedric Beust'
+                        email = 'cedric@beust.com'
+                    }
+                }
+                scm {
+                    connection = 'scm:https://github.com/cbeust/kobalt.git'
+                    developerConnection = 'scm:git@github.com:cbeust/kobalt.git'
+                    url = 'https://github.com/cbeust/kobalt'
+                }
+            }
+        }
+    }
+}

modules/kobalt/pom.xml

@@ -0,0 +1,231 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.beust</groupId>
+        <artifactId>kobalt-pom</artifactId>
+        <version>1.1.0</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>kobalt</artifactId>
+    <packaging>jar</packaging>
+    <version>1.1.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>kobalt-plugin-api</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>wrapper</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-compiler-embeddable</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.spullara.mustache.java</groupId>
+            <artifactId>compiler</artifactId>
+            <version>0.9.5</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-assistedinject</artifactId>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+            <version>1.72</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>retrofit</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-gson</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>biz.aQute.bndlib</artifactId>
+            <version>3.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-core</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>2.4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-spi</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <!-- java 9 -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>javax.activation</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.8.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals> <goal>compile</goal> </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}../../src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals> <goal>test-compile</goal> </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}../../src/test/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <executions>
+                    <!-- Replacing default-compile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <!-- Replacing default-testCompile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                        <goals> <goal>compile</goal> </goals>
+                    </execution>
+                    <execution>
+                        <id>java-test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals> <goal>testCompile</goal> </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.1</version>
+                <configuration>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <mainClass>com.beust.kobalt.MainKt</mainClass>
+                        </transformer>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

modules/wrapper/build.gradle

@@ -0,0 +1,38 @@
+jar {
+    manifest {
+        attributes 'Main-Class': 'com.beust.kobalt.wrapper.Main'
+    }
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from(components.java)
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                name = project.name
+                description = 'Wrapper for Kobalt'
+                url = 'https://beust.com/kobalt'
+                licenses {
+                    license {
+                        name = 'Apache-2.0'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0'
+                    }
+                }
+                developers {
+                    developer {
+                        name = 'Cedric Beust'
+                        email = 'cedric@beust.com'
+                    }
+                }
+                scm {
+                    connection = 'scm:https://github.com/cbeust/kobalt.git'
+                    developerConnection = 'scm:git@github.com:cbeust/kobalt.git'
+                    url = 'https://github.com/cbeust/kobalt'
+                }
+            }
+        }
+    }
+}

modules/wrapper/pom.xml

@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.beust</groupId>
+        <artifactId>kobalt-pom</artifactId>
+        <version>1.1.0</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>wrapper</artifactId>
+    <packaging>jar</packaging>
+    <version>1.1.0</version>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java

@@ -47,7 +47,6 @@ public class Main {
 
     private int installAndLaunchMain(String[] argv) throws IOException, InterruptedException {
         String version = getVersion();
-        initWrapperFile(version);
 
         List<String> kobaltArgv = new ArrayList<>();
         boolean noLaunch = false;
@@ -78,6 +77,7 @@ public class Main {
         }
         int result = 0;
         if (! exit) {
+            initWrapperFile(version);
             Path kobaltJarFile = installDistribution();
             if (!noLaunch) {
                 result = launchMain(kobaltJarFile, kobaltArgv);
@@ -118,7 +118,7 @@ public class Main {
     }
 
     private static String downloadUrl(String version) {
-        return "http://beust.com/kobalt/kobalt-" + version + ".zip";
+        return "https://beust.com/kobalt/kobalt-" + version + ".zip";
     }
 
     private void initWrapperFile(String version) throws IOException {
@@ -133,7 +133,7 @@ public class Main {
     }
 
     private String getWrapperVersion() {
-        return wrapperProperties.getProperty(PROPERTY_VERSION);
+        return wrapperProperties.getProperty(PROPERTY_VERSION, "N/A");
     }
 
     private String getWrapperDownloadUrl(String version) {

pom.xml

@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.beust</groupId>
+    <artifactId>kobalt-pom</artifactId>
+    <packaging>pom</packaging>
+    <version>1.1.0</version>
+
+    <modules>
+        <module>modules/kobalt-plugin-api</module>
+        <module>modules/wrapper</module>
+        <module>modules/kobalt</module>
+    </modules>
+
+    <repositories>
+        <repository>
+            <id>testng</id>
+            <url>https://dl.bintray.com/cbeust/maven</url>
+        </repository>
+    </repositories>
+
+    <properties>
+        <kotlin.version>1.2.71</kotlin.version>
+        <okio.version>1.13.0</okio.version>
+        <okhttp3.version>3.9.1</okhttp3.version>
+        <mavenresolver.version>1.1.0</mavenresolver.version>
+        <junit.version>1.1.0</junit.version>
+        <junitJupiter.version>5.1.0</junitJupiter.version>
+        <testng.version>6.12</testng.version>
+        <slf4j.version>1.7.3</slf4j.version>
+    </properties>
+
+</project>

settings.gradle

@@ -0,0 +1,5 @@
+rootProject.name = 'kobalt-pom'
+include(':kobalt-plugin-api', ':wrapper', ':kobalt')
+project(':kobalt-plugin-api').projectDir = file('modules/kobalt-plugin-api')
+project(':wrapper').projectDir = file('modules/wrapper')
+project(':kobalt').projectDir = file('modules/kobalt')

src/main/kotlin/com/beust/kobalt/Main.kt

@@ -38,6 +38,14 @@ class Main @Inject constructor(
     companion object {
         fun mainNoExit(argv: Array<String>): Int {
             val (jc, args) = parseArgs(argv)
+            if (args.usage) {
+                jc.usage()
+                return 0
+            }
+            if (args.version) {
+                println("Kobalt ${Kobalt.version}")
+                return 0
+            }
             Kobalt.init(MainModule(args, KobaltSettings.readSettingsXml()))
             val result = launchMain(Kobalt.INJECTOR.getInstance(Main::class.java), jc, args, argv)
             return result
@@ -47,11 +55,7 @@ class Main @Inject constructor(
             val args = Args()
             val result = JCommander(args)
             result.parse(*argv)
-            KobaltLogger.LOG_LEVEL = if (args.log < Constants.LOG_QUIET_LEVEL) {
-                Constants.LOG_DEFAULT_LEVEL
-            } else if (args.log > Constants.LOG_MAX_LEVEL) {
-                Constants.LOG_MAX_LEVEL
-            } else args.log
+            KobaltLogger.setLogLevel(args)
             return Main.RunInfo(result, args)
         }
 

src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinTemplateGenerator.kt

@@ -8,8 +8,8 @@ class KotlinTemplateGenerator : LanguageTemplateGenerator() {
     override val defaultSourceDirectories = hashSetOf("src/main/kotlin")
     override val defaultTestDirectories = hashSetOf("src/test/kotlin")
     override val mainDependencies = arrayListOf(
-            Pom.Dependency("org.jetbrains.kotlin", "kotlin-runtime", null, Constants.KOTLIN_COMPILER_VERSION),
-            Pom.Dependency("org.jetbrains.kotlin", "kotlin-stdlib", null, Constants.KOTLIN_COMPILER_VERSION))
+            Pom.Dependency("org.jetbrains.kotlin", "kotlin-stdlib", null, Constants.KOTLIN_COMPILER_VERSION)
+    )
     override val testDependencies = arrayListOf<Pom.Dependency>()
     override val directive = "project"
     override val templateName = "kotlin"

src/main/kotlin/com/beust/kobalt/app/remote/KobaltClient.kt

@@ -12,15 +12,7 @@ import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.warn
 import com.google.gson.Gson
 import com.google.inject.Guice
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import okhttp3.ResponseBody
-import okhttp3.ws.WebSocket
-import okhttp3.ws.WebSocketCall
-import okhttp3.ws.WebSocketListener
-import okio.Buffer
-import java.io.IOException
+import okhttp3.*
 
 fun main(argv: Array<String>) {
     Kobalt.INJECTOR = Guice.createInjector(MainModule(Args(), KobaltSettings.readSettingsXml()))
@@ -39,26 +31,22 @@ class KobaltClient : Runnable {
             .url("$url?projectRoot=$projectRoot&buildFile=$buildFile")
                 .build()
         var webSocket: WebSocket? = null
-        val ws = WebSocketCall.create(client, request).enqueue(object: WebSocketListener {
-            override fun onOpen(ws: WebSocket, response: Response) {
-                webSocket = ws
-            }
-
-            override fun onPong(p0: Buffer?) {
-                println("WebSocket pong")
-            }
-
-            override fun onClose(p0: Int, p1: String?) {
-                println("WebSocket closed")
-            }
-
-            override fun onFailure(ex: IOException, response: Response?) {
+        val socketListener = object: WebSocketListener() {
+            override fun onFailure(webSocket: WebSocket, ex: Throwable, response: Response?) {
                 Exceptions.printStackTrace(ex)
                 error("WebSocket failure: ${ex.message} response: $response")
             }
 
-            override fun onMessage(body: ResponseBody) {
-                val json = body.string()
+            override fun onOpen(ws: WebSocket, response: Response) {
+                webSocket = ws
+            }
+
+            override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+                println("Closing socket")
+            }
+
+            override fun onMessage(webSocket: WebSocket, text: String) {
+                val json = text
                 val wsCommand = Gson().fromJson(json, WebSocketCommand::class.java)
                 if (wsCommand.errorMessage != null) {
                     warn("Received error message from server: " + wsCommand.errorMessage)
@@ -87,7 +75,10 @@ class KobaltClient : Runnable {
                     }
                 }
             }
-        })
+        }
+
+        val ws = client.newWebSocket(request, socketListener)
+        ws.close(1000, "All good")
     }
 }
 

src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt

@@ -74,17 +74,6 @@ class KotlinCompiler @Inject constructor(
                 File(outputDir).parentFile.mkdirs()
             }
             val classpath = cp.joinToString(File.pathSeparator)
-            val allArgs = arrayListOf(
-                    "-d", outputDir,
-                    "-classpath", classpath,
-                    *(info.compilerArgs.toTypedArray()),
-                    *(info.sourceFiles.toTypedArray())
-            )
-
-            // Get rid of annoying and useless warning
-            if (! info.compilerArgs.contains("-no-stdlib")) {
-                allArgs.add("-no-stdlib")
-            }
 
             // If the Kotlin compiler version in settings.xml is different from the default, we
             // need to spawn a Kotlin compiler in a separate process. Otherwise, we can just invoke
@@ -113,13 +102,22 @@ class KotlinCompiler @Inject constructor(
                 .filterNotNull()
                 .joinToString(" ")
 
+            val infoDir = info.directory
+
+            val outputDir =
+                    if (infoDir != null) {
+                        KFiles.joinDir(infoDir, info.outputDir.path)
+                    } else {
+                        info.outputDir.path
+                    }
+
             val xFlagsArray = xFlagsString.split(" ").toTypedArray()
             val newArgs = listOf(
                     "-classpath", compilerClasspath,
                     K2JVMCompiler::class.java.name,
                     *info.compilerArgs.toTypedArray(),
                     "-classpath", classpath,
-                    "-d", info.outputDir.absolutePath,
+                    "-d", outputDir,
                     *xFlagsArray,
                     *info.sourceFiles.toTypedArray())
                 .filter { ! it.isEmpty() }

src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt

@@ -99,9 +99,10 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors, val depen
     // IClasspathContributor
 
     override fun classpathEntriesFor(project: Project?, context: KobaltContext): List<IClasspathDependency> =
-        if (project == null || accept(project)) {
+        if (project == null ||
+                context.pluginInfo.plugins.any { it is KotlinPlugin && it.settings.kobaltCompilerVersion == null }) {
             // All Kotlin projects automatically get the Kotlin runtime added to their class path
-            listOf(kotlinJarFiles.stdlib, kotlinJarFiles.runtime)
+            listOf(kotlinJarFiles.stdlib)
                     .map { FileDependency(it.absolutePath) }
         } else {
             emptyList()

src/main/resources/kobalt.properties

@@ -1 +1 @@
-kobalt.version=1.0.101
+kobalt.version=1.0.122

src/main/resources/templates/idea/KotlinJavaRuntime.xml

@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="KotlinJavaRuntime">
     <CLASSES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" />
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime-sources.jar!/" />
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

src/test/kotlin/com/beust/kobalt/BaseTest.kt

@@ -9,6 +9,7 @@ import com.beust.kobalt.internal.KobaltPluginXml
 import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.internal.build.SingleFileBuildSources
 import com.beust.kobalt.misc.KFiles
+import com.beust.kobalt.misc.KobaltLogger
 import com.beust.kobalt.misc.log
 import org.testng.annotations.BeforeClass
 import org.testng.annotations.Guice
@@ -121,6 +122,9 @@ open class BaseTest(val compilerFactory: BuildFileCompiler.IFactory? = null) {
         val main = Kobalt.INJECTOR.getInstance(Main::class.java)
         val args = Args()
         val jc = JCommander(args).apply { parse(*commandLine) }
+
+        KobaltLogger.setLogLevel(args)
+
         args.buildFile = KFiles.fixSlashes(project.file.absolutePath) + "/kobalt/src/Build.kt"
         val result = Main.launchMain(main, jc, args, arrayOf("assemble"))
         return LaunchProjectResult(project, result)

src/test/kotlin/com/beust/kobalt/VerifyKobaltZipTest.kt

@@ -67,7 +67,7 @@ class VerifyKobaltZipTest : KobaltTest() {
                 } else if (entry.name.endsWith("kobalt-wrapper.jar")) {
                     val ins = zipFile.getInputStream(entry)
                     foundWrapperJar = true
-                    assertExistence(ins, listOf("kobalt.properties"))
+                    assertExistence(ins, listOf("kobalt.properties", "com/beust/kobalt/wrapper/Main.class"))
                 }
                 entry = stream.nextEntry
             }

src/test/kotlin/com/beust/kobalt/internal/KotlinCompilerVersionTest.kt

@@ -0,0 +1,58 @@
+package com.beust.kobalt.internal
+
+import com.beust.kobalt.BaseTest
+import com.beust.kobalt.BuildFile
+import com.beust.kobalt.ProjectFile
+import com.beust.kobalt.ProjectInfo
+import com.beust.kobalt.misc.KFiles
+import org.assertj.core.api.Assertions.assertThat
+import org.testng.annotations.Test
+import java.io.File
+
+class KotlinCompilerVersionTest : BaseTest() {
+
+    @Test
+    fun shouldCompileWithExternalKotlin() {
+        val projectInfo = ProjectInfo(
+                BuildFile(
+                        listOf("com.beust.kobalt.plugin.packaging.*", "com.beust.kobalt.plugin.kotlin.kotlinCompiler"),
+                        """
+                            kotlinCompiler {
+                                version = "1.2.60"
+                            }
+                            assemble{ jar{} }
+                            """
+                ),
+                listOf(
+                        ProjectFile("src/main/kotlin/A.kt", "val a = Bob()"),
+                        ProjectFile("src/main/kotlin/Bob.java", "class Bob {  }")
+                )
+        )
+
+        val result = launchProject(projectInfo, arrayOf("assemble", "--log", "2"))
+
+        val project = result.projectDescription
+        val jarFile = File(KFiles.joinDir(project.file.absolutePath, "kobaltBuild/libs", project.name + "-"
+                + project.version + ".jar"))
+
+        assertThat(jarFile).exists()
+    }
+
+    @Test
+    fun shouldFailWhenKotlinVersionDoesNotExist() {
+        val projectInfo = ProjectInfo(
+                BuildFile(
+                        listOf("com.beust.kobalt.plugin.packaging.*", "com.beust.kobalt.plugin.kotlin.kotlinCompiler"),
+                        """
+                            kotlinCompiler { version = "1.1.20" }
+                            assemble{ jar{} }
+                            """
+                ),
+                listOf(ProjectFile("src/main/kotlin/A.kt", "val a = \"foo\""))
+        )
+
+        val result = launchProject(projectInfo, arrayOf("assemble", "--log", "2"))
+
+        assertThat(result.result).isEqualTo(1)
+    }
+}

src/test/kotlin/com/beust/kobalt/misc/MavenResolverTest.kt

@@ -1,5 +1,6 @@
 package com.beust.kobalt.misc
 
+import com.beust.kobalt.Args
 import com.beust.kobalt.BaseTest
 import com.beust.kobalt.internal.KobaltSettings
 import com.beust.kobalt.internal.KobaltSettingsXml
@@ -95,7 +96,7 @@ class MavenResolverTest : BaseTest() {
     private fun resolve(id: String): List<ArtifactResult> {
         val system = Booter.newRepositorySystem()
         val session = Booter.newRepositorySystemSession(system,
-                localRepo.localRepo, KobaltSettings(KobaltSettingsXml()), EventBus())
+                localRepo.localRepo, KobaltSettings(KobaltSettingsXml()), Args(), EventBus())
         val artifact = DefaultArtifact(id)
 
         val collectRequest = CollectRequest().apply {