.gitignore

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

README.md

@@ -1,6 +1,6 @@
 # Kobalt
 
-[<img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:OpenSourceProjects_Kobalt_Build)/statusIcon.svg">](https://teamcity.jetbrains.com/project.html?projectId=OpenSourceProjects_Kobalt&tab=projectOverview)
+[<img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:OpenSourceProjects_Kobalt_Build)/statusIcon">](https://teamcity.jetbrains.com/project.html?projectId=OpenSourceProjects_Kobalt&tab=projectOverview)
 
 
 Kobalt is a universal build system.
@@ -8,7 +8,7 @@ Kobalt is a universal build system.
 To build it:
 
 ```
-$ ./kobaltw assemble
+./kobaltw assemble
 ```
 
 Please see [the web site](http://beust.com/kobalt/) for the full documentation.

build.gradle

@@ -1,58 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,188 +0,0 @@
-#!/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

@@ -1,100 +0,0 @@
-@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,27 +21,26 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
 val bs = buildScript {
-    repos("https://dl.bintray.com/cbeust/maven")
+    repos("http://dl.bintray.com/cbeust/maven")
 }
 
 object Versions {
-    val kotlin = "1.2.71"
+    val okhttp = "3.2.0"
-    val okhttp = "3.9.1"
+    val okio = "1.6.0"
-    val okio = "1.13.0"
+    val retrofit = "2.1.0"
-    val retrofit = "2.3.0"
+    val gson = "2.6.2"
-    val gson = "2.8.2"
+    val maven = "3.3.9"
-    val guice = "4.2.2"
+    val mavenResolver = "1.0.3"
-    val maven = "3.5.2"
-    val mavenResolver = "1.1.0"
     val slf4j = "1.7.3"
+    val kotlin = "1.1.2"
     val aether = "1.0.2.v20150114"
-    val testng = "6.12"
+    val testng = "6.11"
-    val jcommander = "1.72"
 
     // JUnit 5
     val junit = "4.12"
-    val junitPlatform = "1.1.0"
+    val junitPlatform = "1.0.0-M4"
-    val junitJupiter = "5.1.0"
+    val junitJupiter = "5.0.0-M4"
+    val junitVintageVersion = "$junit.0-M4"
 }
 
 fun mavenResolver(vararg m: String)
@@ -79,7 +78,6 @@ val wrapper = project {
 
     bintray {
         publish = true
-        sign = true
     }
 
     pom = createPom(name, "Wrapper for Kobalt")
@@ -92,42 +90,41 @@ val kobaltPluginApi = project {
     version = readVersion()
     directory = "modules/kobalt-plugin-api"
     description = "A build system in Kotlin"
-    url = "https://beust.com/kobalt"
+    url = "http://beust.com/kobalt"
 
     pom = createPom(name, "A build system in Kotlin")
 
     dependencies {
         compile(
                 "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}",
-                "com.google.inject:guice:${Versions.guice}",
+                "com.google.inject:guice:4.0",
-                "com.google.inject.extensions:guice-assistedinject:4.1.0",
+                "com.google.inject.extensions:guice-assistedinject:4.0",
                 "javax.inject:javax.inject:1",
-                "com.google.guava:guava:27.0.1-jre",
+                "com.google.guava:guava:21.0",
                 "org.apache.maven:maven-model:${Versions.maven}",
-                "io.reactivex:rxjava:1.3.3",
+                "io.reactivex:rxjava:1.1.5",
                 "com.squareup.okio:okio:${Versions.okio}",
                 "com.google.code.gson:gson:${Versions.gson}",
                 "com.squareup.okhttp3:okhttp:${Versions.okhttp}",
                 "com.squareup.retrofit2:retrofit:${Versions.retrofit}",
                 "com.squareup.retrofit2:converter-gson:${Versions.retrofit}",
-                "com.beust:jcommander:${Versions.jcommander}",
+                "com.beust:jcommander:1.48",
-                "org.eclipse.jgit:org.eclipse.jgit:4.9.0.201710071750-r",
+                "org.eclipse.jgit:org.eclipse.jgit:4.5.0.201609210915-r",
                 "org.slf4j:slf4j-simple:${Versions.slf4j}",
                 *mavenResolver("api", "spi", "util", "impl", "connector-basic", "transport-http", "transport-file"),
                 "org.apache.maven:maven-aether-provider:3.3.9",
                 "org.testng.testng-remote:testng-remote:1.3.2",
                 "org.testng:testng:${Versions.testng}",
+                "commons-io:commons-io:2.5",
                 "org.junit.platform:junit-platform-surefire-provider:${Versions.junitPlatform}",
                 "org.junit.platform:junit-platform-runner:${Versions.junitPlatform}",
                 "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.junitJupiter}",
+                "org.junit.vintage:junit-vintage-engine:${Versions.junitVintageVersion}",
-                "org.apache.commons:commons-compress:1.15",
-                "commons-io:commons-io:2.6",
 
-                // Java 9
+                "org.apache.commons:commons-compress:1.13",
-                "javax.xml.bind:jaxb-api:2.3.0"
+                "commons-io:commons-io:2.5"
         )
         exclude(*aether("impl", "spi", "util", "api"))
     }
@@ -164,30 +161,24 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
         // Used by the main app
         compile(
                 "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}",
-                "com.github.spullara.mustache.java:compiler:0.9.5",
+                "com.github.spullara.mustache.java:compiler:0.9.1",
                 "javax.inject:javax.inject:1",
-                "com.google.inject:guice:${Versions.guice}",
+                "com.google.inject:guice:4.0",
-                "com.google.inject.extensions:guice-assistedinject:${Versions.guice}",
+                "com.google.inject.extensions:guice-assistedinject:4.0",
-                "com.beust:jcommander:${Versions.jcommander}",
+                "com.beust:jcommander:1.65",
                 "org.apache.maven:maven-model:${Versions.maven}",
-                "com.google.code.findbugs:jsr305:3.0.2",
+                "com.google.code.findbugs:jsr305:3.0.1",
                 "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",
+                "com.squareup.okhttp3:okhttp-ws:${Versions.okhttp}",
-                "biz.aQute.bnd:biz.aQute.bndlib:3.5.0",
+                "biz.aQute.bnd:bndlib:2.4.0",
                 *mavenResolver("spi"),
 
-                "com.squareup.okhttp3:logging-interceptor:3.9.0",
+                "com.squareup.okhttp3:logging-interceptor:3.2.0",
 
-                "com.sparkjava:spark-core:2.6.0",
+                "com.sparkjava:spark-core:2.5",
-                "org.codehaus.groovy:groovy:2.4.12",
+                "org.codehaus.groovy:groovy:2.4.8"
-
-                // Java 9
-                "javax.xml.bind:jaxb-api:2.3.0",
-                "com.sun.xml.bind:jaxb-impl:2.3.0",
-                "com.sun.xml.bind:jaxb-core:2.3.0",
-                "com.sun.activation:javax.activation:1.2.0"
 
 //                "org.eclipse.jetty:jetty-server:${Versions.jetty}",
 //                "org.eclipse.jetty:jetty-servlet:${Versions.jetty}",
@@ -203,7 +194,7 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
     dependenciesTest {
         compile("org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}",
                 "org.testng:testng:${Versions.testng}",
-                "org.assertj:assertj-core:3.8.0",
+                "org.assertj:assertj-core:3.4.1",
                 *mavenResolver("util")
                 )
     }
@@ -309,13 +300,13 @@ fun taskCopyVersionForWrapper(project: Project) : TaskResult {
 fun createPom(projectName: String, projectDescription: String) = Model().apply {
     name = projectName
     description = projectDescription
-    url = "https://beust.com/kobalt"
+    url = "http://beust.com/kobalt"
     licenses = listOf(License().apply {
         name = "Apache-2.0"
-        url = "https://www.apache.org/licenses/LICENSE-2.0"
+        url = "http://www.apache.org/licenses/LICENSE-2.0"
     })
     scm = Scm().apply {
-        url = "https://github.com/cbeust/kobalt"
+        url = "http://github.com/cbeust/kobalt"
         connection = "https://github.com/cbeust/kobalt.git"
         developerConnection = "git@github.com:cbeust/kobalt.git"
     }
@@ -323,4 +314,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.122
+kobalt.version=1.0.82

kobaltw-test

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-JAR=$(ls -1 -t kobaltBuild/libs/*.jar | grep -Ev "(sources|javadoc)" | head -1)
-TEMPDIR=$(mktemp -d)
-cp -pf "$JAR" "$TEMPDIR"
-TEMPJAR=$TEMPDIR/$(basename "$JAR")
-export KOBALT_JAR=$TEMPJAR
-java -jar "$TEMPJAR" "$@"
-rm -rf "$TEMPDIR"

modules/kobalt-plugin-api/build.gradle

@@ -1,85 +0,0 @@
-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

@@ -1,279 +0,0 @@
-<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,9 +61,6 @@ 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
 
@@ -104,8 +101,5 @@ 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.70"
+    val KOTLIN_COMPILER_VERSION = "1.1.2"
 
     internal val DEFAULT_REPOS = listOf<HostConfig>(
             //            "https://maven-central.storage.googleapis.com/",
-            HostConfig("https://repo1.maven.org/maven2/", "Maven"),
+            HostConfig("http://repo1.maven.org/maven2/", "Maven"),
             HostConfig("https://jcenter.bintray.com/", "JCenter")
-//            "https://repository.jetbrains.com/all/", // <-- contains snapshots
+//            "http://repository.jetbrains.com/all/", // <-- contains snapshots
 
             // snapshots
 //            "https://oss.sonatype.org/content/repositories/snapshots/"

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

@@ -67,7 +67,7 @@ open class Jvm constructor(
             return toolsJar
         }
         if (javaHome!!.name.equals("jre", true)) {
-            _javaHome = javaHome!!.parentFile
+            javaHome = javaHome!!.parentFile
             toolsJar = File(javaHome, "lib/tools.jar")
             if (toolsJar.exists()) {
                 return toolsJar
@@ -78,7 +78,7 @@ open class Jvm constructor(
             val version = SystemProperties.Companion.javaVersion
             if (javaHome!!.name.toRegex().matches("jre\\d+")
                     || javaHome!!.name == "jre$version") {
-                _javaHome = File(javaHome!!.parentFile, "jdk$version")
+                javaHome = File(javaHome!!.parentFile, "jdk$version")
                 toolsJar = File(javaHome, "lib/tools.jar")
                 if (toolsJar.exists()) {
                     return toolsJar

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

@@ -126,62 +126,61 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
 
     var generatedSourceDirectory: File? = null
 
-    private fun findBuildTypeBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
+//    private fun findBuildTypeBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
-        val buildTypeName = variant?.buildType?.name
+//        val buildTypeName = variant?.buildType?.name
-        return project.buildTypes[buildTypeName]?.buildConfig
+//        return project.buildTypes[buildTypeName]?.buildConfig
-    }
+//    }
-
+//
-    private fun findProductFlavorBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
+//    private fun findProductFlavorBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
-        val buildTypeName = variant?.productFlavor?.name
+//        val buildTypeName = variant?.productFlavor?.name
-        return project.productFlavors[buildTypeName]?.buildConfig
+//        return project.productFlavors[buildTypeName]?.buildConfig
-    }
+//    }
 
     /**
      * Return a list of the BuildConfigs found on the productFlavor{}, buildType{} and project{} (in that order).
      */
-    private fun findBuildConfigs(project: Project, variant: Variant?) : List<BuildConfig> {
+//    private fun findBuildConfigs(project: Project, variant: Variant?) : List<BuildConfig> {
-        val result = listOf(
+//        val result = listOf(
-                findBuildTypeBuildConfig(project, variant),
+//                findBuildTypeBuildConfig(project, variant),
-                findProductFlavorBuildConfig(project, variant),
+//                findProductFlavorBuildConfig(project, variant),
-                project.buildConfig)
+//                project.buildConfig)
-            .filterNotNull()
+//            .filterNotNull()
-
+//
-        return result
+//        return result
-    }
+//    }
 
     /**
      * Generate BuildConfig.java if requested. Also look up if any BuildConfig is defined on the current build type,
      * product flavor or main project, and use them to generateAndSave any additional field (in that order to
      * respect the priorities). Return the generated file if it was generated, null otherwise.
      */
-    fun maybeGenerateBuildConfig(project: Project, context: KobaltContext) : File? {
+//    fun maybeGenerateBuildConfig(project: Project, context: KobaltContext) : File? {
-        val buildConfigs = findBuildConfigs(project, this)
+//        val buildConfigs = findBuildConfigs(project, this)
-
+//
-        if (buildConfigs.size > 0) {
+//        if (buildConfigs.size > 0) {
-            val pkg = project.packageName ?: project.group
+//            val pkg = project.packageName ?: project.group
-                    ?: throw KobaltException(
+//                    ?: throw KobaltException(
-                    "packageName needs to be defined on the project in order to generateAndSave BuildConfig")
+//                    "packageName needs to be defined on the project in order to generateAndSave BuildConfig")
-
+//
-            val contributor = ActorUtils.selectAffinityActor(project, context,
+//            val contributor = ActorUtils.selectAffinityActor(context.pluginInfo.buildConfigContributors, project)
-                    context.pluginInfo.buildConfigContributors)
+//            if (contributor != null) {
-            if (contributor != null) {
+//                val code = contributor.generateBuildConfig(project, context, pkg, this, buildConfigs)
-                val code = contributor.generateBuildConfig(project, context, pkg, this, buildConfigs)
+//                val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig"))
-                val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig"))
+//                // Make sure the generatedSourceDirectory doesn't contain the project.directory since
-                // Make sure the generatedSourceDirectory doesn't contain the project.directory since
+//                // that directory will be added when trying to find recursively all the sources in it
-                // that directory will be added when trying to find recursively all the sources in it
+//                generatedSourceDirectory = result.relativeTo(File(project.directory))
-                generatedSourceDirectory = result.relativeTo(File(project.directory))
+//                val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar))
-                val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar))
+//                val outputDir = File(outputGeneratedSourceDirectory, "BuildConfig." + contributor.buildConfigSuffix)
-                val outputDir = File(outputGeneratedSourceDirectory, "BuildConfig." + contributor.buildConfigSuffix)
+//                KFiles.saveFile(outputDir, code)
-                KFiles.saveFile(outputDir, code)
+//                context.logger.log(project.name, 2, "Generated ${outputDir.path}")
-                context.logger.log(project.name, 2, "Generated ${outputDir.path}")
+//                return result
-                return result
+//            } else {
-            } else {
+//                throw KobaltException("Couldn't find a contributor to generateAndSave BuildConfig")
-                throw KobaltException("Couldn't find a contributor to generateAndSave BuildConfig")
+//            }
-            }
+//        } else {
-        } else {
+//            return null
-            return null
+//        }
-        }
+//    }
-    }
 
     override fun toString() = toTask("")
 

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

@@ -5,7 +5,7 @@ import com.beust.kobalt.Variant
 /**
  * Plug-ins that can generate a BuildConfig file.
  */
-interface IBuildConfigContributor : IProjectAffinity {
+interface IBuildConfigContributor : ISimpleAffinity<Project> {
     fun generateBuildConfig(project: Project, context: KobaltContext, packageName: String, variant: Variant,
             buildConfigs: List<BuildConfig>) : String
 

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

@@ -17,8 +17,7 @@ class Archives {
         @ExportedProjectProperty(doc = "The name of the a jar file with a main() method", type = "String")
         const val JAR_NAME_WITH_MAIN_CLASS = "jarNameWithMainClass"
 
-        fun defaultArchiveName(project: Project) = project.name +
+        fun defaultArchiveName(project: Project) = project.name + "-" + project.version
-            if (project.version.isNullOrBlank()) "" else "-${project.version}"
 
         fun generateArchive(project: Project,
                 context: KobaltContext,

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

@@ -9,6 +9,7 @@ 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
 
@@ -18,39 +19,18 @@ import org.apache.commons.compress.archivers.zip.ZipFile as ApacheZipFile
  */
 class MetaArchive(outputFile: File, val manifest: Manifest?) : Closeable {
     companion object {
-        const val MANIFEST_MF = "META-INF/MANIFEST.MF"
+        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)
                 }
@@ -58,30 +38,6 @@ 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
@@ -93,33 +49,40 @@ 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 {
+    private fun okToAdd(name: String): Boolean = ! seen.contains(name)
-        val result = !KFiles.isExcluded(name,
+            && ! KFiles.isExcluded(name, DEFAULT_JAR_EXCLUDES)
-                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")
+    override fun close() {
-        return result
+        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()
     }
 
-    override fun close() = zos.close()
+    private fun addEntry(entry: ArchiveEntry, inputStream: FileInputStream) {
-
-    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) {
-        entry.name.let { name ->
+        if (okToAdd(entry.name)) {
-            if (!seen.contains(name) && okToAdd(name)) {
+            action()
-                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 = "https://beust.com/kobalt/"
+        private const val HOST = "http://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,11 +112,10 @@ 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) {
@@ -137,7 +136,12 @@ 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()
-                errorCode = process.waitFor()
+                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")
+                }
                 result = result || errorCode == 0
             } else {
                 context.logger.log(project.name, 1, "  No tests to run")
@@ -148,13 +152,6 @@ 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,8 +35,7 @@ class JUnit5Runner @Inject constructor(kFiles: KFiles) : GenericTestRunner() {
 
     override fun affinity(project: Project, context: KobaltContext) : Int {
         val result =
-                if (project.testDependencies.any { it.id.contains("junit5") || it.id.contains("jupiter") })
+                if (project.testDependencies.any { it.id.contains("jupiter") }) IAffinity.DEFAULT_POSITIVE_AFFINITY + 100
-                    IAffinity.DEFAULT_POSITIVE_AFFINITY + 100
                 else 0
         return result
 

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

@@ -157,10 +157,6 @@ open class JvmCompilerPlugin @Inject constructor(
         if (compilerContributors.isEmpty()) {
             throw KobaltException("Couldn't find any compiler for project ${project.name}")
         } else {
-
-            // Generate BuildConfig if applicable
-            context.variant.maybeGenerateBuildConfig(project, context)
-
             val allCompilers = compilerContributors.flatMap { it.compilersFor(project, context)}.sorted()
 
             /**
@@ -187,8 +183,8 @@ open class JvmCompilerPlugin @Inject constructor(
             var done = false
             // The directory where the classes get compiled
             val buildDirectory =
-                    if (isTest) File(KFiles.joinDir(project.buildDirectory, KFiles.TEST_CLASSES_DIR))
+                    if (isTest) File(project.buildDirectory, KFiles.TEST_CLASSES_DIR)
-                    else File(KFiles.joinDir(project.classesDir(context)))
+                    else File(project.classesDir(context))
 
             allCompilersSorted.doWhile({ ! done }) { compiler ->
                 val compilerResults = compilerUtils.invokeCompiler(project, context, compiler,
@@ -226,7 +222,7 @@ open class JvmCompilerPlugin @Inject constructor(
     }
 
     @Task(name = "doc", description = "Generate the documentation for the project", group = GROUP_DOCUMENTATION,
-            runBefore = arrayOf("assemble"), runAfter = arrayOf("clean"))
+            runBefore = arrayOf("assemble"))
     fun taskJavadoc(project: Project): TaskResult {
         val docGenerator = ActorUtils.selectAffinityActor(project, context, context.pluginInfo.docContributors)
         if (docGenerator != null) {

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

@@ -16,5 +16,6 @@ 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,14 +14,11 @@ 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() {
 
@@ -30,10 +27,7 @@ class TestNgRunner : GenericTestRunner() {
     override val annotationPackage = "org.testng"
     override val runnerName = "TestNG"
 
-    private fun defaultOutputWithoutProjectDir(project: Project)
+    fun defaultOutput(project: Project) = KFiles.joinDir(project.buildDirectory, "test-output")
-            = 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 {
@@ -45,9 +39,7 @@ class TestNgRunner : GenericTestRunner() {
 
         if (testConfig.testArgs.none { it == "-d" }) {
             add("-d")
-            // Don't include the project directory here since the generic runner will cd to that directory before
+            add(defaultOutput(project))
-            // running the tests
-            add(defaultOutputWithoutProjectDir(project))
         }
 
         if (testConfig.testArgs.size == 0) {
@@ -85,15 +77,6 @@ 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) {
@@ -107,7 +90,6 @@ 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/Gpg.kt

@@ -1,18 +1,16 @@
 package com.beust.kobalt.maven
 
 import com.beust.kobalt.OperatingSystem
-import com.beust.kobalt.misc.LocalProperties
 import com.beust.kobalt.misc.error
 import com.beust.kobalt.misc.kobaltLog
 import com.beust.kobalt.misc.warn
-import com.google.inject.Inject
 import com.google.inject.Singleton
 import java.io.BufferedReader
 import java.io.File
 import java.io.InputStreamReader
 
 @Singleton
-class Gpg @Inject constructor(val localProperties: LocalProperties) {
+class Gpg {
     val COMMANDS = listOf("gpg", "gpg2")
 
      fun findGpgCommand() : String? {
@@ -44,21 +42,6 @@ class Gpg @Inject constructor(val localProperties: LocalProperties) {
                 ascFile.delete()
                 val allArgs = arrayListOf<String>()
                 allArgs.add(gpg)
-
-                fun maybeAdd(prop: String, f: (String) -> Unit) = localProperties.getNoThrows(prop)?.let {
-                    f(it)
-                }
-
-                maybeAdd("gpg.password") {
-                    allArgs.addAll(listOf("--passphrase", it, "--batch", "--yes"))
-                }
-                maybeAdd("gpg.keyId") {
-                    allArgs.addAll(listOf("--local-user", it))
-                }
-                maybeAdd("gpg.secretKeyRingFile") {
-                    allArgs.addAll(listOf("--secret-keyring", "\"$it\""))
-                }
-
                 allArgs.add("-ab")
                 allArgs.add(file.absolutePath)
 

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

@@ -2,7 +2,6 @@ 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
@@ -33,9 +32,8 @@ object Booter {
 //    }
 
     fun newRepositorySystemSession(system: RepositorySystem, repo: File, settings: KobaltSettings,
-            args: Args, eventBus: EventBus): DefaultRepositorySystemSession {
+            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 = "https://beust.com/kobalt/documentation/index.html#maven-repos-authenticated")
+                        docUrl = "http://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, args, eventBus)
+    private val session = Booter.newRepositorySystemSession(system, localRepo.localRepo, settings, 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/Git.kt

@@ -6,11 +6,10 @@ import com.google.inject.Inject
 import java.io.File
 
 class Git @Inject constructor() {
-    fun maybeTagRelease(project: Project, uploadResult: TaskResult, enabled: Boolean, annotated: Boolean,
+    fun maybeTagRelease(project: Project, uploadResult: TaskResult, enabled: Boolean, annotated: Boolean, tag: String, message: String) : TaskResult {
-                        push: Boolean, tag: String, message: String) : TaskResult {
         val result =
                 if (uploadResult.success && enabled) {
-                    val tagSuccess = tagRelease(project, annotated, push, tag, message)
+                    val tagSuccess = tagRelease(project, annotated, tag, message)
                     if (! tagSuccess) {
                         TaskResult(false, errorMessage  = "Couldn't tag the project")
                     } else {
@@ -22,7 +21,7 @@ class Git @Inject constructor() {
         return result
     }
 
-    private fun tagRelease(project: Project, annotated: Boolean, push: Boolean, tag: String, message: String) : Boolean {
+    private fun tagRelease(project: Project, annotated: Boolean, tag: String, message: String) : Boolean {
         val version = if (tag.isNullOrBlank()) project.version else tag
         val success = try {
             log(2, "Tagging this release as \"$version\"")
@@ -38,9 +37,7 @@ class Git @Inject constructor() {
             } else {
                 git.tag().setName(version).setMessage(message).call()
             }
-            if (push) {
+            git.push().setPushTags().call()
-                git.push().setPushTags().call()
-            }
             true
         } catch(ex: Exception) {
             warn("Couldn't create tag ${version}: ${ex.message}", ex)

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

@@ -86,12 +86,12 @@ class GithubApi2 @Inject constructor(
                 .execute()
         val code = response.code()
         if (code != Http.CREATED) {
-            val error = Gson().fromJson(response.errorBody()?.string(), RetrofitError::class.java)
+            val error = Gson().fromJson(response.errorBody().string(), RetrofitError::class.java)
             throw KobaltException("Couldn't upload release, ${error.message}: " + error.errors[0].code)
         } else {
             val body = response.body()
 
-            uploadAsset(accessToken, body?.uploadUrl!!, Http.TypedFile("application/zip", zipFile), tagName)
+            uploadAsset(accessToken, body.uploadUrl!!, Http.TypedFile("application/zip", zipFile), tagName)
                     .toBlocking()
                 .forEach { action ->
                     kobaltLog(1, "\n${zipFile.name} successfully uploaded")
@@ -120,8 +120,8 @@ class GithubApi2 @Inject constructor(
                         Duration.between(VersionCheckTimestampFile.timestamp, Instant.now())) {
                     kobaltLog(2, "Skipping GitHub latest release check, too soon.")
                 } else {
-                    val username = localProperties.getNoThrows(PROPERTY_USERNAME)
+                    val username = localProperties.getNoThrows(PROPERTY_USERNAME, DOC_URL)
-                    val accessToken = localProperties.getNoThrows(PROPERTY_ACCESS_TOKEN)
+                    val accessToken = localProperties.getNoThrows(PROPERTY_ACCESS_TOKEN, DOC_URL)
                     try {
                         val req =
                                 if (username != null && accessToken != null) {
@@ -138,8 +138,8 @@ class GithubApi2 @Inject constructor(
                             val releases = ex.body()
                             if (releases != null) {
                                 releases.firstOrNull()?.let {
-                                    result = try {
+                                    try {
-                                        listOf(it.name, it.tagName).filterNotNull().first { !it.isBlank() }
+                                        result = listOf(it.name, it.tagName).filterNotNull().first { !it.isBlank() }
                                     } catch(ex: NoSuchElementException) {
                                         throw KobaltException("Couldn't find the latest release")
                                     }

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

@@ -55,13 +55,10 @@ class KFiles {
                     val previousVersion = latestInstalledVersion().version
                     val previousJar = joinDir(distributionsDir, "kobalt-" + previousVersion,
                             "kobalt/wrapper/kobalt-$previousVersion.jar")
-                    latestInstalledVersion()
+                    val v = latestInstalledVersion()
                     val result = listOf("", "modules/kobalt-plugin-api", "modules/wrapper").map {
-                        File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "kobaltBuild", "classes"))) //kobalt build dirs
+                        File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "kobaltBuild", "classes")))
-                                .absolutePath
+                            .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() }
@@ -137,7 +134,7 @@ class KFiles {
         fun joinFileAndMakeDir(vararg ts: String) = joinDir(joinAndMakeDir(ts.slice(0..ts.size - 2)), ts[ts.size - 1])
 
         fun fixSlashes(f: File) = f.normalize().path.replace('\\', '/')
-        fun fixSlashes(s: String) = s.replace('\\', '/')
+        fun fixSlashes(s: String) = fixSlashes(File(s))
 
         fun makeDir(dir: String, s: String? = null) =
                 (if (s != null) File(dir, s) else File(dir)).apply { mkdirs() }

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,14 +60,6 @@ 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) =
-            "https://beust.com/kobalt/kobalt-$version.zip"
+            "http://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/LocalProperties.kt

@@ -6,9 +6,6 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.*
 
-/**
- * Encapsulate read access to local.properties.
- */
 @Singleton
 class LocalProperties {
     val localProperties: Properties by lazy {
@@ -25,11 +22,11 @@ class LocalProperties {
         result
     }
 
-    fun getNoThrows(name: String): String? = localProperties.getProperty(name)
+    fun getNoThrows(name: String, docUrl: String? = null) = localProperties.getProperty(name)
 
     fun get(name: String, docUrl: String? = null) : String {
-        val result = getNoThrows(name)
+        val result = getNoThrows(name, docUrl)
                 ?: throw KobaltException("Couldn't find $name in local.properties", docUrl = docUrl)
-        return result
+        return result as String
     }
 }

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

@@ -19,7 +19,6 @@ class RunCommandInfo {
      */
     var useErrorStreamAsErrorIndicator : Boolean = true
     var useInputStreamAsErrorIndicator : Boolean = false
-    var ignoreExitValue : Boolean = false
 
     var errorCallback: Function1<List<String>, Unit> = NewRunCommand.DEFAULT_ERROR
     var successCallback: Function1<List<String>, Unit> = NewRunCommand.DEFAULT_SUCCESS
@@ -79,11 +78,7 @@ open class NewRunCommand(val info: RunCommandInfo) {
         val process = pb.start()
 
         // Run the command and collect the return code and streams
-        val processFinished = process.waitFor(120, TimeUnit.SECONDS)
+        val returnCode = process.waitFor(30, TimeUnit.SECONDS)
-
-        if (!processFinished)
-            kobaltError("process timed out!")
-
         val input =
                 if (process.inputStream.available() > 0) fromStream(process.inputStream)
                 else listOf()
@@ -91,19 +86,13 @@ 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 processFinished, input, error)
+                else isSuccess(returnCode, input, error)
 
         if (isSuccess) {
-            if (!info.useErrorStreamAsErrorIndicator) {
+            info.successCallback(input)
-                info.successCallback(error + input)
-            } else {
-                info.successCallback(input)
-            }
         } else {
             info.errorCallback(error + input)
         }
@@ -116,7 +105,7 @@ open class NewRunCommand(val info: RunCommandInfo) {
      * have various ways to signal errors.
      */
     open protected fun isSuccess(isSuccess: Boolean, input: List<String>, error: List<String>) : Boolean {
-        var hasErrors: Boolean = ! isSuccess
+        var hasErrors = ! isSuccess
         if (info.useErrorStreamAsErrorIndicator && ! hasErrors) {
             hasErrors = hasErrors || error.isNotEmpty()
         }

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

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

modules/kobalt/build.gradle

@@ -1,79 +0,0 @@
-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

@@ -1,231 +0,0 @@
-<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

@@ -1,38 +0,0 @@
-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

@@ -1,28 +0,0 @@
-<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,6 +47,7 @@ public class Main {
 
     private int installAndLaunchMain(String[] argv) throws IOException, InterruptedException {
         String version = getVersion();
+        initWrapperFile(version);
 
         List<String> kobaltArgv = new ArrayList<>();
         boolean noLaunch = false;
@@ -77,7 +78,6 @@ 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 "https://beust.com/kobalt/kobalt-" + version + ".zip";
+        return "http://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, "N/A");
+        return wrapperProperties.getProperty(PROPERTY_VERSION);
     }
 
     private String getWrapperDownloadUrl(String version) {

pom.xml

@@ -1,34 +0,0 @@
-<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

@@ -1,5 +0,0 @@
-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,14 +38,6 @@ 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
@@ -55,7 +47,11 @@ class Main @Inject constructor(
             val args = Args()
             val result = JCommander(args)
             result.parse(*argv)
-            KobaltLogger.setLogLevel(args)
+            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
             return Main.RunInfo(result, args)
         }
 

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

@@ -20,8 +20,6 @@ abstract class LanguageTemplateGenerator : ITemplate {
 
     abstract val defaultSourceDirectories : HashSet<String>
     abstract val defaultTestDirectories : HashSet<String>
-    abstract val mainDependencies : ArrayList<Pom.Dependency>
-    abstract val testDependencies : ArrayList<Pom.Dependency>
     abstract val directive : String
     abstract val fileMatch : (String) -> Boolean
     abstract val fileMap: List<FileInfo>
@@ -133,19 +131,20 @@ abstract class LanguageTemplateGenerator : ITemplate {
                 put("directory", currentDir.absolutePath)
                 put("sourceDirectories", defaultSourceDirectories)
                 put("sourceDirectoriesTest", defaultTestDirectories)
-                put("mainDependencies", mainDependencies)
-                put("testDependencies", testDependencies)
                 put("imports", "import com.beust.kobalt.plugin.$templateName.*")
                 put("directive", "project")
             }
 
+            var mainDeps = arrayListOf<Pom.Dependency>()
+            var testDeps = arrayListOf<Pom.Dependency>()
+            map.put("mainDependencies", mainDeps)
+            map.put("testDependencies", testDeps)
             File("pom.xml").let {
                 if (it.absoluteFile.exists()) {
-                    importPom(it, mainDependencies, testDependencies, map)
+                    importPom(it, mainDeps, testDeps, map)
                 }
             }
 
-
             val fileInputStream = javaClass.classLoader
                     .getResource(ITemplateContributor.DIRECTORY_NAME + "/build.mustache").openStream()
             val sw = StringWriter()

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

@@ -56,7 +56,7 @@ class Profiles(val context: KobaltContext) {
                     val variable = if (match.first) match.second else oldMatch.second
 
                     if (oldMatch.first) {
-                        warn("Old profile syntax detected for \"${line.trim()}\"," +
+                        warn("Old profile syntax detected for \"$line\"," +
                                 " please update to \"val $variable by profile()\"")
                     }
 

src/main/kotlin/com/beust/kobalt/app/java/JavaTemplateGenerator.kt

@@ -1,14 +1,11 @@
 package com.beust.kobalt.app.java
 
 import com.beust.kobalt.app.LanguageTemplateGenerator
-import com.beust.kobalt.maven.Pom
 
 /**
  * Template for the "java" generator.
  */
 class JavaTemplateGenerator : LanguageTemplateGenerator() {
-    override val mainDependencies = arrayListOf<Pom.Dependency>()
-    override val testDependencies = arrayListOf<Pom.Dependency>()
     override val defaultSourceDirectories = hashSetOf("src/main/java")
     override val defaultTestDirectories = hashSetOf("src/test/java")
     override val directive = "project"

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

@@ -1,16 +1,10 @@
 package com.beust.kobalt.app.kotlin
 
-import com.beust.kobalt.Constants
 import com.beust.kobalt.app.LanguageTemplateGenerator
-import com.beust.kobalt.maven.Pom
 
 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-stdlib", null, Constants.KOTLIN_COMPILER_VERSION)
-    )
-    override val testDependencies = arrayListOf<Pom.Dependency>()
     override val directive = "project"
     override val templateName = "kotlin"
     override val templateDescription = "Generate a simple Kotlin project"

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

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

src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt

@@ -17,6 +17,7 @@ import com.beust.kobalt.plugin.packaging.PackageConfig
 import com.beust.kobalt.plugin.packaging.PackagingPlugin
 import com.google.inject.Inject
 import com.google.inject.Singleton
+import org.jetbrains.kotlin.config.TargetPlatformVersion.NoVersion.description
 import java.io.File
 
 class ApplicationConfig {
@@ -33,15 +34,6 @@ class ApplicationConfig {
     @Directive
     fun args(vararg argv: String) = argv.forEach { args.add(it) }
     val args = arrayListOf<String>()
-
-    @Directive
-    var ignoreErrorStream: Boolean = false
-
-    @Directive
-    var ignoreInputStream: Boolean = true
-
-    @Directive
-    var ignoreExitValue: Boolean = false
 }
 
 @Directive
@@ -147,7 +139,6 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigsActor<Applic
         val exitCode = runCommand {
             command = "java"
             args = allArgs
-            useErrorStreamAsErrorIndicator = false
             directory = File(project.directory)
             successCallback = { output: List<String> ->
                 kobaltLog(1, output.joinToString("\n"))
@@ -156,9 +147,6 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigsActor<Applic
                 kobaltLog(1, "ERROR")
                 kobaltLog(1, output.joinToString("\n"))
             }
-            useErrorStreamAsErrorIndicator = !config.ignoreErrorStream
-            useInputStreamAsErrorIndicator = !config.ignoreInputStream
-            ignoreExitValue = config.ignoreExitValue
         }
         return TaskResult(exitCode == 0)
     }

src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt

@@ -41,15 +41,17 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
 
     override val name = PLUGIN_NAME
 
+    var kaptConfig: KaptConfig? = null
+
     override fun apply(project: Project, context: KobaltContext) {
         super.apply(project, context)
-        val kaptConfig = kaptConfigs[project.name]
+        kaptConfig = kaptConfigs[project.name]
 
         // Delete the output directories
         listOf(aptConfigs[project.name]?.outputDir, kaptConfig?.outputDir)
             .filterNotNull()
             .distinct()
-            .map { aptGeneratedDir(project, it) }
+            .map { generatedDir(project, it) }
             .forEach {
                 it.normalize().absolutePath.let { path ->
                     context.logger.log(project.name, 1, "  Deleting " + path)
@@ -62,10 +64,9 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
     // IClasspathContributor
     override fun classpathEntriesFor(project: Project?, context: KobaltContext): Collection<IClasspathDependency> {
         val result = arrayListOf<IClasspathDependency>()
-        val kaptConfig = kaptConfigs[project?.name]
         if (project != null && kaptConfig != null) {
-            kaptConfig.let { config ->
+            kaptConfig?.let { config ->
-                val c = kaptClassesDir(project, config.outputDir)
+                val c = generatedClasses(project, context, config.outputDir)
                 File(c).mkdirs()
                 result.add(FileDependency(c))
             }
@@ -73,46 +74,45 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
         return result
     }
 
-    private fun aptGeneratedDir(project: Project, outputDir: String) : File
+    private fun generatedDir(project: Project, outputDir: String) : File
             = File(KFiles.joinDir(project.directory, KFiles.KOBALT_BUILD_DIR, outputDir))
 
     // ISourceDirectoryContributor
     override fun sourceDirectoriesFor(project: Project, context: KobaltContext): List<File> {
         val result = arrayListOf<File>()
         aptConfigs[project.name]?.let { config ->
-            result.add(aptGeneratedDir(project, config.outputDir))
+            result.add(generatedDir(project, config.outputDir))
         }
 
         kaptConfigs[project.name]?.let { config ->
-            result.add(File(kaptSourcesDir(project, config.outputDir)))
+            result.add(File(generatedSources(project, context, config.outputDir)))
         }
 
         return result
     }
 
-    private fun kaptGenerated(project: Project, outputDir: String) =
+    private fun generated(project: Project, context: KobaltContext, outputDir: String) =
             KFiles.joinAndMakeDir(project.directory, project.buildDirectory, outputDir)
 
-    private fun kaptSourcesDir(project: Project, outputDir: String) =
+    private fun generatedSources(project: Project, context: KobaltContext, outputDir: String) =
-            KFiles.joinDir(kaptGenerated(project, outputDir), "sources")
+            KFiles.joinDir(generated(project, context, outputDir), "sources")
-    private fun kaptStubsDir(project: Project, outputDir: String) =
+    private fun generatedStubs(project: Project, context: KobaltContext, outputDir: String) =
-            KFiles.joinDir(kaptGenerated(project, outputDir), "stubs")
+            KFiles.joinDir(generated(project, context, outputDir), "stubs")
-    private fun kaptClassesDir(project: Project, outputDir: String) =
+    private fun generatedClasses(project: Project, context: KobaltContext, outputDir: String) =
-            KFiles.joinDir(kaptGenerated(project, outputDir), "classes")
+            KFiles.joinDir(generated(project, context, outputDir), "classes")
 
     // ITaskContributor
     override fun tasksFor(project: Project, context: KobaltContext): List<DynamicTask> {
-        val kaptConfig = kaptConfigs[project.name]
         val result =
             if (kaptConfig != null) {
                 listOf(
                     DynamicTask(this, "runKapt", "Run kapt", AnnotationDefault.GROUP, project,
                         reverseDependsOn = listOf("compile"), runAfter = listOf("clean"),
-                        closure = {p: Project -> taskRunKapt(p)}),
+                            closure = {p: Project -> taskRunKapt(p)}),
                     DynamicTask(this, "compileKapt", "Compile the sources generated by kapt",
                         AnnotationDefault.GROUP, project,
                         dependsOn = listOf("runKapt"), reverseDependsOn = listOf("compile"),
-                        closure = {p: Project -> taskCompileKapt(p)})
+                            closure = {p: Project -> taskCompileKapt(p)})
                 )
             } else {
                 emptyList()
@@ -124,11 +124,11 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
         var success = true
         kaptConfigs[project.name]?.let { config ->
             val sourceDirs = listOf(
-                    kaptStubsDir(project, config.outputDir),
+                    generatedStubs(project, context, config.outputDir),
-                    kaptSourcesDir(project, config.outputDir))
+                    generatedSources(project, context, config.outputDir))
             val sourceFiles = KFiles.findSourceFiles(project.directory, sourceDirs, listOf("kt")).toList()
             val buildDirectory = File(KFiles.joinDir(project.directory,
-                    kaptClassesDir(project, config.outputDir)))
+                    generatedClasses(project, context, config.outputDir)))
             val flags = listOf<String>()
             val cai = CompilerActionInfo(project.directory, allDependencies(project), sourceFiles, listOf(".kt"),
                     buildDirectory, flags, emptyList(), forceRecompile = true, compilerSeparateProcess = true)
@@ -158,10 +158,9 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
     fun taskRunKapt(project: Project) : TaskResult {
         var success = true
         val flags = arrayListOf<String>()
-        val kaptConfig = kaptConfigs[project.name]
         kaptConfig?.let { config ->
-            val generated = kaptGenerated(project, config.outputDir)
+            val generated = generated(project, context, config.outputDir)
-            val generatedSources = kaptSourcesDir(project, config.outputDir).replace("//", "/")
+            val generatedSources = generatedSources(project, context, config.outputDir).replace("//", "/")
             File(generatedSources).mkdirs()
 
             //
@@ -192,8 +191,8 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
             val kaptPluginFlags = arrayListOf<String>()
             val verbose = KobaltLogger.LOG_LEVEL >= 2
             listOf("sources=" + generatedSources,
-                    "classes=" + kaptClassesDir(project, config.outputDir),
+                    "classes=" + generatedClasses(project, context, config.outputDir),
-                    "stubs=" + kaptStubsDir(project, config.outputDir),
+                    "stubs=" + generatedStubs(project, context, config.outputDir),
                     "verbose=$verbose",
                     "aptOnly=true").forEach {
                 kaptPluginFlags.add(kaptPluginFlag(it))
@@ -244,9 +243,9 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
         fun addFlags(outputDir: String) {
             aptDependencies[project.name]?.let {
                 result.add("-s")
-                aptGeneratedDir(project, outputDir).let { generatedSource ->
+                generatedSources(project, context, outputDir).let { generatedSource ->
-                    generatedSource.mkdirs()
+                    File(generatedSource).mkdirs()
-                    result.add(generatedSource.path)
+                    result.add(generatedSource)
                 }
             }
         }

src/main/kotlin/com/beust/kobalt/plugin/java/JavadocConfig.kt

@@ -62,7 +62,7 @@ class JavadocConfig(val project: Project) {
         }
     }
 
-    private fun addPair(option: String, first: String, second: String) {
+    private fun addOptions(option: String, first: String, second: String) {
         if (first.isNotEmpty() && second.isNotEmpty()) {
             args.add("-$option")
             args.add("\"$first\"")
@@ -320,8 +320,8 @@ class JavadocConfig(val project: Project) {
      */
     var title: String = ""
         set(value) {
-            windowTitle = value
+            addString("windowtitle", value)
-            docTitle = value
+            addString("doctitle", value)
         }
 
     /**
@@ -543,12 +543,12 @@ class JavadocConfig(val project: Project) {
     /**
      * @see <a href="http://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDIGGII">-group</a>
      */
-    fun group(groupHeading: String, packagePattern: String) = addPair("group", groupHeading, packagePattern)
+    fun group(groupHeading: String, packagePattern: String) = addOptions("group", groupHeading, packagePattern)
 
     /**
      * @see <a href="http://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDFIIJH">-linkoffline</a>
      */
-    fun linkOffline(extdocURL: String, packagelistLoc: String) = addPair("linkoffline", extdocURL, packagelistLoc)
+    fun linkOffline(extdocURL: String, packagelistLoc: String) = addOptions("linkoffline", extdocURL, packagelistLoc)
 
     /**
      * @see <a href="http://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDEDJFI">-link</a>
@@ -582,7 +582,6 @@ fun main(args: Array<String>) {
     }
 
     val config = JavadocConfig(Project())
-    config.title = "This is a test."
     config.verbose = true
     config.quiet = false
     config.links("http://docs.oracle.com/javase/8/docs/api/")

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

@@ -8,12 +8,10 @@ import com.beust.kobalt.maven.dependency.FileDependency
 import com.beust.kobalt.misc.*
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
-import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.incremental.ICReporter
 import org.jetbrains.kotlin.incremental.makeIncrementally
@@ -74,18 +72,29 @@ 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
             // the K2JVMCompiler class directly
             val actualVersion = kotlinVersion(project)
 
-            return if (settings.kobaltCompilerSeparateProcess || actualVersion != Constants.KOTLIN_COMPILER_VERSION
+            if (settings.kobaltCompilerSeparateProcess || actualVersion != Constants.KOTLIN_COMPILER_VERSION
                     || info.compilerSeparateProcess) {
-                invokeCompilerInSeparateProcess(classpath, info, actualVersion, project)
+                return invokeCompilerInSeparateProcess(classpath, info, actualVersion, project)
 
             } else {
-                invokeCompilerDirectly(project, projectName ?: "kobalt-" + Random().nextInt(), outputDir,
+                return invokeCompilerDirectly(project, projectName ?: "kobalt-" + Random().nextInt(), outputDir,
                         info, classpath, filesToCompile)
             }
         }
@@ -102,22 +111,13 @@ class KotlinCompiler @Inject constructor(
                 .filterNotNull()
                 .joinToString(" ")
 
-            val infoDir = info.directory
+            val xFlagsArray = xFlagsString.split(" ").toTypedArray() ?: emptyArray()
-
-            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", outputDir,
+                    "-d", info.outputDir.absolutePath,
                     *xFlagsArray,
                     *info.sourceFiles.toTypedArray())
                 .filter { ! it.isEmpty() }
@@ -145,17 +145,17 @@ class KotlinCompiler @Inject constructor(
             // Collect the compiler args from kotlinCompiler{} and from settings.xml and parse them
             val args2 =
                     info.compilerArgs +
-                    (settings.kobaltCompilerFlags?.split(" ") ?: listOf())
+                    (settings.kobaltCompilerFlags?.split(" ") ?: listOf<String>())
             val args = K2JVMCompilerArguments()
             val compiler = K2JVMCompiler()
-            parseCommandLineArguments(args2, args)
+            compiler.parseArguments(args2.toTypedArray(), args)
 
             // Override important arguments with our values
             args.apply {
                 moduleName = projectName
                 destination = outputDir
                 classpath = classpathString
-                freeArgs = sourceFiles.toMutableList()
+                freeArgs = sourceFiles
                 friendPaths = friends
             }
 
@@ -179,12 +179,12 @@ class KotlinCompiler @Inject constructor(
                         "single-module" -> args.singleModule = true
                         "load-builtins-from-dependencies" -> args.loadBuiltInsFromDependencies = true
 
-                        "coroutines=enable" -> args.coroutinesState = LanguageFeature.State.ENABLED.name
+                        "coroutines=enable" -> args.coroutinesEnable = true
-                        "coroutines=warn" -> args.coroutinesState = LanguageFeature.State.ENABLED_WITH_WARNING.name
+                        "coroutines=warn" -> args.coroutinesWarn = true
-                        "coroutines=error" -> args.coroutinesState = LanguageFeature.State.ENABLED_WITH_ERROR.name
+                        "coroutines=error" -> args.coroutinesError = true
                         "no-inline" -> args.noInline = true
                         "multi-platform" -> args.multiPlatform = true
-//                        "no-check-impl" -> args.noCheckImpl = true
+                        "no-check-impl" -> args.noCheckImpl = true
                         else -> warn("Unknown Kotlin compiler flag found in config.xml: $it")
                     }
                 }
@@ -214,7 +214,7 @@ class KotlinCompiler @Inject constructor(
                     + " " + sourceFiles.joinToString(" "))
             logk(2, "    Additional kotlinc arguments: "
                     + " -moduleName " + args.moduleName
-                    + " -friendPaths " + args.friendPaths?.joinToString(";"))
+                    + " -friendPaths " + args.friendPaths.joinToString(";"))
             val collector = object : MessageCollector {
                 override fun clear() {
                     throw UnsupportedOperationException("not implemented")
@@ -225,7 +225,7 @@ class KotlinCompiler @Inject constructor(
                 }
 
                 fun dump(location: CompilerMessageLocation?, s: String) =
-                    if (location?.lineContent != null) {
+                    if (location != null && location.lineContent != null) {
                         with(location) {
                             "$lineContent\n$path:$line:$column $s"
                         }
@@ -233,13 +233,11 @@ class KotlinCompiler @Inject constructor(
                         s
                     }
 
-                override fun report(severity: CompilerMessageSeverity, message: String,
+                override fun report(severity: CompilerMessageSeverity,
-                                    location: CompilerMessageLocation?) {
+                        message: String, location: CompilerMessageLocation) {
                     if (severity.isError) {
                         "Couldn't compile file: ${dump(location, message)}".let { fullMessage ->
-                            error(fullMessage)
+                            throw KobaltException(fullMessage)
-                            val ex = KobaltException(fullMessage)
-                            throw ex
                         }
                     } else if (severity == CompilerMessageSeverity.WARNING && KobaltLogger.LOG_LEVEL >= 2) {
                         warn(dump(location, message))
@@ -253,22 +251,24 @@ class KotlinCompiler @Inject constructor(
 //            // TODO: experimental should be removed as soon as it becomes standard
 //            System.setProperty("kotlin.incremental.compilation.experimental", "true")
 
-            return if (cliArgs.noIncrementalKotlin || Kobalt.context?.internalContext?.noIncrementalKotlin ?: false) {
+            val result =
-                log(2, "  Kotlin incremental compilation is disabled")
+                    if (cliArgs.noIncrementalKotlin || Kobalt.context?.internalContext?.noIncrementalKotlin ?: false) {
-                val duration = benchmarkMillis {
+                        log(2, "  Kotlin incremental compilation is disabled")
-                    compiler.exec(collector, Services.Builder().build(), args)
+                        val duration = benchmarkMillis {
-                }
+                            compiler.exec(collector, Services.Builder().build(), args)
-                log(1, "  Regular compilation time: ${duration.first} ms")
+                        }
-                TaskResult(duration.second == ExitCode.OK)
+                        log(1, "  Regular compilation time: ${duration.first} ms")
-            } else {
+                        TaskResult(duration.second == ExitCode.OK)
-                log(1, "  Kotlin incremental compilation is enabled")
+                    } else {
-                //val start = System.currentTimeMillis()
+                        log(1, "  Kotlin incremental compilation is enabled")
-                val duration = benchmarkMillis {
+                        val start = System.currentTimeMillis()
-                    compileIncrementally(filesToCompile, sourceFiles, outputDir, info, args, collector)
+                        val duration = benchmarkMillis {
-                }
+                            compileIncrementally(filesToCompile, sourceFiles, outputDir, info, args, collector)
-                log(1, "  Incremental compilation time: ${duration.first} ms")
+                        }
-                TaskResult()
+                        log(1, "  Incremental compilation time: ${duration.first} ms")
-            }
+                        TaskResult()
+                    }
+            return result
         }
 
         private fun compileIncrementally(filesToCompile: Int, sourceFiles: List<String>, outputDir: String?,
@@ -382,7 +382,8 @@ class KotlinCompiler @Inject constructor(
             = dependencyManager.create("org.jetbrains" + ".kotlin:kotlin-compiler-embeddable:$version")
 
     fun compilerEmbeddableDependencies(project: Project?, version: String): List<IClasspathDependency> {
-        return dependencyManager.transitiveClosure(listOf(compilerDep(version)), requiredBy = project?.name ?: "")
+        val deps = dependencyManager.transitiveClosure(listOf(compilerDep(version)), requiredBy = project?.name ?: "")
+        return deps
     }
 
     /**
@@ -415,7 +416,7 @@ class KotlinCompiler @Inject constructor(
             if (project != null) {
                 listOf(KFiles.joinDir(project.directory, project.buildDirectory, KFiles.CLASSES_DIR))
             } else {
-                emptyList()
+                emptyList<String>()
             }
         val info = CompilerActionInfo(project?.directory, dependencies, sourceFiles, listOf("kt"), outputDir, args,
                 friendPaths, context?.internalContext?.forceRecompile ?: false, compilerSeparateProcess)

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

@@ -99,10 +99,9 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors, val depen
     // IClasspathContributor
 
     override fun classpathEntriesFor(project: Project?, context: KobaltContext): List<IClasspathDependency> =
-        if (project == null ||
+        if (project == null || accept(project)) {
-                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)
+            listOf(kotlinJarFiles.stdlib, kotlinJarFiles.runtime)
                     .map { FileDependency(it.absolutePath) }
         } else {
             emptyList()

src/main/kotlin/com/beust/kobalt/plugin/osgi/OsgiPlugin.kt

@@ -14,8 +14,11 @@ import com.google.inject.Inject
 import com.google.inject.Singleton
 import java.io.ByteArrayOutputStream
 import java.io.File
+import java.net.URI
 import java.net.URLClassLoader
-import java.nio.file.*
+import java.nio.file.FileSystems
+import java.nio.file.Files
+import java.nio.file.StandardOpenOption
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.util.jar.JarFile
@@ -54,7 +57,6 @@ class OsgiPlugin @Inject constructor(val configActor: ConfigActor<OsgiConfig>, v
             it + ";version=\"" + project.version + "\""
         }.joinToString(",")
 
-        val toFile = Files.createTempFile(null, ".jar")
         val analyzer = Analyzer().apply {
             jar = aQute.bnd.osgi.Jar(jarName)
             val dependencies = project.compileDependencies + project.compileRuntimeDependencies
@@ -85,21 +87,18 @@ class OsgiPlugin @Inject constructor(val configActor: ConfigActor<OsgiConfig>, v
             //
             // Update or create META-INF/MANIFEST.MF
             //
-            KFiles.copy(Paths.get(jarFile.toURI()), Paths.get(toFile.toUri()))
+            val uri = URI.create("jar:file:" + jarFile.absolutePath)
-
+            val options = hashMapOf<String, String>()
-            val fileSystem = FileSystems.newFileSystem(toFile, null)
+            val fileSystem = FileSystems.newFileSystem(uri, options)
             fileSystem.use { fs ->
-                JarFile(jarFile).use { jf ->
+                val mf = JarFile(jarFile).getEntry(MetaArchive.MANIFEST_MF)
-                    val mf = jf.getEntry(MetaArchive.MANIFEST_MF)
+                if (mf == null) {
-                    if (mf == null) {
+                    Files.createDirectories(fs.getPath("META-INF/"))
-                        Files.createDirectories(fs.getPath("META-INF/"))
-                    }
-                    val jarManifest = fs.getPath(MetaArchive.MANIFEST_MF)
-                    Files.write(jarManifest, listOf(lines2),
-                            if (mf != null) StandardOpenOption.APPEND else StandardOpenOption.CREATE)
                 }
+                val jarManifest = fs.getPath(MetaArchive.MANIFEST_MF)
+                Files.write(jarManifest, listOf(lines2),
+                        if (mf != null) StandardOpenOption.APPEND else StandardOpenOption.CREATE)
             }
-            Files.copy(Paths.get(toFile.toUri()), Paths.get(jarFile.toURI()), StandardCopyOption.REPLACE_EXISTING)
             return TaskResult()
         }
     }

src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt

@@ -105,7 +105,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
                             val outputFile = jarGenerator.fullArchiveName(project, context, it.name)
                             outputFiles.add(outputFile)
                             allIncludedFiles.addAll(files)
-                            zipToFiles[outputFile.name] = files
+                            zipToFiles[it.name] = files
                         }
                     }
                 }

src/main/kotlin/com/beust/kobalt/plugin/publish/BintrayApi.kt

@@ -15,7 +15,6 @@ import com.google.gson.Gson
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.TypeAdapter
-import com.google.gson.annotations.SerializedName
 import com.google.gson.reflect.TypeToken
 import com.google.inject.assistedinject.Assisted
 import okhttp3.*
@@ -63,7 +62,7 @@ class BintrayApi @Inject constructor(val http: Http,
                            @Path("publish") publish: Int,
                            @Body file: File): Call<BintrayResponse>
 
-        class UpdateVersion(val desc: String?, @SerializedName("vcs_tag") val vcsTag: String?)
+        class UpdateVersion(val desc: String?, val vcsTag: String?)
 
         @PATCH("/packages/{owner}/maven/{repo}/versions/{version}")
         fun updateVersion(@Path("owner") owner: String,
@@ -80,12 +79,12 @@ class BintrayApi @Inject constructor(val http: Http,
 //                    level = HttpLoggingInterceptor.Level.BASIC
 //                })
         builder.interceptors().add(Interceptor { chain ->
-            val original = chain.request()
+            val original = chain.request();
 
             chain.proceed(original.newBuilder()
                     .header("Authorization", Credentials.basic(username, password))
                     .method(original.method(), original.body())
-                    .build())
+                    .build());
         })
         val okHttpClient = builder.build()
 
@@ -97,29 +96,25 @@ class BintrayApi @Inject constructor(val http: Http,
                 .create(Api::class.java)
     }
 
-    fun validatePackage(project: Project, config: BintrayConfig) {
+    fun validatePackage(project: Project) {
-        val pkgName = config.name ?: project.name
+        val execute = service.getPackage(org ?: username!!, project.name).execute()
-        val execute = service.getPackage(org ?: username!!, pkgName).execute()
 
-        if (execute.errorBody()?.string()?.contains("'$pkgName' was not found") == true) {
+        if (execute.errorBody()?.string()?.contains("'${project.name}' was not found") ?: false) {
             warn("Package does not exist on bintray.  Creating now.")
-            val result = service.createPackage(org ?: username!!, buildPackageInfo(project, config))
+            val result = service.createPackage(org ?: username!!, buildPackageInfo(project))
                     .execute()
             if (result.errorBody() != null) {
-                throw KobaltException("Error while creating package:\n" + result.errorBody()!!.string())
+                throw KobaltException("Error while creating package:\n" + result.errorBody().string())
             }
         }
     }
 
-    private fun buildPackageInfo(project: Project, config: BintrayConfig): JsonObject {
+    private fun buildPackageInfo(project: Project): JsonObject {
-        val jsonObject = JsonObject().apply {
+        val jsonObject = JsonObject()
-            addNonNull("name", config.name ?: project.name)
+        jsonObject.addNonNull("name", project.name)
-            addNonNull("desc",
+        jsonObject.addNonNull("desc", project.description)
-                    if (project.description.isNotBlank()) project.description else project.pom?.description)
+        jsonObject.addNonNull("vcs_url", project.pom?.scm?.url)
-            addNonNull("vcs_url", project.pom?.scm?.url)
+        jsonObject.addNonNull("website_url", project.url)
-            addNonNull("website_url", project.url ?: project.pom?.url)
-            addNonNull("issue_tracker_url", config.issueTrackerUrl)
-        }
         val licenses = JsonArray()
         project.pom?.licenses?.forEach {
             licenses.add(it.name)
@@ -129,7 +124,7 @@ class BintrayApi @Inject constructor(val http: Http,
     }
 
     fun uploadMaven(project: Project, files: List<File>, config: BintrayConfig): TaskResult {
-        validatePackage(project, config)
+        validatePackage(project)
         return upload(project, files, config, generateMd5 = true)
     }
 
@@ -163,13 +158,13 @@ class BintrayApi @Inject constructor(val http: Http,
 
             fun dots(total: Int, list: List<Boolean>, file: File? = null): String {
                 val spaces: String = Array(total - list.size, { " " }).joinToString("")
-                return "|" + list.joinToString("") { if (it) "." else "X" } + spaces +
+                return "|" + list.map { if (it) "." else "X" }.joinToString("") + spaces +
                         (if (file != null) "| [ $file ]" else "|")
             }
 
             val results = arrayListOf<Boolean>()
             val owner = org ?: username!!
-            val repo = config.name ?: project.name
+            val repo = project.name
             val group = project.group!!.replace('.', '/')
             val artifact = project.artifactId!!
             val version = project.version!!
@@ -208,7 +203,7 @@ class BintrayApi @Inject constructor(val http: Http,
 
                 return TaskResult()
             } else {
-                error(" Errors while uploading:\n" + errorMessages.joinToString("\n") { "    $it" })
+                error(" Errors while uploading:\n" + errorMessages.map { "    $it" }.joinToString("\n"))
                 return TaskResult(false, errorMessage = errorMessages.joinToString("\n"))
             }
         } else {
@@ -221,7 +216,7 @@ class BintrayApi @Inject constructor(val http: Http,
 
     fun JsonObject.addNonNull(name: String, value: String?) {
         if (value != null) {
-            addProperty(name, value)
+            addProperty(name, value);
         }
     }
 
@@ -236,16 +231,20 @@ class ConverterFactory : Converter.Factory() {
     override fun requestBodyConverter(type: Type, parameterAnnotations: Array<out Annotation>,
             methodAnnotations: Array<out Annotation>,
             retrofit: Retrofit?): Converter<*, RequestBody>? {
-        return if (type.typeName == File::class.java.name) FileBodyConverter()
+        val result =
-        else GsonBodyConverter()
+            if (type.typeName == File::class.java.name) FileBodyConverter()
+            else GsonBodyConverter()
+        return result
     }
 }
 
 class GsonResponseBodyConverter(private val gson: Gson, private val adapter: TypeAdapter<out Any>) : Converter<ResponseBody, Any> {
     override fun convert(value: ResponseBody): Any {
         val jsonReader = gson.newJsonReader(value.charStream())
-        value.use {
+        try {
             return adapter.read(jsonReader)
+        } finally {
+            value.close()
         }
     }
 }

src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt

@@ -47,7 +47,7 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener
     private fun autoGitTag(project: Project, uploadResult: TaskResult, config: AutoGitTagConfig?) : TaskResult {
         if (config != null) {
             with(config) {
-                return git.maybeTagRelease(project, uploadResult, enabled, annotated, push, tag, message)
+                return git.maybeTagRelease(project, uploadResult, enabled, annotated, tag, message)
             }
         } else {
             return TaskResult()
@@ -117,7 +117,7 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener
         val docUrl = DocUrl.PUBLISH_PLUGIN_URL
         val user = localProperties.get(PROPERTY_BINTRAY_USER, docUrl)
         val password = localProperties.get(PROPERTY_BINTRAY_PASSWORD, docUrl)
-        val org = localProperties.getNoThrows(PROPERTY_BINTRAY_ORG)
+        val org = localProperties.getNoThrows(PROPERTY_BINTRAY_ORG, docUrl)
 
         val jcenter = bintrayFactory.create(user, password, org)
         var success = false
@@ -222,9 +222,6 @@ data class AutoGitTagConfig(val project: Project) {
     @Directive
     var annotated: Boolean = false
 
-    @Directive
-    var push: Boolean = true
-
     @Directive
     var tag : String = project.version!!
 
@@ -271,18 +268,9 @@ data class BintrayConfig(val project: Project) {
         files.add(Pair(filePath, url))
     }
 
-    /**
-     * The package name on Bintray which is not always the project name.
-     */
-    @Directive
-    var name: String? = null
-
     @Directive
     var description: String? = null
 
-    @Directive
-    var issueTrackerUrl: String? = null
-
     @Directive
     var vcsTag: String? = null
 }

src/main/resources/kobalt.properties

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

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-stdlib.jar!/" />
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-sources.jar!/" />
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

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

@@ -9,7 +9,6 @@ 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
@@ -122,9 +121,6 @@ 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", "com/beust/kobalt/wrapper/Main.class"))
+                    assertExistence(ins, listOf("kobalt.properties"))
                 }
                 entry = stream.nextEntry
             }

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

@@ -1,58 +0,0 @@
-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,6 +1,5 @@
 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
@@ -96,7 +95,7 @@ class MavenResolverTest : BaseTest() {
     private fun resolve(id: String): List<ArtifactResult> {
         val system = Booter.newRepositorySystem()
         val session = Booter.newRepositorySystemSession(system,
-                localRepo.localRepo, KobaltSettings(KobaltSettingsXml()), Args(), EventBus())
+                localRepo.localRepo, KobaltSettings(KobaltSettingsXml()), EventBus())
         val artifact = DefaultArtifact(id)
 
         val collectRequest = CollectRequest().apply {