.gitignore

@@ -1,15 +1,15 @@
 .gradle
 annotations
 .idea/*
-*.iml
-nonBuildScript
+!.idea/modules.xml
+!.idea/libraries
+!.idea/misc.xml
+buildScript
 kobaltBuild
 local.properties
 classes
 libs
 .kobalt/
+./build/
 out
 .DS_Store
-lib/kotlin-*
-build
-.history

.idea/libraries/KotlinJavaRuntime.xml

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

.idea/libraries/kobalt_jar.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="kobalt.jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.863/kobalt/wrapper/kobalt-0.863.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.863/kobalt/wrapper/kobalt-0.863.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kobalt/Build.kt.iml" filepath="$PROJECT_DIR$/kobalt/Build.kt.iml" />
+      <module fileurl="file://$PROJECT_DIR$/kobalt.iml" filepath="$PROJECT_DIR$/kobalt.iml" />
+      <module fileurl="file://$PROJECT_DIR$/modules/kobalt-plugin-api/kobalt-plugin-api.iml" filepath="$PROJECT_DIR$/modules/kobalt-plugin-api/kobalt-plugin-api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/modules/wrapper/kobalt-wrapper.iml" filepath="$PROJECT_DIR$/modules/wrapper/kobalt-wrapper.iml" />
+    </modules>
+  </component>
+</project>

.travis.yml

@@ -0,0 +1,13 @@
+cache:
+    directories:
+    - $HOME/.m2
+    - $HOME/.kobalt
+
+language: java
+
+jdk:
+  - oraclejdk8
+
+install: true
+
+script: ./build-travis.sh

README.md

@@ -1,14 +1,11 @@
-# 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)
-
+# Kobalt [![Build Status](https://travis-ci.org/cbeust/kobalt.svg?branch=master)](https://travis-ci.org/cbeust/kobalt)
 
 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-travis.sh

@@ -1,7 +1,5 @@
-ulimit -s 1082768
-
 #java -Xmx2048m -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $* clean
-java -Xmx2048m -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $* clean assemble test --parallel
+java -Xmx2048m -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $* clean assemble test --parallel --logTags graph
 
 
 

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'
-    }
-}

dist/kobaltw

@@ -1,11 +1,2 @@
 #!/usr/bin/env sh
-
-case "$(uname)" in
-    CYGWIN*) DIRNAME=$(cygpath -d "$(dirname "$(readlink -f "$0")")");;
-    Darwin*) DIRNAME=$(dirname "$(readlink "$0")");;
-    *) DIRNAME=$(dirname "$(readlink -f "$0")");;
-esac
-if [ "$DIRNAME" = "." ]; then
-    DIRNAME="$(dirname "$0")"
-fi
-java -jar "${DIRNAME}/../kobalt/wrapper/kobalt-wrapper.jar" $*
+java -jar "`dirname "$0"`/../kobalt/wrapper/kobalt-wrapper.jar" $*

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.iml

@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="kobalt" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="KOBALT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/kobaltBuild/classes" />
+    <output-test url="file://$MODULE_DIR$/kobaltBuild/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/kobaltBuild" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kobalt-plugin-api" />
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.jetbrains.kotlin:kotlin-compiler-embeddable:jar:1.0.4-eap-62">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.4-eap-62/kotlin-compiler-embeddable-1.0.4-eap-62.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="Kobalt: org.beanshell:bsh:jar:2.0b4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="Kobalt: com.beust:jcommander:jar:1.48">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.inject:guice:jar:4.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/inject/guice/4.0/guice-4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: biz.aQute.bnd:bndlib:jar:2.4.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/biz/aQute/bnd/bndlib/2.4.0/bndlib-2.4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.guava:guava:jar:16.0.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/guava/guava/16.0.1/guava-16.0.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty:jetty-xml:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/jetty-xml/9.3.6.v20151106/jetty-xml-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.code.findbugs:jsr305:jar:3.0.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven:maven-model:jar:3.3.9">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: javax.inject:javax.inject:jar:1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty.websocket:websocket-server:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/websocket/websocket-server/9.3.6.v20151106/websocket-server-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty.websocket:websocket-client:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/websocket/websocket-client/9.3.6.v20151106/websocket-client-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.okhttp3:okhttp:jar:3.2.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty:jetty-servlet:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/jetty-servlet/9.3.6.v20151106/jetty-servlet-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty:jetty-util:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/jetty-util/9.3.6.v20151106/jetty-util-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.okhttp3:logging-interceptor:jar:3.2.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/okhttp3/logging-interceptor/3.2.0/logging-interceptor-3.2.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty:jetty-http:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/jetty-http/9.3.6.v20151106/jetty-http-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.beust:jcommander:jar:1.48">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty.websocket:websocket-common:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/websocket/websocket-common/9.3.6.v20151106/websocket-common-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty.websocket:websocket-api:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/websocket/websocket-api/9.3.6.v20151106/websocket-api-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty:jetty-security:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/jetty-security/9.3.6.v20151106/jetty-security-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.codehaus.plexus:plexus-utils:jar:3.0.22">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.slf4j:slf4j-api:jar:1.7.13">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.commons:commons-lang3:jar:3.4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.code.gson:gson:jar:2.6.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty.websocket:websocket-servlet:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/websocket/websocket-servlet/9.3.6.v20151106/websocket-servlet-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.osgi:org.osgi.core:jar:4.3.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty:jetty-webapp:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/jetty-webapp/9.3.6.v20151106/jetty-webapp-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.github.spullara.mustache.java:compiler:jar:0.9.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/github/spullara/mustache/java/compiler/0.9.1/compiler-0.9.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.sparkjava:spark-core:jar:2.5">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/sparkjava/spark-core/2.5/spark-core-2.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty:jetty-io:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/jetty-io/9.3.6.v20151106/jetty-io-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.okio:okio:jar:1.6.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: javax.servlet:javax.servlet-api:jar:3.1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.jetty:jetty-server:jar:9.3.6.v20151106">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/jetty/jetty-server/9.3.6.v20151106/jetty-server-9.3.6.v20151106.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.inject.extensions:guice-assistedinject:jar:4.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: aopalliance:aopalliance:jar:1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module" module-name="kobalt-wrapper" />
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.okhttp3:okhttp-ws:jar:3.2.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/okhttp3/okhttp-ws/3.2.0/okhttp-ws-3.2.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.retrofit2:retrofit:jar:2.0.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/retrofit2/retrofit/2.0.2/retrofit-2.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.retrofit2:converter-gson:jar:2.0.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/retrofit2/converter-gson/2.0.2/converter-gson-2.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="Kobalt: org.apache.ant:ant:jar:1.7.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="Kobalt: org.assertj:assertj-core:jar:3.4.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/assertj/assertj-core/3.4.1/assertj-core-3.4.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="Kobalt: org.apache.ant:ant-launcher:jar:1.7.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="Kobalt: org.testng:testng:jar:6.9.11">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/testng/testng/6.9.11/testng-6.9.11.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+  </component>
+</module>

kobalt/Build.kt.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kobalt.jar" level="project" />
+  </component>
+</module>

kobalt/src/Build.kt

@@ -1,14 +1,17 @@
 
-import com.beust.kobalt.*
+
+import com.beust.kobalt.TaskResult
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.annotation.Task
+import com.beust.kobalt.homeDir
 import com.beust.kobalt.plugin.application.application
 import com.beust.kobalt.plugin.java.javaCompiler
 import com.beust.kobalt.plugin.kotlin.kotlinCompiler
 import com.beust.kobalt.plugin.packaging.assemble
-import com.beust.kobalt.plugin.publish.autoGitTag
 import com.beust.kobalt.plugin.publish.bintray
 import com.beust.kobalt.plugin.publish.github
+import com.beust.kobalt.project
+import com.beust.kobalt.test
 import org.apache.maven.model.Developer
 import org.apache.maven.model.License
 import org.apache.maven.model.Model
@@ -17,41 +20,17 @@ import java.io.File
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
-
-val bs = buildScript {
-    repos("https://dl.bintray.com/cbeust/maven")
-}
 
 object Versions {
-    val kotlin = "1.2.71"
-    val okhttp = "3.9.1"
-    val okio = "1.13.0"
-    val retrofit = "2.3.0"
-    val gson = "2.8.2"
-    val guice = "4.2.2"
-    val maven = "3.5.2"
-    val mavenResolver = "1.1.0"
-    val slf4j = "1.7.3"
-    val aether = "1.0.2.v20150114"
-    val testng = "6.12"
-    val jcommander = "1.72"
-
-    // JUnit 5
-    val junit = "4.12"
-    val junitPlatform = "1.1.0"
-    val junitJupiter = "5.1.0"
+    val okhttp = "3.2.0"
+    val okio = "1.6.0"
+    val retrofit = "2.1.0"
+    val gson = "2.6.2"
+    val aether = "1.1.0"
+    val sonatypeAether = "1.13.1"
+    val maven = "3.3.9"
 }
 
-fun mavenResolver(vararg m: String)
-        = m.map { "org.apache.maven.resolver:maven-resolver-$it:${Versions.mavenResolver}" }
-    .toTypedArray()
-
-fun aether(vararg m: String)
-        = m.map { "org.eclipse.aether:aether-$it:${Versions.aether}" }
-    .toTypedArray()
-
 val wrapper = project {
     name = "kobalt-wrapper"
     group = "com.beust"
@@ -64,7 +43,6 @@ val wrapper = project {
     }
 
     assemble {
-        jar { }
         jar {
             name = projectName + ".jar"
             manifest {
@@ -76,13 +54,6 @@ val wrapper = project {
     application {
         mainClass = "com.beust.kobalt.wrapper.Main"
     }
-
-    bintray {
-        publish = true
-        sign = true
-    }
-
-    pom = createPom(name, "Wrapper for Kobalt")
 }
 
 val kobaltPluginApi = project {
@@ -92,44 +63,52 @@ 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")
+    pom = Model().apply {
+        name = project.name
+        description = "A build system in Kotlin"
+        url = "http://beust.com/kobalt"
+        licenses = listOf(License().apply {
+            name = "Apache 2.0"
+            url = "http://www.apache .org/licenses/LICENSE-2.0"
+        })
+        scm = Scm().apply {
+            url = "http://github.com/cbeust/kobalt"
+            connection = "https://github.com/cbeust/kobalt.git"
+            developerConnection = "git@github.com:cbeust/kobalt.git"
+        }
+        developers = listOf(Developer().apply {
+            name = "Cedric Beust"
+            email = "cedric@beust.com"
+        })
+    }
 
     dependencies {
         compile(
-                "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}",
-                "com.google.inject:guice:${Versions.guice}",
-                "com.google.inject.extensions:guice-assistedinject:4.1.0",
+                "com.google.inject:guice:4.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:19.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}",
-                "org.eclipse.jgit:org.eclipse.jgit:4.9.0.201710071750-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}",
-                "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.apache.commons:commons-compress:1.15",
-                "commons-io:commons-io:2.6",
+                "com.beust:jcommander:1.48",
 
-                // Java 9
-                "javax.xml.bind:jaxb-api:2.3.0"
+                "org.slf4j:slf4j-nop:1.6.0",
+                "org.eclipse.aether:aether-spi:${Versions.aether}",
+                "org.eclipse.aether:aether-impl:${Versions.aether}",
+                "org.eclipse.aether:aether-connector-basic:${Versions.aether}",
+                "org.eclipse.aether:aether-transport-file:${Versions.aether}",
+                "org.eclipse.aether:aether-transport-http:${Versions.aether}",
+                "org.sonatype.aether:aether-api:${Versions.sonatypeAether}",
+                "org.sonatype.aether:aether-connector-wagon:1.13.1",
+                "org.apache.maven:maven-aether-provider:${Versions.maven}"
         )
-        exclude(*aether("impl", "spi", "util", "api"))
     }
 
 
@@ -142,8 +121,12 @@ val kobaltPluginApi = project {
         }
     }
 
+//    install {
+//        libDir = "lib-test"
+//    }
+
     kotlinCompiler {
-        args("nowarn")
+        args("-nowarn")
     }
 
     bintray {
@@ -159,35 +142,26 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
 
     dependencies {
         // Used by the plugins
-        compile("org.jetbrains.kotlin:kotlin-compiler-embeddable:${Versions.kotlin}")
+        compile("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.0.3")
 
         // Used by the main app
-        compile(
-                "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}",
-                "com.github.spullara.mustache.java:compiler:0.9.5",
+        compile("com.github.spullara.mustache.java:compiler:0.9.1",
                 "javax.inject:javax.inject:1",
-                "com.google.inject:guice:${Versions.guice}",
-                "com.google.inject.extensions:guice-assistedinject:${Versions.guice}",
-                "com.beust:jcommander:${Versions.jcommander}",
+                "com.google.inject:guice:4.0",
+                "com.google.inject.extensions:guice-assistedinject:4.0",
+                "com.beust:jcommander:1.48",
                 "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",
-                "biz.aQute.bnd:biz.aQute.bndlib:3.5.0",
-                *mavenResolver("spi"),
+                "com.squareup.okhttp3:okhttp-ws:${Versions.okhttp}",
+                "org.codehaus.plexus:plexus-utils:3.0.22",
+                "biz.aQute.bnd:bndlib:2.4.0",
 
-                "com.squareup.okhttp3:logging-interceptor:3.9.0",
+                "com.squareup.okhttp3:logging-interceptor:3.2.0",
 
-                "com.sparkjava:spark-core:2.6.0",
-                "org.codehaus.groovy:groovy:2.4.12",
-
-                // 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"
+                "com.sparkjava:spark-core:2.5"
 
 //                "org.eclipse.jetty:jetty-server:${Versions.jetty}",
 //                "org.eclipse.jetty:jetty-servlet:${Versions.jetty}",
@@ -201,11 +175,8 @@ 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",
-                *mavenResolver("util")
-                )
+        compile("org.testng:testng:6.9.11",
+                "org.assertj:assertj-core:3.4.1")
     }
 
     assemble {
@@ -217,27 +188,17 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
         }
         zip {
             val dir = "kobalt-$version"
-            val files = listOf(
-                    "dist", "$dir/bin", "kobaltw",
-                    "dist", "$dir/bin", "kobaltw.bat",
-                    "$buildDirectory/libs", "$dir/kobalt/wrapper", "$projectName-$version.jar",
-                    "modules/wrapper/$buildDirectory/libs", "$dir/kobalt/wrapper", "$projectName-wrapper.jar")
-
-            (0 .. files.size - 1 step 3).forEach { i ->
-                include(from(files[i]), to(files[i + 1]), files[i + 2])
-            }
-
-            // Package the sources
-            val currentDir = Paths.get(".").toAbsolutePath().normalize().toString()
-            zipFolders("$currentDir/$buildDirectory/libs/all-sources/$projectName-$version-sources.jar",
-                    "$currentDir/$directory/src/main/kotlin",
-                    "$currentDir/${kobaltPluginApi.directory}/src/main/kotlin")
-            include(from("$buildDirectory/libs/all-sources"), to("$dir/kobalt/wrapper"), "$projectName-$version-sources.jar")
+            include(from("dist"), to("$dir/bin"), "kobaltw")
+            include(from("dist"), to("$dir/bin"), "kobaltw.bat")
+            include(from("$buildDirectory/libs"), to("$dir/kobalt/wrapper"),
+                    "$projectName-$version.jar")
+            include(from("modules/wrapper/$buildDirectory/libs"), to("$dir/kobalt/wrapper"),
+                    "$projectName-wrapper.jar")
         }
     }
 
     kotlinCompiler {
-        args("nowarn")
+        args("-nowarn")
     }
 
     bintray {
@@ -251,32 +212,6 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
     test {
         args("-log", "2", "src/test/resources/testng.xml")
     }
-
-    autoGitTag {
-        enabled = true
-    }
-}
-
-fun zipFolders(zipFilePath: String, vararg foldersPath: String) {
-    val zip = Paths.get(zipFilePath)
-    Files.deleteIfExists(zip)
-    Files.createDirectories(zip.parent)
-    val zipPath = Files.createFile(zip)
-    ZipOutputStream(Files.newOutputStream(zipPath)).use {
-        foldersPath.map {Paths.get(it)}.forEach { folderPath ->
-            Files.walk(folderPath)
-                    .filter { path -> !Files.isDirectory(path) }
-                    .forEach { path ->
-                        val zipEntry = ZipEntry(folderPath.relativize(path).toString())
-                        try {
-                            it.putNextEntry(zipEntry)
-                            Files.copy(path, it)
-                            it.closeEntry()
-                        } catch (e: Exception) {
-                        }
-                    }
-        }
-    }
 }
 
 fun readVersion() : String {
@@ -296,31 +231,9 @@ fun taskCopyVersionForWrapper(project: Project) : TaskResult {
         File(toString).mkdirs()
         val from = Paths.get("src/main/resources/kobalt.properties")
         val to = Paths.get("$toString/kobalt.properties")
-        // Only copy if necessary so we don't break incremental compilation
-        if (! to.toFile().exists() || (from.toFile().readLines() != to.toFile().readLines())) {
-            Files.copy(from,
-                    to,
-                    StandardCopyOption.REPLACE_EXISTING)
-        }
+        Files.copy(from,
+                to,
+                StandardCopyOption.REPLACE_EXISTING)
     }
     return TaskResult()
 }
-
-fun createPom(projectName: String, projectDescription: String) = Model().apply {
-    name = projectName
-    description = projectDescription
-    url = "https://beust.com/kobalt"
-    licenses = listOf(License().apply {
-        name = "Apache-2.0"
-        url = "https://www.apache.org/licenses/LICENSE-2.0"
-    })
-    scm = Scm().apply {
-        url = "https://github.com/cbeust/kobalt"
-        connection = "https://github.com/cbeust/kobalt.git"
-        developerConnection = "git@github.com:cbeust/kobalt.git"
-    }
-    developers = listOf(Developer().apply {
-        name = "Cedric Beust"
-        email = "cedric@beust.com"
-    })
-}

kobalt/wrapper/kobalt-wrapper.properties

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

kobaltw

@@ -1,2 +1 @@
-#!/usr/bin/env sh
-java -jar "`dirname "$0"`/kobalt/wrapper/kobalt-wrapper.jar" $*
+java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $*

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"

kobaltw.bat

@@ -1,4 +1,4 @@
-@echo off
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-java -jar "%DIRNAME%/kobalt/wrapper/kobalt-wrapper.jar" %*
+@echo off
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+java -jar "%DIRNAME%/kobalt/wrapper/kobalt-wrapper.jar" %*

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/kobalt-plugin-api.iml

@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="kobalt-plugin-api" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="KOBALT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../kobaltBuild/classes" />
+    <output-test url="file://$MODULE_DIR$/../../kobaltBuild/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/kobaltBuild" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.aether:aether-api:jar:1.1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/aether/aether-api/1.1.0/aether-api-1.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$USER_HOME$/.ideaLibSources/aether-api-1.1.0-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.inject:guice:jar:4.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/inject/guice/4.0/guice-4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-6">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.sonatype.aether:aether-spi:jar:1.13.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.codehaus.plexus:plexus-component-annotations:jar:1.6">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven:maven-aether-provider:jar:3.3.9">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.sonatype.sisu:sisu-inject-bean:jar:2.2.3">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/sonatype/sisu/sisu-inject-bean/2.2.3/sisu-inject-bean-2.2.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.slf4j:jcl-over-slf4j:jar:1.6.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/slf4j/jcl-over-slf4j/1.6.2/jcl-over-slf4j-1.6.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.sonatype.aether:aether-api:jar:1.13.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven:maven-model-builder:jar:3.3.9">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven:maven-model:jar:3.3.9">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.aether:aether-spi:jar:1.1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/aether/aether-spi/1.1.0/aether-spi-1.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: javax.inject:javax.inject:jar:1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.codehaus.plexus:plexus-classworlds:jar:2.4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.okhttp3:okhttp:jar:3.2.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven:maven-repository-metadata:jar:3.3.9">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.sonatype.aether:aether-connector-wagon:jar:1.13.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/sonatype/aether/aether-connector-wagon/1.13.1/aether-connector-wagon-1.13.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.aether:aether-transport-http:jar:1.1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/aether/aether-transport-http/1.1.0/aether-transport-http-1.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$USER_HOME$/.ideaLibSources/aether-transport-http-1.1.0-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.httpcomponents:httpclient:jar:4.3.5">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/httpcomponents/httpclient/4.3.5/httpclient-4.3.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.aether:aether-transport-file:jar:1.1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/aether/aether-transport-file/1.1.0/aether-transport-file-1.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.sonatype.aether:aether-util:jar:1.13.1">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven:maven-artifact:jar:3.3.9">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.sonatype.sisu:sisu-guice:jar:no_aop:3.0.3">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/sonatype/sisu/sisu-guice/3.0.3/sisu-guice-3.0.3-no_aop.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.beust:jcommander:jar:1.48">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.maven:maven-builder-support:jar:3.3.9">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.codehaus.plexus:plexus-utils:jar:3.0.22">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.httpcomponents:httpcore:jar:4.3.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.apache.commons:commons-lang3:jar:3.4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.slf4j:slf4j-api:jar:1.6.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/slf4j/slf4j-api/1.6.2/slf4j-api-1.6.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.code.gson:gson:jar:2.6.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.aether:aether-connector-basic:jar:1.1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/aether/aether-connector-basic/1.1.0/aether-connector-basic-1.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.aether:aether-util:jar:1.1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/aether/aether-util/1.1.0/aether-util-1.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.codehaus.plexus:plexus-interpolation:jar:1.21">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.eclipse.aether:aether-impl:jar:1.1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/eclipse/aether/aether-impl/1.1.0/aether-impl-1.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.okio:okio:jar:1.6.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.sonatype.sisu:sisu-inject-plexus:jar:2.2.3">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/sonatype/sisu/sisu-inject-plexus/2.2.3/sisu-inject-plexus-2.2.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: commons-logging:commons-logging:jar:1.1.3">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.inject.extensions:guice-assistedinject:jar:4.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: aopalliance:aopalliance:jar:1.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: commons-codec:commons-codec:jar:1.6">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/commons-codec/commons-codec/1.6/commons-codec-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.retrofit2:retrofit:jar:2.0.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/retrofit2/retrofit/2.0.2/retrofit-2.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: org.slf4j:slf4j-nop:jar:1.6.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/org/slf4j/slf4j-nop/1.6.0/slf4j-nop-1.6.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: io.reactivex:rxjava:jar:1.1.5">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/io/reactivex/rxjava/1.1.5/rxjava-1.1.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.squareup.retrofit2:converter-gson:jar:2.0.2">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/squareup/retrofit2/converter-gson/2.0.2/converter-gson-2.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Kobalt: com.google.guava:guava:jar:19.0">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.kobalt/cache/com/google/guava/guava/19.0/guava-19.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+  </component>
+</module>

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/ArchiveGenerator.kt

@@ -1,21 +0,0 @@
-package com.beust.kobalt
-
-import com.beust.kobalt.api.KobaltContext
-import com.beust.kobalt.api.Project
-import com.beust.kobalt.archive.Zip
-import com.beust.kobalt.misc.KFiles
-import java.io.File
-
-interface ArchiveGenerator {
-    fun findIncludedFiles(project: Project, context: KobaltContext, zip: Zip) : List<IncludedFile>
-    val suffix: String
-    fun generateArchive(project: Project, context: KobaltContext, zip: Zip, files: List<IncludedFile>) : File
-
-    fun fullArchiveName(project: Project, context: KobaltContext, archiveName: String?) : File {
-        val fullArchiveName = context.variant.archiveName(project, archiveName, suffix)
-        val archiveDir = File(KFiles.libsDir(project))
-        val result = File(archiveDir.path, fullArchiveName)
-        return result
-    }
-
-}

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

@@ -7,7 +7,7 @@ class Args {
     var targets: List<String> = arrayListOf()
 
     @Parameter(names = arrayOf("-bf", "--buildFile"), description = "The build file")
-    var buildFile: String? = "kobalt/src/Build.kt"
+    var buildFile: String? = null
 
     @Parameter(names = arrayOf("--checkVersions"), description = "Check if there are any newer versions of the " +
             "dependencies")
@@ -22,10 +22,6 @@ class Args {
     @Parameter(names = arrayOf("--download"), description = "Force a download from the downloadUrl in the wrapper")
     var download: Boolean = false
 
-    @Parameter(names = arrayOf("--downloadSources"),
-            description = "Force a download of sources and javadocs when resolving dependencies")
-    var downloadSources: Boolean = false
-
     @Parameter(names = arrayOf("--dryRun"), description = "Display all the tasks that will get run without " +
             "actually running them")
     var dryRun: Boolean = false
@@ -47,7 +43,7 @@ class Args {
     var listTemplates: Boolean = false
 
     @Parameter(names = arrayOf("--log"), description = "Define the log level " +
-            "(${Constants.LOG_QUIET_LEVEL}-${Constants.LOG_MAX_LEVEL})")
+            "(${Constants.LOG_DEFAULT_LEVEL}-${Constants.LOG_MAX_LEVEL})")
     var log: Int = Constants.LOG_DEFAULT_LEVEL
 
     @Parameter(names = arrayOf("--logTags"),
@@ -61,8 +57,8 @@ 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("--parallel"), description = "Build all the projects in parallel whenever possible")
+    var parallel: Boolean = false
 
     @Parameter(names = arrayOf("--plugins"), description = "Comma-separated list of plug-in Maven id's")
     var pluginIds: String? = null
@@ -86,16 +82,6 @@ class Args {
     @Parameter(names = arrayOf("--projectInfo"), description = "Display information about the current projects")
     var projectInfo: Boolean = false
 
-    @Parameter(names = arrayOf("--noIncrementalKotlin"), description = "Disable incremental Kotlin compilation")
-    var noIncrementalKotlin: Boolean = false
-
-    companion object {
-        const val SEQUENTIAL = "--sequential"
-    }
-
-    @Parameter(names = arrayOf(Args.SEQUENTIAL), description = "Build all the projects in sequence")
-    var sequential: Boolean = false
-
     @Parameter(names = arrayOf("--server"), description = "Run in server mode")
     var serverMode: Boolean = false
 
@@ -104,8 +90,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/AsciiArt.kt

@@ -17,16 +17,16 @@ class AsciiArt {
     companion object {
         private val BANNERS = arrayOf(
                 "              __ __           __              __   __ \n" +
-                        "             / //_/  ____    / /_   ____ _   / /  / /_\n" +
-                        "            / ,<    / __ \\  / __ \\ / __ `/  / /  / __/\n" +
-                        "           / /| |  / /_/ / / /_/ // /_/ /  / /  / /_  \n" +
-                        "          /_/ |_|  \\____/ /_.___/ \\__,_/  /_/   \\__/  ",
+                "             / //_/  ____    / /_   ____ _   / /  / /_\n" +
+                "            / ,<    / __ \\  / __ \\ / __ `/  / /  / __/\n" +
+                "           / /| |  / /_/ / / /_/ // /_/ /  / /  / /_  \n" +
+                "          /_/ |_|  \\____/ /_.___/ \\__,_/  /_/   \\__/  ",
 
                 "            _  __          _               _   _   \n" +
-                        "           | |/ /   ___   | |__     __ _  | | | |_ \n" +
-                        "           | ' /   / _ \\  | '_ \\   / _` | | | | __|\n" +
-                        "           | . \\  | (_) | | |_) | | (_| | | | | |_ \n" +
-                        "           |_|\\_\\  \\___/  |_.__/   \\__,_| |_|  \\__|  "
+                "           | |/ /   ___   | |__     __ _  | | | |_ \n" +
+                "           | ' /   / _ \\  | '_ \\   / _` | | | | __|\n" +
+                "           | . \\  | (_) | | |_) | | (_| | | | | |_ \n" +
+                "           |_|\\_\\  \\___/  |_.__/   \\__,_| |_|  \\__|  "
         )
 
         val banner : String get() = BANNERS[Random().nextInt(BANNERS.size)]
@@ -85,7 +85,7 @@ class AsciiArt {
         }
 
         fun logBox(s: String, bl: String = bottomLeft, br: String = bottomRight, indent: Int = 0)
-                = logBox(listOf(s), bl, br, indent)
+            = logBox(listOf(s), bl, br, indent)
 
         fun fill(n: Int) = buildString { repeat(n, { append(" ")})}.toString()
 
@@ -105,7 +105,7 @@ class AsciiArt {
         const val CYAN = "\u001B[36m"
         const val WHITE = "\u001B[37m"
 
-        fun wrap(s: CharSequence, color: String) = color + s + RESET
+        private fun wrap(s: CharSequence, color: String) = color + s + RESET
         private fun blue(s: CharSequence) = wrap(s, BLUE)
         private fun red(s: CharSequence) = wrap(s, RED)
         private fun yellow(s: CharSequence) = wrap(s, YELLOW)
@@ -141,18 +141,18 @@ class AsciiTable {
 
         fun build() : String {
             val formattedHeaders =
-                    headers.mapIndexed { index, s ->
-                        val s2 = col(widths[index], s)
-                        s2
-                    }.joinToString(vb)
+                headers.mapIndexed { index, s ->
+                    val s2 = col(widths[index], s)
+                    s2
+                }.joinToString(vb)
             val result = StringBuffer().apply {
                 append(AsciiArt.logBox(formattedHeaders, AsciiArt.bottomLeft2, AsciiArt.bottomRight2))
                 append("\n")
             }
             var lineLength = 0
-            rows.forEachIndexed { _, row ->
+            rows.forEachIndexed { index, row ->
                 val formattedRow = row.mapIndexed { i, s -> col(widths[i], s) }.joinToString(vb)
-                val line = "$vb $formattedRow $vb"
+                val line = vb + " " + formattedRow + " " + vb
                 result.append(line).append("\n")
                 lineLength = line.length
             }

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

@@ -7,42 +7,10 @@ import com.beust.kobalt.internal.KobaltSettings
 import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.maven.dependency.FileDependency
-import com.beust.kobalt.misc.KobaltLogger
 import org.eclipse.aether.repository.Proxy
 import java.io.File
 import java.net.InetSocketAddress
 
-var BUILD_SCRIPT_CONFIG : BuildScriptConfig? = null
-
-class BuildScriptConfig {
-    /** The list of repos used to locate plug-ins. */
-    @Directive
-    fun repos(vararg r: String) = newRepos(*r)
-
-    /** The list of plug-ins to use for this build file. */
-    @Directive
-    fun plugins(vararg pl: String) = newPlugins(*pl)
-
-    /** The build file classpath. */
-    @Directive
-    fun buildFileClasspath(vararg bfc: String) = newBuildFileClasspath(*bfc)
-
-    /** Options passed to Kobalt */
-    @Directive
-    fun kobaltOptions(vararg options: String) = Kobalt.addKobaltOptions(options)
-
-    /** Where to find additional build files */
-    @Directive
-    fun buildSourceDirs(vararg dirs: String) = Kobalt.addBuildSourceDirs(dirs)
-
-    // The following settings modify the compiler used to compile the build file, which regular users should
-    // probably never need to do. Projects should use kotlinCompiler { compilerVersion } to configure the
-    // Kotin compiler for their source files.
-    var kobaltCompilerVersion : String? = null
-    var kobaltCompilerRepo: String? = null
-    var kobaltCompilerFlags: String? = null
-}
-
 @Directive
 fun homeDir(vararg dirs: String) : String = SystemProperties.homeDir +
         File.separator + dirs.toMutableList().joinToString(File.separator)
@@ -50,18 +18,13 @@ fun homeDir(vararg dirs: String) : String = SystemProperties.homeDir +
 @Directive
 fun file(file: String) : String = FileDependency.PREFIX_FILE + file
 
+@Directive
 fun plugins(vararg dependency : IClasspathDependency) {
     dependency.forEach { Plugins.addDynamicPlugin(it) }
 }
 
-fun plugins(vararg dependencies : String) {
-    KobaltLogger.logger.warn("Build.kt",
-            "Invoking plugins() directly is deprecated, use the buildScript{} directive")
-    newPlugins(*dependencies)
-}
-
 @Directive
-fun newPlugins(vararg dependencies : String) {
+fun plugins(vararg dependencies : String) {
     val factory = Kobalt.INJECTOR.getInstance(DependencyManager::class.java)
     dependencies.forEach {
         Plugins.addDynamicPlugin(factory.create(it))
@@ -74,18 +37,7 @@ data class ProxyConfig(val host: String = "", val port: Int = 0, val type: Strin
     fun toAetherProxy() = Proxy(type, host, port) // TODO make support for proxy auth
 }
 
-data class HostConfig(var url: String = "", var name: String = HostConfig.createRepoName(url),
-        var username: String? = null, var password: String? = null) {
-
-    companion object {
-        /**
-         * For repos specified in the build file (repos()) that don't have an associated unique name,
-         * create such a name from the URL. This is a requirement from Maven Resolver, and failing to do
-         * this leads to very weird resolution errors.
-         */
-        private fun createRepoName(url: String) = url.replace("/", "_").replace("\\", "_").replace(":", "_")
-    }
-
+data class HostConfig(var url: String = "", var username: String? = null, var password: String? = null) {
     fun hasAuth() : Boolean {
         return (! username.isNullOrBlank()) && (! password.isNullOrBlank())
     }
@@ -99,24 +51,13 @@ data class HostConfig(var url: String = "", var name: String = HostConfig.create
     }
 }
 
+@Directive
 fun repos(vararg repos : String) {
-    KobaltLogger.logger.warn("Build.kt",
-            "Invoking repos() directly is deprecated, use the buildScript{} directive")
-    newRepos(*repos)
-}
-
-fun newRepos(vararg repos: String) {
     repos.forEach { Kobalt.addRepo(HostConfig(it)) }
 }
 
+@Directive
 fun buildFileClasspath(vararg deps: String) {
-    KobaltLogger.logger.warn("Build.kt",
-            "Invoking buildFileClasspath() directly is deprecated, use the buildScript{} directive")
-    newBuildFileClasspath(*deps)
-}
-
-fun newBuildFileClasspath(vararg deps: String) {
-    //FIXME newBuildFileClasspath called twice
     deps.forEach { Kobalt.addBuildFileClasspath(it) }
 }
 
@@ -126,7 +67,7 @@ fun authRepos(vararg repos : HostConfig) {
 }
 
 @Directive
-fun authRepo(init: HostConfig.() -> Unit) = HostConfig(name = "").apply { init() }
+fun authRepo(init: HostConfig.() -> Unit) = HostConfig().apply { init() }
 
 @Directive
 fun glob(g: String) : IFileSpec.GlobSpec = IFileSpec.GlobSpec(g)

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

@@ -3,19 +3,18 @@ package com.beust.kobalt
 import com.beust.kobalt.misc.KFiles
 
 object Constants {
-    const val LOG_QUIET_LEVEL = 0
     const val LOG_DEFAULT_LEVEL = 1
     const val LOG_MAX_LEVEL = 3
     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"
 
-    internal val DEFAULT_REPOS = listOf<HostConfig>(
+    internal val DEFAULT_REPOS = listOf<String>(
             //            "https://maven-central.storage.googleapis.com/",
-            HostConfig("https://repo1.maven.org/maven2/", "Maven"),
-            HostConfig("https://jcenter.bintray.com/", "JCenter")
-//            "https://repository.jetbrains.com/all/", // <-- contains snapshots
+            "http://repo1.maven.org/maven2/",
+            "https://jcenter.bintray.com/",
+            "http://repository.jetbrains.com/all/",
+            "https://dl.bintray.com/kotlin/kotlin-eap"
 
             // snapshots
 //            "https://oss.sonatype.org/content/repositories/snapshots/"

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

@@ -4,11 +4,9 @@ import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.annotation.Directive
 import com.beust.kobalt.internal.JvmCompilerPlugin
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
 
 @Directive
-fun project(vararg projects: Project, init: Project.() -> Unit): Project {
+public fun project(vararg projects: Project, init: Project.() -> Unit): Project {
     return Project("").apply {
         init()
         (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin)
@@ -16,24 +14,3 @@ fun project(vararg projects: Project, init: Project.() -> Unit): Project {
     }
 }
 
-@Directive
-fun buildScript(init: BuildScriptConfig.() -> Unit): BuildScriptConfig {
-    val buildScriptConfig = BuildScriptConfig().apply { init() }
-    BUILD_SCRIPT_CONFIG = buildScriptConfig
-    return buildScriptConfig
-}
-
-@Directive
-fun profile(): ReadWriteProperty<Nothing?, Boolean> {
-    val result = object: ReadWriteProperty<Nothing?, Boolean> {
-        var value: Boolean = false
-        override operator fun getValue(thisRef: Nothing?, property: KProperty<*>): Boolean {
-            return value
-        }
-
-        override operator fun setValue(thisRef: Nothing?, property: KProperty<*>, value: Boolean) {
-            this.value = value
-        }
-    }
-    return result
-}

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

@@ -28,15 +28,15 @@ sealed class IFileSpec {
         private fun isIncluded(includeMatchers: Glob, excludes: List<Glob>, rel: Path) : Boolean {
             excludes.forEach {
                 if (it.matches(rel)) {
-                    kobaltLog(3, "  Excluding ${rel.toFile()}")
+                    kobaltLog(3, "Excluding ${rel.toFile()}")
                     return false
                 }
             }
             if (includeMatchers.matches(rel)) {
-                kobaltLog(3, "  Including ${rel.toFile().path}")
+                kobaltLog(3, "Including ${rel.toFile().path}")
                 return true
             }
-            kobaltLog(2, "  Excluding ${rel.toFile()} (not matching any include pattern")
+            kobaltLog(2, "Excluding ${rel.toFile()} (not matching any include pattern")
             return false
         }
 

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

@@ -1,43 +0,0 @@
-package com.beust.kobalt
-
-import com.beust.kobalt.api.annotation.Directive
-import java.io.File
-
-/**
- * Base classes for directives that support install(from,to) (e.g. install{} or jar{}).
- */
-open class IncludeFromTo {
-    /**
-     * Prefix path to be removed from the zip file. For example, if you add "build/lib/a.jar" to the zip
-     * file and the excludePrefix is "build/lib", then "a.jar" will be added at the root of the zip file.
-     */
-    val includedFiles = arrayListOf<IncludedFile>()
-
-    @Directive
-    fun from(s: String) = From(s)
-
-    @Directive
-    fun to(s: String) = To(s)
-
-    @Directive
-    fun copy(from: From, to: To) {
-        val dir = File(from.path).absoluteFile.parentFile
-        includedFiles.add(IncludedFile(from(dir.absolutePath), to, listOf(IFileSpec.FileSpec(from.path))))
-    }
-
-    @Directive
-    fun include(vararg files: String) {
-        includedFiles.add(IncludedFile(files.map { IFileSpec.FileSpec(it) }))
-    }
-
-    @Directive
-    fun include(from: From, to: To, vararg specs: String) {
-        includedFiles.add(IncludedFile(from, to, specs.map { IFileSpec.FileSpec(it) }))
-    }
-
-    @Directive
-    fun include(from: From, to: To, vararg specs: IFileSpec.GlobSpec) {
-        includedFiles.add(IncludedFile(from, to, listOf(*specs)))
-    }
-}
-

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

@@ -1,44 +0,0 @@
-package com.beust.kobalt
-
-import com.beust.kobalt.misc.KFiles
-import com.beust.kobalt.misc.toString
-import java.io.File
-import java.nio.file.Paths
-
-class IncludedFile(val fromOriginal: From, val toOriginal: To, val specs: List<IFileSpec>,
-        val expandJarFiles: Boolean = false) {
-    constructor(specs: List<IFileSpec>, expandJarFiles: Boolean = false) : this(From(""), To(""), specs, expandJarFiles)
-    fun from(s: String) = File(if (fromOriginal.isCurrentDir()) s else KFiles.joinDir(from, s))
-    val from: String get() = fromOriginal.path.replace("\\", "/")
-    fun to(s: String) = File(if (toOriginal.isCurrentDir()) s else KFiles.joinDir(to, s))
-    val to: String get() = toOriginal.path.replace("\\", "/")
-    override fun toString() = toString("IncludedFile",
-            "files - ", specs.map { it.toString() },
-            "from", from,
-            "to", to)
-
-    fun allFromFiles(directory: String? = null): List<File> {
-        val result = arrayListOf<File>()
-        specs.forEach { spec ->
-//            val fullDir = if (directory == null) from else KFiles.joinDir(directory, from)
-            spec.toFiles(directory, from).forEach { source ->
-                result.add(if (source.isAbsolute) source else File(source.path))
-            }
-        }
-        return result.map { Paths.get(it.path).normalize().toFile()}
-    }
-}
-
-open class Direction(open val p: String) {
-    override fun toString() = path
-    fun isCurrentDir() = path == "./"
-
-    val path: String get() =
-        if (p.isEmpty()) "./"
-        else if (p.startsWith("/") || p.endsWith("/")) p
-        else p + "/"
-}
-
-class From(override val p: String) : Direction(p)
-
-class To(override val p: String) : Direction(p)

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

@@ -3,22 +3,21 @@ package com.beust.kobalt
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.archive.Archives
-import com.beust.kobalt.archive.MetaArchive
-import com.beust.kobalt.archive.Zip
+import com.beust.kobalt.archive.Jar
 import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.maven.aether.Scope
-import com.beust.kobalt.misc.KFiles
-import com.beust.kobalt.misc.kobaltLog
+import com.beust.kobalt.misc.*
 import com.google.inject.Inject
 import java.io.File
 import java.io.FileInputStream
+import java.io.OutputStream
 import java.nio.file.Paths
+import java.util.jar.JarOutputStream
 import java.util.jar.Manifest
 
-class JarGenerator @Inject constructor(val dependencyManager: DependencyManager) : ArchiveGenerator {
+class JarGenerator @Inject constructor(val dependencyManager: DependencyManager) {
     companion object {
-        fun findIncludedFiles(directory: String, files: List<IncludedFile>, excludes: List<Glob>,
-                throwOnError: Boolean = true)
+        fun findIncludedFiles(directory: String, files: List<IncludedFile>, excludes: List<Glob>)
                 : List<IncludedFile> {
             val result = arrayListOf<IncludedFile>()
             files.forEach { includedFile ->
@@ -28,7 +27,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
                     if (File(directory, fromPath).exists()) {
                         spec.toFiles(directory, fromPath).forEach { file ->
                             val fullFile = File(KFiles.joinDir(directory, fromPath, file.path))
-                            if (! fullFile.exists() && throwOnError) {
+                            if (! fullFile.exists()) {
                                 throw AssertionError("File should exist: $fullFile")
                             }
 
@@ -41,7 +40,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
 
                         }
                     } else {
-                        kobaltLog(2, "  Directory $fromPath doesn't exist, not including it in the jar")
+                        kobaltLog(2, "Directory $fromPath doesn't exist, not including it in the jar")
                     }
                 }
                 if (includedSpecs.size > 0) {
@@ -53,9 +52,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
         }
     }
 
-    override val suffix = ".jar"
-
-    override fun findIncludedFiles(project: Project, context: KobaltContext, zip: Zip) : List<IncludedFile> {
+    fun findIncludedFiles(project: Project, context: KobaltContext, jar: Jar) : List<IncludedFile> {
         //
         // Add all the applicable files for the current project
         //
@@ -63,7 +60,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
         val result = arrayListOf<IncludedFile>()
         val classesDir = KFiles.makeDir(buildDir.path, "classes")
 
-        if (zip.includedFiles.isEmpty()) {
+        if (jar.includedFiles.isEmpty()) {
             // If no includes were specified, assume the user wants a simple jar file made of the
             // classes of the project, so we specify a From("build/classes/"), To("") and
             // a list of files containing everything under it
@@ -73,7 +70,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
             // Class files
             val files = KFiles.findRecursively(classesDir).map { File(relClassesDir.toFile(), it) }
             val filesNotExcluded : List<File> = files.filter {
-                ! KFiles.Companion.isExcluded(KFiles.joinDir(project.directory, it.path), zip.excludes)
+                ! KFiles.Companion.isExcluded(KFiles.joinDir(project.directory, it.path), jar.excludes)
             }
             val fileSpecs = arrayListOf<IFileSpec>()
             filesNotExcluded.forEach {
@@ -89,14 +86,16 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
             //
             // The user specified an include, just use it verbatim
             //
-            val includedFiles = findIncludedFiles(project.directory, zip.includedFiles, zip.excludes, false)
+            val includedFiles = findIncludedFiles(project.directory, jar.includedFiles, jar.excludes)
             result.addAll(includedFiles)
         }
 
         //
         // If fatJar is true, add all the transitive dependencies as well: compile, runtime and dependent projects
         //
-        if (zip.fatJar) {
+        if (jar.fatJar) {
+            context.logger.log(project.name, 2, "Finding included files for fat jar")
+
             val seen = hashSetOf<String>()
             @Suppress("UNCHECKED_CAST")
             val allDependencies = project.compileDependencies + project.compileRuntimeDependencies +
@@ -105,13 +104,13 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
                 context.variant.productFlavor.compileDependencies +
                 context.variant.productFlavor.compileRuntimeDependencies
             val transitiveDependencies = dependencyManager.calculateDependencies(project, context,
-                    scopes = listOf(Scope.COMPILE), passedDependencies = allDependencies)
+                    listOf(Scope.COMPILE), allDependencies)
             transitiveDependencies.map {
                 it.jarFile.get()
             }.forEach { file : File ->
                 if (! seen.contains(file.path)) {
                     seen.add(file.path)
-                    if (! KFiles.Companion.isExcluded(file, zip.excludes)) {
+                    if (! KFiles.Companion.isExcluded(file, jar.excludes)) {
                         result.add(IncludedFile(specs = arrayListOf(IFileSpec.FileSpec(file.absolutePath)),
                                 expandJarFiles = true))
                     }
@@ -122,18 +121,19 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
         return result
     }
 
-    override fun generateArchive(project: Project, context: KobaltContext, zip: Zip,
-            includedFiles: List<IncludedFile>) : File {
+    fun generateJar(project: Project, context: KobaltContext, jar: Jar) : File {
+        val includedFiles = findIncludedFiles(project, context, jar)
+
         //
         // Generate the manifest
         // If manifest attributes were specified in the build file, use those to generateAndSave the manifest. Otherwise,
         // try to find a META-INF/MANIFEST.MF and use that one if we find any. Otherwise, use the default manifest.
         //
         val manifest =
-            if (zip.attributes.size > 1) {
-                context.logger.log(project.name, 2, "Creating MANIFEST.MF from " + zip.attributes.size + " attributes")
+            if (jar.attributes.size > 1) {
+                context.logger.log(project.name, 2, "Creating MANIFEST.MF from " + jar.attributes.size + " attributes")
                 Manifest().apply {
-                    zip.attributes.forEach { attribute ->
+                    jar.attributes.forEach { attribute ->
                         mainAttributes.putValue(attribute.first, attribute.second)
                     }
                 }
@@ -142,7 +142,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
                     val allFiles = includedFiles.flatMap { file ->
                         file.allFromFiles(project.directory).map { file.from(it.path) }
                     }
-                    val manifestFiles = allFiles.filter { it.path.contains(MetaArchive.MANIFEST_MF) }
+                    val manifestFiles = allFiles.filter { it.path.contains("META-INF/MANIFEST.MF") }
                     return if (manifestFiles.any()) manifestFiles[0] else null
                 }
 
@@ -151,12 +151,14 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
                     context.logger.log(project.name, 2, "Including MANIFEST.MF file $manifestFile")
                     Manifest(FileInputStream(manifestFile))
                 } else {
-                    null
+                    Manifest()
                 }
             }
 
-        return Archives.generateArchive(project, context, zip.name, ".jar", includedFiles,
-                true /* expandJarFiles */, manifest)
+        val jarFactory = { os: OutputStream -> JarOutputStream(os, manifest) }
+
+        return Archives.generateArchive(project, context, jar.name, ".jar", includedFiles,
+                true /* expandJarFiles */, jarFactory)
     }
 
 }

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

@@ -2,18 +2,18 @@ package com.beust.kobalt
 
 import java.io.File
 
-abstract class JavaInfo {
-    val javaExecutable: File?
+abstract public class JavaInfo {
+    public var javaExecutable: File? = null
         get() = findExecutable("java")
-    val javacExecutable: File?
+    public var javacExecutable: File? = null
         get() = findExecutable("javac")
-    val javadocExecutable: File?
+    public var javadocExecutable: File? = null
         get() = findExecutable("javadoc")
-    abstract var javaHome: File?
-    abstract var runtimeJar: File?
-    abstract var toolsJar: File?
+    abstract public var javaHome: File?
+    abstract public var runtimeJar: File?
+    abstract public var toolsJar: File?
 
-    abstract fun findExecutable(command: String) : File
+    abstract public fun findExecutable(command: String) : File
 
     companion object {
         fun create(javaBase: File?): Jvm {

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

@@ -5,14 +5,14 @@ import com.beust.kobalt.misc.warn
 import java.io.File
 import java.io.IOException
 
-open class Jvm constructor(
+public open class Jvm constructor(
         val os: OperatingSystem,
         var javaBase: File? = null) : JavaInfo() {
 
     private var _javaHome: File? = null
-    override var javaHome: File? = null
+    override public var javaHome: File? = null
         get() = _javaHome!!
-    override var runtimeJar: File? = null
+    override public var runtimeJar: File? = null
     private fun findRuntimeJar() : File? {
         var runtimeJar = File(javaBase, "lib/rt.jar")
         if (runtimeJar.exists()) {
@@ -21,7 +21,7 @@ open class Jvm constructor(
         runtimeJar = File(javaBase, "jre/lib/rt.jar")
         return if (runtimeJar.exists()) runtimeJar else null
     }
-    override var toolsJar: File? = null
+    override public var toolsJar: File? = null
 
     private var userSupplied: Boolean? = false
     private var javaVersion: String? = null
@@ -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
@@ -89,7 +89,7 @@ open class Jvm constructor(
         return null
     }
 
-//    open fun isIbmJvm(): Boolean {
+//    open public fun isIbmJvm(): Boolean {
 //        return false
 //    }
 
@@ -97,7 +97,7 @@ open class Jvm constructor(
         if (javaHome != null) {
             val jdkHome = if (javaHome!!.endsWith("jre")) javaHome!!.parentFile else javaHome
             val exec = File(jdkHome, "bin/" + command)
-            val executable = File(os.getExecutableName(exec.absolutePath))
+            var executable = File(os.getExecutableName(exec.absolutePath))
             if (executable.isFile) {
                 return executable
             }

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

@@ -4,14 +4,11 @@ import com.beust.kobalt.api.*
 import com.beust.kobalt.api.annotation.IncrementalTask
 import com.beust.kobalt.api.annotation.Task
 import com.beust.kobalt.internal.IncrementalManager
-import com.beust.kobalt.internal.KobaltSettings
 import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.internal.TaskManager
 import com.beust.kobalt.maven.DependencyManager
-import com.beust.kobalt.misc.JarUtils
-import com.beust.kobalt.misc.KFiles
-import com.beust.kobalt.misc.KobaltExecutors
-import com.beust.kobalt.misc.kobaltLog
+import com.beust.kobalt.maven.LocalRepo
+import com.beust.kobalt.misc.*
 import com.google.inject.Provider
 import java.io.File
 import java.lang.reflect.Method
@@ -26,8 +23,9 @@ import javax.inject.Singleton
 class Plugins @Inject constructor (val taskManagerProvider : Provider<TaskManager>,
         val files: KFiles,
         val depManager: DependencyManager,
-        val settings: KobaltSettings,
+        val localRepo: LocalRepo,
         val executors: KobaltExecutors,
+        val pluginInfo: PluginInfo,
         val incrementalManagerFactory: IncrementalManager.IFactory,
         val taskManager: TaskManager) {
 
@@ -170,9 +168,6 @@ class Plugins @Inject constructor (val taskManagerProvider : Provider<TaskManage
 
     val dependencies = arrayListOf<IClasspathDependency>()
 
-//    @Inject
-//    lateinit var pluginInfo: PluginInfo
-
     fun installPlugins(dependencies: List<IClasspathDependency>, scriptClassLoader: ClassLoader) {
         val executor = executors.newExecutor("Plugins", 5)
         dependencies.forEach {
@@ -193,8 +188,6 @@ class Plugins @Inject constructor (val taskManagerProvider : Provider<TaskManage
                 // The plug-in is pointing to a jar file, read kobalt-plugin.xml from it
                 JarUtils.extractTextFile(JarFile(file), PluginInfo.PLUGIN_XML)
             }
-
-            val pluginInfo = Kobalt.INJECTOR.getInstance(PluginInfo::class.java)
             if (pluginXml != null) {
                 val pluginClassLoader = URLClassLoader(arrayOf(file.toURI().toURL()))
                 val thisPluginInfo = PluginInfo.readPluginXml(pluginXml, pluginClassLoader, scriptClassLoader)

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

@@ -3,11 +3,11 @@ package com.beust.kobalt
 import com.beust.kobalt.api.IClasspathDependency
 import com.beust.kobalt.maven.LocalRepo
 import com.beust.kobalt.maven.MavenId
-import com.beust.kobalt.maven.aether.*
-import com.beust.kobalt.misc.*
+import com.beust.kobalt.maven.aether.KobaltAether
+import com.beust.kobalt.misc.KobaltExecutors
+import com.beust.kobalt.misc.Node
+import com.beust.kobalt.misc.kobaltLog
 import com.google.inject.Inject
-import org.eclipse.aether.artifact.DefaultArtifact
-import org.eclipse.aether.graph.DependencyNode
 import java.util.*
 
 /**
@@ -15,7 +15,7 @@ import java.util.*
  */
 class ResolveDependency @Inject constructor(
         val localRepo: LocalRepo,
-        val aether: KobaltMavenResolver,
+        val aether: KobaltAether,
         val executors: KobaltExecutors) {
     val increment = 8
     val leftFirst = "\u2558"
@@ -27,35 +27,11 @@ class ResolveDependency @Inject constructor(
 
     fun run(id: String) = displayDependenciesFor(id)
 
-    private fun latestMavenArtifact(group: String, artifactId: String, extension: String = "jar"): DependencyNode {
-        val artifact = DefaultArtifact(group, artifactId, extension, "(0,]")
-        val resolved = aether.resolveRange(artifact)
-        if (resolved != null) {
-            val newArtifact = DefaultArtifact(artifact.groupId, artifact.artifactId, artifact.extension,
-                    resolved.highestVersion.toString())
-            val artifactResult = aether.resolve(KobaltMavenResolver.artifactToId(newArtifact), null)
-            return artifactResult.root
-        } else {
-            throw KobaltException("Couldn't find latest artifact for $group:$artifactId")
-        }
-    }
-
-    class PairResult(val dependency: IClasspathDependency, val repoUrl: String)
-
-    fun latestArtifact(group: String, artifactId: String, extension: String = "jar"): PairResult
-            = latestMavenArtifact(group, artifactId, extension).let {
-        PairResult(AetherDependency(it.artifact), "(TBD repo)")
-    }
-
     private fun displayDependenciesFor(id: String) {
         val mavenId = MavenId.create(id)
-        val resolved : PairResult =
-            if (mavenId.hasVersion) {
-                val node = aether.resolve(id, filter = Filters.EXCLUDE_OPTIONAL_FILTER)
-                PairResult(AetherDependency(node.root.artifact), node.artifactResults[0].repository.toString())
-            } else {
-                latestArtifact(mavenId.groupId, mavenId.artifactId)
-            }
+        val resolved =
+            if (mavenId.hasVersion) aether.resolve(id)
+            else aether.latestArtifact(mavenId.groupId, mavenId.artifactId)
 
         displayDependencies(resolved.dependency, resolved.repoUrl)
     }
@@ -69,7 +45,7 @@ class ResolveDependency @Inject constructor(
         kobaltLog(1, AsciiArt.logBox(listOf(dep.id, url, dep.jarFile.get()).map { "          $it" }))
 
         display(root.children)
-        kobaltLog(1, "")
+        println("")
     }
 
     private fun display(nodes: List<Node<Dep>>) {
@@ -81,12 +57,10 @@ class ResolveDependency @Inject constructor(
                         else leftMiddle
                 val indent = level * increment
                 for(i in 0..indent - 2) {
-                    if (!KobaltLogger.isQuiet) {
-                        if (i == 0 || ((i + 1) % increment == 0)) print(vertical)
-                        else print(" ")
-                    }
+                    if (i % increment == 0) print(vertical)
+                    else print(" ")
                 }
-                kobaltLog(1, left + " " + dep.id + (if (dep.optional) " (optional)" else ""))
+                println(left + " " + dep.id)
                 display(node.children)
             }
         }
@@ -102,12 +76,7 @@ class ResolveDependency @Inject constructor(
                 kobaltLog(2, "Found dependency ${dep.dep.id} level: ${dep.level}")
                 result.add(node)
                 seen.add(it.id)
-                try {
-                    node.addChildren(findChildren(node, seen))
-                } catch(ex: Exception) {
-                    if (! it.optional) warn("Couldn't resolve " + node)
-                    // else don't warn about missing optional dependencies
-                }
+                node.addChildren(findChildren(node, seen))
             }
         }
         kobaltLog(2, "Children for ${root.value.dep.id}: ${result.size}")

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

@@ -1,17 +1,9 @@
 package com.beust.kobalt
 
-class SystemProperties {
+public class SystemProperties {
     companion object {
-        val javaBase : String
-            get() {
-                val jh = System.getenv("JAVA_HOME")
-                    ?: System.getProperty("java.home")
-                    ?: throw IllegalArgumentException("JAVA_HOME not defined")
-                val result =
-                    if (jh.toLowerCase().endsWith("jre")) jh.substring(0, jh.length - 4)
-                    else jh
-                return result
-            }
+        val javaBase = System.getProperty("java.home") ?:
+                (System.getenv("JAVA_HOME") ?: throw IllegalArgumentException("JAVA_HOME not defined"))
         val javaVersion = System.getProperty("java.version")
         val homeDir = System.getProperty("user.home")
         val tmpDir = System.getProperty("java.io.tmpdir")

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

@@ -1,8 +1,3 @@
 package com.beust.kobalt
 
-class TestResult(val success: Boolean, val shortMessage: String? = null, val longMessage: String? = null)
-
-open class TaskResult(val success: Boolean = true,
-        val testResult: TestResult? = null,
-        val errorMessage: String? = null
-)
+open public class TaskResult(val success: Boolean = true, val errorMessage: String? = null)

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

@@ -1,40 +0,0 @@
-package com.beust.kobalt
-
-import com.beust.kobalt.api.Project
-import com.beust.kobalt.api.annotation.Directive
-
-class TestConfig(val project: Project, val isDefault : Boolean = false) {
-    val testArgs = arrayListOf<String>()
-    val jvmArgs = arrayListOf<String>()
-    val testIncludes = arrayListOf("**/*Test.class")
-    val testExcludes = arrayListOf<String>()
-
-    @Directive
-    var name: String = ""
-
-    @Directive
-    fun args(vararg arg: String) {
-        testArgs.addAll(arg)
-    }
-
-    @Directive
-    fun jvmArgs(vararg arg: String) {
-        jvmArgs.addAll(arg)
-    }
-
-    @Directive
-    fun include(vararg arg: String) {
-        testIncludes.apply {
-            clear()
-            addAll(arg)
-        }
-    }
-
-    @Directive
-    fun exclude(vararg arg: String) {
-        testExcludes.apply {
-            clear()
-            addAll(arg)
-        }
-    }
-}

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

@@ -3,13 +3,43 @@ package com.beust.kobalt
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.annotation.Directive
 
+class TestConfig(val project: Project, val isDefault : Boolean = false) {
+    val testArgs = arrayListOf<String>()
+    val jvmArgs = arrayListOf<String>()
+    val testIncludes = arrayListOf("**/*Test.class")
+    val testExcludes = arrayListOf<String>()
+
+    var name: String = ""
+
+    fun args(vararg arg: String) {
+        testArgs.addAll(arg)
+    }
+
+    fun jvmArgs(vararg arg: String) {
+        jvmArgs.addAll(arg)
+    }
+
+    fun include(vararg arg: String) {
+        testIncludes.apply {
+            clear()
+            addAll(arg)
+        }
+    }
+
+    fun exclude(vararg arg: String) {
+        testExcludes.apply {
+            clear()
+            addAll(arg)
+        }
+    }
+}
+
 @Directive
-fun Project.test(init: TestConfig.() -> Unit): TestConfig = let { project ->
+fun Project.test(init: TestConfig.() -> Unit) = let { project ->
     with(testConfigs) {
         val tf = TestConfig(project).apply { init() }
         if (! map { it.name }.contains(tf.name)) {
             add(tf)
-            tf
         } else {
             throw KobaltException("Test configuration \"${tf.name}\" already exists, give it a different "
                     + "name with test { name = ... }")

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

@@ -29,7 +29,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
     /**
      * for {internal, release}, return [internalRelease, internal, release]
      */
-    fun allDirectories(): List<String> {
+    fun allDirectories(project: Project): List<String> {
         return arrayListOf<String>().apply {
             add(toCamelcaseDir())
             add(productFlavor.name)
@@ -70,7 +70,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
         val result = arrayListOf<File>()
         val sourceDirectories = sourceSet.correctSourceSet(project)
                 .filter { File(project.directory, it).exists() }
-                .map(::File)
+                .map { File(it) }
 
         if (isDefault) {
             result.addAll(sourceDirectories)
@@ -88,7 +88,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
                 result.add(dir)
             }
 
-            result.addAll(allDirectories()
+            result.addAll(allDirectories(project)
                     .map { File(KFiles.joinDir("src", it, suffix)) }
                     .filter(File::exists))
 
@@ -113,8 +113,8 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
             if (isDefault) {
                 archiveName ?: project.name + "-" + project.version + suffix
             } else {
-                val base = archiveName?.substring(0, archiveName.length - suffix.length)
-                        ?: project.name + "-" + project.version
+                val base = if (archiveName != null) archiveName.substring(0, archiveName.length - suffix.length)
+                    else project.name + "-" + project.version
                 val flavor = if (productFlavor.name.isEmpty()) "" else "-" + productFlavor.name
                 val type = if (buildType.name.isEmpty()) "" else "-" + buildType.name
                 val result: String = base + flavor + type + suffix
@@ -124,16 +124,18 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
         return result
     }
 
+    val shortArchiveName = if (isDefault) "" else "-" + productFlavor.name + "-" + buildType.name
+
     var generatedSourceDirectory: File? = null
 
     private fun findBuildTypeBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
         val buildTypeName = variant?.buildType?.name
-        return project.buildTypes[buildTypeName]?.buildConfig
+        return project.buildTypes[buildTypeName]?.buildConfig ?: null
     }
 
     private fun findProductFlavorBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
         val buildTypeName = variant?.productFlavor?.name
-        return project.productFlavors[buildTypeName]?.buildConfig
+        return project.productFlavors[buildTypeName]?.buildConfig ?: null
     }
 
     /**
@@ -162,8 +164,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
                     ?: throw KobaltException(
                     "packageName needs to be defined on the project in order to generateAndSave BuildConfig")
 
-            val contributor = ActorUtils.selectAffinityActor(project, context,
-                    context.pluginInfo.buildConfigContributors)
+            val contributor = ActorUtils.selectAffinityActor(context.pluginInfo.buildConfigContributors, project)
             if (contributor != null) {
                 val code = contributor.generateBuildConfig(project, context, pkg, this, buildConfigs)
                 val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig"))
@@ -221,7 +222,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
     }
 
     fun toCamelcaseDir() : String {
-        fun lci(s : String) = if (s.isEmpty() || s.length == 1) s else s[0].toLowerCase() + s.substring(1)
+        fun lci(s : String) = if (s.length == 0 || s.length == 1) s else s[0].toLowerCase() + s.substring(1)
 
         return lci(productFlavor.name) + buildType.name.capitalize()
     }

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

@@ -11,6 +11,4 @@ data class CompilerActionInfo(val directory: String?,
         val suffixesBeingCompiled: List<String>,
         val outputDir: File,
         val compilerArgs: List<String>,
-        val friendPaths: List<String>,
-        val forceRecompile: Boolean,
-        val compilerSeparateProcess: Boolean = false)
+        val friendPaths: List<String>)

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

@@ -11,9 +11,7 @@ interface IDependencyHolder {
     var project: Project
 
     val compileDependencies : ArrayList<IClasspathDependency>
-    val optionalDependencies : ArrayList<IClasspathDependency>
     val compileProvidedDependencies : ArrayList<IClasspathDependency>
-    val compileOnlyDependencies : ArrayList<IClasspathDependency>
     val compileRuntimeDependencies : ArrayList<IClasspathDependency>
     val excludedDependencies : ArrayList<IClasspathDependency>
     val nativeDependencies : ArrayList<IClasspathDependency>
@@ -28,9 +26,7 @@ interface IDependencyHolder {
 open class DependencyHolder : IDependencyHolder {
     override lateinit var project: Project
     override val compileDependencies : ArrayList<IClasspathDependency> = arrayListOf()
-    override val optionalDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     override val compileProvidedDependencies : ArrayList<IClasspathDependency> = arrayListOf()
-    override val compileOnlyDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     override val compileRuntimeDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     override val excludedDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     override val nativeDependencies : ArrayList<IClasspathDependency> = arrayListOf()
@@ -38,8 +34,8 @@ open class DependencyHolder : IDependencyHolder {
     override var dependencies : Dependencies? = null
 
     override fun dependencies(init: Dependencies.() -> Unit) : Dependencies {
-        dependencies = Dependencies(project, compileDependencies, optionalDependencies, compileProvidedDependencies,
-                compileOnlyDependencies, compileRuntimeDependencies, excludedDependencies, nativeDependencies)
+        dependencies = Dependencies(project, compileDependencies, compileProvidedDependencies,
+                compileRuntimeDependencies, excludedDependencies, nativeDependencies)
         dependencies!!.init()
         return dependencies!!
     }

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/api/IBuildListener.kt

@@ -4,12 +4,8 @@ package com.beust.kobalt.api
  * Plug-ins that listen to build events.
  */
 interface IBuildListener : IListener {
-
-    class TaskEndInfo(val success: Boolean, val shortMessage: String? = null,
-            val longMessage: String? = null)
-
     fun taskStart(project: Project, context: KobaltContext, taskName: String) {}
-    fun taskEnd(project: Project, context: KobaltContext, taskName: String, info: TaskEndInfo) {}
+    fun taskEnd(project: Project, context: KobaltContext, taskName: String, success: Boolean) {}
 
     fun projectStart(project: Project, context: KobaltContext) {}
     fun projectEnd(project: Project, context: KobaltContext, status: ProjectBuildStatus) {}

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

@@ -22,20 +22,15 @@ interface IClasspathDependency {
     /** @return true if this dependency represents a Maven coordinate */
     val isMaven: Boolean
 
-    /** @return true if this dependency is optional */
-    val optional: Boolean
-
     /** Absolute path to the jar file on the local file system */
     val jarFile: Future<File>
 
     /** Convert to a Maven <dependency> model tag */
-    fun toMavenDependencies(scope: String? = null) : Dependency
+    fun toMavenDependencies() : Dependency
 
     /** The list of dependencies for this element (not the transitive closure) */
     fun directDependencies(): List<IClasspathDependency>
 
     /** Used to only keep the most recent version for an artifact if no version was specified */
     val shortId: String
-
-    val excluded: ArrayList<Dependencies.ExcludeConfig>
 }

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

@@ -1,6 +1,7 @@
 package com.beust.kobalt.api
 
 import com.beust.kobalt.TaskResult
+import com.beust.kobalt.misc.warn
 
 interface ICompilerDescription : Comparable<ICompilerDescription> {
     /**
@@ -54,15 +55,13 @@ class CompilerDescription(override val name: String,  override val sourceDirecto
         override val canCompileDirectories: Boolean = false) : ICompilerDescription {
     override fun compile(project: Project, context: KobaltContext, info: CompilerActionInfo): TaskResult {
         val result =
-            if (info.sourceFiles.isNotEmpty()) {
+            if (info.sourceFiles.size > 0) {
                 compiler.compile(project, context, info)
             } else {
-                context.logger.log(project.name, 2, "$name couldn't find any source files to compile")
+                warn("Couldn't find any source files to compile")
                 TaskResult()
             }
         return result
     }
-
-    override fun toString() = name + " compiler"
 }
 

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

@@ -3,27 +3,13 @@ package com.beust.kobalt.api
 /**
  * Plugins that add compiler flags.
  */
-class FlagContributor(val flagPriority: Int = DEFAULT_FLAG_PRIORITY,
-        val closure: (project: Project, context: KobaltContext, currentFlags: List<String>,
-                suffixesBeingCompiled: List<String>) -> List<String>) : IContributor {
+interface ICompilerFlagContributor : IContributor {
+    fun flagsFor(project: Project, context: KobaltContext, currentFlags: List<String>,
+            suffixesBeingCompiled: List<String>): List<String>
+    val flagPriority: Int
+        get() = DEFAULT_FLAG_PRIORITY
+
     companion object {
         val DEFAULT_FLAG_PRIORITY = 20
     }
-
-    fun flagsFor(project: Project, context: KobaltContext, currentFlags: List<String>,
-            suffixesBeingCompiled: List<String>) = closure(project, context, currentFlags, suffixesBeingCompiled)
 }
-
-interface IFlagBase {
-    val flagPriority: Int get() = FlagContributor.DEFAULT_FLAG_PRIORITY
-}
-
-interface ICompilerFlagContributor : IContributor, IFlagBase {
-    fun compilerFlagsFor(project: Project, context: KobaltContext, currentFlags: List<String>,
-            suffixesBeingCompiled: List<String>): List<String>
-}
-
-interface IDocFlagContributor : IContributor, IFlagBase {
-    fun docFlagsFor(project: Project, context: KobaltContext, currentFlags: List<String>,
-            suffixesBeingCompiled: List<String>): List<String>
-}

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

@@ -1,11 +1,6 @@
 package com.beust.kobalt.api
 
-import com.beust.kobalt.maven.aether.Filters.EXCLUDE_OPTIONAL_FILTER
-import com.beust.kobalt.maven.aether.KobaltMavenResolver
 import com.beust.kobalt.maven.aether.Scope
-import com.beust.kobalt.misc.kobaltLog
-import org.eclipse.aether.graph.DependencyFilter
-import org.eclipse.aether.graph.DependencyNode
 
 /**
  * Manage the creation of dependencies and also provide dependencies for projects.
@@ -14,12 +9,12 @@ interface IDependencyManager {
     /**
      * Parse the id and return the correct IClasspathDependency
      */
-    fun create(id: String, optional: Boolean = false, projectDirectory: String? = null): IClasspathDependency
+    fun create(id: String, projectDirectory: String? = null): IClasspathDependency
 
     /**
      * Create an IClasspathDependency from a Maven id.
      */
-    fun createMaven(id: String, optional: Boolean = false): IClasspathDependency
+    fun createMaven(id: String): IClasspathDependency
 
     /**
      * Create an IClasspathDependency from a path.
@@ -29,7 +24,7 @@ interface IDependencyManager {
     /**
      * @return the source dependencies for this project, including the contributors.
      */
-    fun dependencies(project: Project, context: KobaltContext, scopes: List<Scope>): List<IClasspathDependency>
+    fun dependencies(project: Project, context: KobaltContext): List<IClasspathDependency>
 
     /**
      * @return the test dependencies for this project, including the contributors.
@@ -41,48 +36,6 @@ interface IDependencyManager {
      * allDependencies is typically either compileDependencies or testDependencies
      */
     fun calculateDependencies(project: Project?, context: KobaltContext,
-            dependencyFilter: DependencyFilter =
-                createDependencyFilter(project, project?.compileDependencies ?: emptyList()),
-            scopes: List<Scope> = listOf(Scope.COMPILE),
+            scopeFilters: Collection<Scope> = listOf(Scope.COMPILE),
             vararg passedDependencies: List<IClasspathDependency>): List<IClasspathDependency>
-
-    /**
-     * Create an Aether dependency filter that uses the dependency configuration included in each
-     * IClasspathDependency.
-     */
-    fun createDependencyFilter(project: Project?, dependencies: List<IClasspathDependency>) : DependencyFilter {
-        return DependencyFilter { p0, p1 ->
-            fun isNodeExcluded(node: DependencyNode, passedDep: IClasspathDependency) : Boolean {
-                val dep = create(KobaltMavenResolver.artifactToId(node.artifact))
-                return passedDep.excluded.any { ex -> ex.isExcluded(dep)}
-            }
-            fun isDepExcluded(node: DependencyNode, excluded: List<IClasspathDependency>?) : Boolean {
-                val dep = create(KobaltMavenResolver.artifactToId(node.artifact))
-                return excluded?.map { it.id }?.contains(dep.id) ?: false
-            }
-
-            val accept = dependencies.isEmpty() || dependencies.any {
-                // Is this dependency excluded?
-                val isExcluded = isNodeExcluded(p0, it) || isDepExcluded(p0, project?.excludedDependencies)
-
-                // Is the parent dependency excluded?
-                val isParentExcluded =
-                    if (p1.any()) {
-                        isNodeExcluded(p1[0], it) || isDepExcluded(p1[0], project?.excludedDependencies)
-                    } else {
-                        false
-                    }
-
-                // Only accept if no exclusions were found
-                ! isExcluded && ! isParentExcluded
-            }
-
-            if (! accept) {
-                kobaltLog(2, "Excluding $p0")
-            }
-
-            if (accept) EXCLUDE_OPTIONAL_FILTER.accept(p0, p1)
-            else accept
-        }
-    }
 }

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

@@ -1,11 +1,10 @@
 package com.beust.kobalt.api
 
 import com.beust.kobalt.TaskResult
+import com.beust.kobalt.api.IClasspathDependency
 
 /**
  * Plugins that can run a project (task "run" or "test") should implement this interface.
- *
- * Currently not used.
  */
 interface IRunnerContributor : IContributor, IProjectAffinity {
     /**

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

@@ -23,10 +23,9 @@ class DynamicTask(override val plugin: IPlugin, override val name: String, overr
 
     override fun call(): TaskResult2<ITask> {
         val taskResult = closure.invoke(project)
-        return TaskResult2(taskResult.success, errorMessage = taskResult.errorMessage, value = this)
+        return TaskResult2(taskResult.success, taskResult.errorMessage, this)
     }
 
-    override fun toString() =
-        "[DynamicTask ${project.name}:$name dependsOn=$dependsOn reverseDependsOn=$reverseDependsOn]"
+    override fun toString() = "[DynamicTask $name dependsOn=$dependsOn reverseDependsOn=$reverseDependsOn]"
 }
 

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

@@ -1,55 +0,0 @@
-package com.beust.kobalt.api
-
-import com.beust.kobalt.Args
-import com.beust.kobalt.misc.KFiles
-import com.beust.kobalt.misc.kobaltLog
-import java.io.*
-import java.net.URL
-import java.util.jar.JarInputStream
-
-/**
- * Base class for templates that decompress a jar file.
- */
-interface InputStreamJarTemplate : ITemplate {
-    val inputStream: InputStream
-
-    override fun generateTemplate(args: Args, classLoader: ClassLoader) {
-        val destDir = File(".")
-        JarInputStream(inputStream).use { ins ->
-            var entry = ins.nextEntry
-            while (entry != null) {
-                val f = File(destDir.path + File.separator + entry.name)
-                if (entry.isDirectory) {
-                    f.mkdir()
-                    entry = ins.nextEntry
-                    continue
-                }
-
-                kobaltLog(2, "  Extracting: $entry to ${f.absolutePath}")
-                FileOutputStream(f).use { fos ->
-                    KFiles.copy(ins, fos)
-                }
-                entry = ins.nextEntry
-            }
-        }
-    }
-}
-
-abstract class ResourceJarTemplate(jarName: String, val classLoader: ClassLoader) : InputStreamJarTemplate {
-    override val inputStream : InputStream = classLoader.getResource(jarName).openConnection().inputStream
-}
-
-abstract class FileJarTemplate(val fileName: String) : InputStreamJarTemplate {
-    override val inputStream = FileInputStream(File(fileName))
-}
-
-abstract class HttpJarTemplate(val url: String) : InputStreamJarTemplate {
-    override val inputStream : InputStream
-        get() {
-            try {
-                return URL(url).openConnection().inputStream
-            } catch(ex: IOException) {
-                throw IllegalArgumentException("Couldn't connect to $url")
-            }
-        }
-}

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

@@ -0,0 +1,41 @@
+package com.beust.kobalt.api
+
+import com.beust.kobalt.Args
+import com.beust.kobalt.misc.KFiles
+import com.beust.kobalt.misc.kobaltLog
+import java.io.File
+import java.io.FileOutputStream
+import java.util.jar.JarInputStream
+
+/**
+ * Base class for templates that simply decompress a jar file to generate their project.
+ */
+abstract class JarTemplate(val jarName: String) : ITemplate {
+    companion object {
+        fun extractFile(ins: JarInputStream, destDir: File) {
+            var entry = ins.nextEntry
+            while (entry != null) {
+                val f = File(destDir.path + File.separator + entry.name)
+                if (entry.isDirectory) {
+                    f.mkdir()
+                    entry = ins.nextEntry
+                    continue
+                }
+
+                kobaltLog(2, "Extracting: $entry to ${f.absolutePath}")
+                FileOutputStream(f).use { fos ->
+                    KFiles.copy(ins, fos)
+                }
+                entry = ins.nextEntry
+            }
+        }
+    }
+
+    override fun generateTemplate(args: Args, classLoader: ClassLoader) {
+        kobaltLog(2, "Generating template with class loader $classLoader")
+        val destDir = File(".")
+        val ins = JarInputStream(classLoader.getResource(jarName).openConnection().inputStream)
+        extractFile(ins, destDir)
+    }
+
+}

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

@@ -5,7 +5,6 @@ import com.beust.kobalt.HostConfig
 import com.beust.kobalt.Plugins
 import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.maven.DependencyManager
-import com.beust.kobalt.maven.aether.KobaltMavenResolver
 import com.google.inject.Guice
 import com.google.inject.Injector
 import com.google.inject.Module
@@ -36,12 +35,12 @@ class Kobalt {
          */
         val repos : Set<HostConfig>
             get() {
-                val settingsRepos = Kobalt.context?.settings?.defaultRepos?.map { HostConfig(it) } ?: emptyList()
+                val settingsRepos = Kobalt.context?.settings?.defaultRepos ?: emptyList()
                 // Repos from <default-repos> in the settings
                 val result = ArrayList(
                         (if (settingsRepos.isEmpty()) Constants.DEFAULT_REPOS
                         else settingsRepos)
-                    )
+                    .map { HostConfig(it) })
 
                 // Repo from <kobalt-compiler-repo> in the settings
                 Kobalt.context?.settings?.kobaltCompilerRepo?.let {
@@ -56,9 +55,6 @@ class Kobalt {
                 // Repos from the build file
                 result.addAll(reposFromBuildFiles)
 
-                result.forEach {
-                    KobaltMavenResolver.initAuthentication(it)
-                }
                 return result.toHashSet()
             }
 
@@ -122,20 +118,5 @@ class Kobalt {
             get() = Duration.parse( kobaltProperties.getProperty(PROPERTY_KOBALT_VERSION_CHECK_TIMEOUT) ?: "P1D")
 
         fun findPlugin(name: String) = Plugins.findPlugin(name)
-
-        val optionsFromBuild = arrayListOf<String>()
-        fun addKobaltOptions(options: Array<out String>) {
-            optionsFromBuild.addAll(options)
-        }
-
-        val buildSourceDirs = arrayListOf<String>()
-        fun addBuildSourceDirs(dirs: Array<out String>) {
-            buildSourceDirs.addAll(dirs)
-        }
-
-        fun cleanUp() {
-            buildSourceDirs.clear()
-            buildFileClasspath.clear()
-        }
     }
 }

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

@@ -12,7 +12,7 @@ import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.maven.MavenId
 import com.beust.kobalt.maven.PomGenerator
 import com.beust.kobalt.maven.SimpleDep
-import com.beust.kobalt.maven.aether.KobaltMavenResolver
+import com.beust.kobalt.maven.aether.KobaltAether
 import com.beust.kobalt.misc.KobaltExecutors
 import java.io.File
 
@@ -53,9 +53,9 @@ class KobaltContext(val args: Args) {
                 FileType.JAVADOC -> toQualifier(dep, "", "javadoc")
                 FileType.OTHER -> id
             }
-        val resolved = resolver.resolveToArtifact(fullId)
+        val resolved = aether.resolveToArtifact(fullId)
         if (resolved != null) {
-            return resolved.file
+            return resolved.artifact.file
         } else {
             throw KobaltException("Couldn't resolve $id")
         }
@@ -81,7 +81,7 @@ class KobaltContext(val args: Args) {
     lateinit var executors: KobaltExecutors
     lateinit var settings: KobaltSettings
     lateinit var incrementalManager: IncrementalManager
-    lateinit var resolver: KobaltMavenResolver
+    lateinit var aether: KobaltAether
     lateinit var pomGeneratorFactory: PomGenerator.IFactory
     lateinit var logger: ILogger
 }
@@ -105,12 +105,4 @@ class InternalContext {
      * The absolute directory of the current project.
      */
     var absoluteDir: File? = null
-
-    /**
-     * If true, will force a recompile of the files even if using the incremental compile
-     */
-    var forceRecompile: Boolean = false
-
-    var noIncrementalKotlin: Boolean = false
-
 }

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

@@ -3,16 +3,15 @@ package com.beust.kobalt.api
 import com.beust.kobalt.TestConfig
 import com.beust.kobalt.api.annotation.Directive
 import com.beust.kobalt.maven.DependencyManager
-import com.beust.kobalt.maven.aether.AetherDependency
-import com.beust.kobalt.maven.aether.KobaltMavenResolver
+import com.beust.kobalt.maven.aether.KobaltAether
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.kobaltLog
+import com.beust.kobalt.misc.log
 import org.apache.maven.model.Model
 import java.io.File
 import java.util.*
 import java.util.concurrent.Future
 import java.util.concurrent.FutureTask
-import java.util.regex.Pattern
 
 open class Project(
         @Directive open var name: String = "",
@@ -26,7 +25,6 @@ open class Project(
         @Directive open var url: String? = null,
         @Directive open var pom: Model? = null,
         @Directive open var dependsOn: ArrayList<Project> = arrayListOf<Project>(),
-        @Directive open var testsDependOn: ArrayList<Project> = arrayListOf<Project>(),
         @Directive open var packageName: String? = group)
     : IBuildConfig, IDependencyHolder by DependencyHolder() {
 
@@ -34,15 +32,13 @@ open class Project(
         this.project = this
     }
 
-    fun allProjectDependedOn() = project.dependsOn + project.testsDependOn
-
     class ProjectExtra(project: Project) {
         var isDirty = false
 
         /**
          * @return true if any of the projects we depend on is dirty.
          */
-        fun dependsOnDirtyProjects(project: Project) = project.allProjectDependedOn().any { it.projectExtra.isDirty }
+        fun dependsOnDirtyProjects(project: Project) = project.dependsOn.any { it.projectExtra.isDirty }
     }
 
     /**
@@ -90,8 +86,7 @@ open class Project(
 
     @Directive
     fun dependenciesTest(init: Dependencies.() -> Unit) : Dependencies {
-        dependencies = Dependencies(this, testDependencies, arrayListOf(),
-                testProvidedDependencies, compileOnlyDependencies, compileRuntimeDependencies,
+        dependencies = Dependencies(this, testDependencies, testProvidedDependencies, compileRuntimeDependencies,
                 excludedDependencies, nativeDependencies)
         dependencies!!.init()
         return dependencies!!
@@ -100,9 +95,6 @@ open class Project(
     val testDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     val testProvidedDependencies : ArrayList<IClasspathDependency> = arrayListOf()
 
-    fun testsDependOn(vararg projects: Project) = testsDependOn.addAll(projects)
-    fun dependsOn(vararg projects: Project) = dependsOn.addAll(projects)
-
     /** Used to disambiguate various name properties */
     @Directive
     val projectName: String get() = name
@@ -129,18 +121,6 @@ open class Project(
         return result
     }
 
-    class Dep(val file: File, val id: String)
-
-    /**
-     * @return a list of the transitive dependencies (absolute paths to jar files) for the given dependencies.
-     * Can be used for example as `collect(compileDependencies)`.
-     */
-    @Directive
-    fun collect(dependencies: List<IClasspathDependency>) : List<Dep> {
-        return (Kobalt.context?.dependencyManager?.transitiveClosure(dependencies) ?: emptyList())
-            .map { Dep(it.jarFile.get(), it.id) }
-    }
-
     override fun toString() = "[Project $name]"
 }
 
@@ -153,9 +133,7 @@ class Sources(val project: Project, val sources: HashSet<String>) {
 
 class Dependencies(val project: Project,
         val dependencies: ArrayList<IClasspathDependency>,
-        val optionalDependencies: ArrayList<IClasspathDependency>,
         val providedDependencies: ArrayList<IClasspathDependency>,
-        val compileOnlyDependencies: ArrayList<IClasspathDependency>,
         val runtimeDependencies: ArrayList<IClasspathDependency>,
         val excludedDependencies: ArrayList<IClasspathDependency>,
         val nativeDependencies: ArrayList<IClasspathDependency>) {
@@ -167,98 +145,27 @@ class Dependencies(val project: Project,
      * future tasks receive a get(), the repos will be correct.
      */
     private fun addToDependencies(project: Project, dependencies: ArrayList<IClasspathDependency>,
-            dep: Array<out String>, optional: Boolean = false, excludeConfig: ExcludeConfig? = null): List<Future<File>>
+            dep: Array<out String>): List<Future<File>>
         = with(dep.map {
             val resolved =
-                if (KobaltMavenResolver.isRangeVersion(it)) {
-                    // Range id
-                    val node = Kobalt.INJECTOR.getInstance(KobaltMavenResolver::class.java).resolveToArtifact(it)
-                    val result = KobaltMavenResolver.artifactToId(node)
+                if (KobaltAether.isRangeVersion(it)) {
+                    val result = Kobalt.INJECTOR.getInstance(KobaltAether::class.java).resolve(it).dependency.id
                     kobaltLog(2, "Resolved range id $it to $result")
                     result
                 } else {
                     it
                 }
-            DependencyManager.create(resolved, optional, project.directory)
+            DependencyManager.create(resolved, project.directory)
         }) {
             dependencies.addAll(this)
-            if (excludeConfig != null) {
-                this.forEach { it.excluded.add(excludeConfig) }
-            }
-
             this.map { FutureTask { it.jarFile.get() } }
         }
 
     @Directive
     fun compile(vararg dep: String) = addToDependencies(project, dependencies, dep)
 
-    class ExcludeConfig {
-        val ids = arrayListOf<String>()
-
-        @Directive
-        fun exclude(vararg passedIds: String) = ids.addAll(passedIds)
-
-        class ArtifactConfig(
-            var groupId: String? = null,
-            var artifactId: String? = null,
-            var version: String? = null
-        )
-
-        val artifacts = arrayListOf<ArtifactConfig>()
-
-        @Directive
-        fun exclude(groupId: String? = null, artifactId: String? = null, version: String? = null)
-            = artifacts.add(ArtifactConfig(groupId, artifactId, version))
-
-        fun match(pattern: String?, id: String) : Boolean {
-            return pattern == null || Pattern.compile(pattern).matcher(id).matches()
-        }
-
-        /**
-         * @return true if the dependency is excluded with any of the exclude() directives. The matches
-         * are performed by a regular expression match against the dependency.
-         */
-        fun isExcluded(dep: IClasspathDependency) : Boolean {
-            // Straight id match
-            var result = ids.any { match(it, dep.id) }
-
-            // Match on any combination of (groupId, artifactId, version)
-            if (! result && dep.isMaven) {
-                val mavenDep = dep as AetherDependency
-                val artifact = mavenDep.artifact
-                result = artifacts.any {
-                    val match1 = it.groupId == null || match(it.groupId, artifact.groupId)
-                    val match2 = it.artifactId == null || match(it.artifactId, artifact.artifactId)
-                    val match3 = it.version == null || match(it.version, artifact.version)
-                    match1 && match2 && match3
-                }
-            }
-
-            return result
-        }
-    }
-
     @Directive
-    fun compile(dep: String, init: ExcludeConfig.() -> Unit) {
-        val excludeConfig = ExcludeConfig().apply {
-            init()
-        }
-        addToDependencies(project, dependencies, arrayOf(dep), excludeConfig = excludeConfig)
-    }
-
-    @Directive
-    fun compileOnly(vararg dep: String) = addToDependencies(project, compileOnlyDependencies, dep)
-
-    @Directive
-    fun compileOptional(vararg dep: String) {
-        addToDependencies(project, optionalDependencies, dep, optional = true)
-        addToDependencies(project, dependencies, dep, optional = true)
-    }
-
-    @Directive
-    fun provided(vararg dep: String) {
-        addToDependencies(project, providedDependencies, dep)
-    }
+    fun provided(vararg dep: String) = addToDependencies(project, providedDependencies, dep)
 
     @Directive
     fun runtime(vararg dep: String) = addToDependencies(project, runtimeDependencies, dep)

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

@@ -44,25 +44,6 @@ class TaskContributor @Inject constructor(val incrementalManagerFactory: Increme
         }
     }
 
-    fun addTask(plugin: IPlugin, project: Project, taskName: String, description: String,
-            group: String = AnnotationDefault.GROUP,
-            dependsOn: List<String> = emptyList(),
-            reverseDependsOn : List<String> = emptyList(),
-            runBefore : List<String> = emptyList(),
-            runAfter : List<String> = emptyList(),
-            alwaysRunAfter: List<String> = emptyList(),
-            runTask: (Project) -> TaskResult) {
-        dynamicTasks.add(DynamicTask(plugin, taskName, description, group, project,
-                dependsOn = dependsOn,
-                reverseDependsOn = reverseDependsOn,
-                runBefore = runBefore,
-                runAfter = runAfter,
-                alwaysRunAfter = alwaysRunAfter,
-                closure = { p: Project ->
-                    runTask(project)
-                }))
-    }
-
     fun addIncrementalVariantTasks(plugin: IPlugin, project: Project, context: KobaltContext, taskName: String,
             group: String = AnnotationDefault.GROUP,
             dependsOn: List<String> = emptyList(),

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

@@ -1,24 +1,25 @@
 package com.beust.kobalt.archive
 
-import com.beust.kobalt.*
+import com.beust.kobalt.Features
+import com.beust.kobalt.IFileSpec
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.annotation.ExportedProjectProperty
-import com.beust.kobalt.misc.JarUtils
-import com.beust.kobalt.misc.KFiles
-import com.beust.kobalt.misc.kobaltLog
+import com.beust.kobalt.misc.*
 import java.io.File
+import java.io.FileOutputStream
+import java.io.OutputStream
 import java.util.*
+import java.util.zip.ZipOutputStream
 
 class Archives {
     companion object {
         @ExportedProjectProperty(doc = "The name of the jar file", type = "String")
         const val JAR_NAME = "jarName"
-        @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 +
-            if (project.version.isNullOrBlank()) "" else "-${project.version}"
+        private val DEFAULT_STREAM_FACTORY = { os : OutputStream -> ZipOutputStream(os) }
+
+        fun defaultArchiveName(project: Project) = project.name + "-" + project.version
 
         fun generateArchive(project: Project,
                 context: KobaltContext,
@@ -26,15 +27,15 @@ class Archives {
                 suffix: String,
                 includedFiles: List<IncludedFile>,
                 expandJarFiles : Boolean = false,
-                manifest: java.util.jar.Manifest? = null) : File {
+                outputStreamFactory: (OutputStream) -> ZipOutputStream = DEFAULT_STREAM_FACTORY) : File {
             val fullArchiveName = context.variant.archiveName(project, archiveName, suffix)
             val archiveDir = File(KFiles.libsDir(project))
             val result = File(archiveDir.path, fullArchiveName)
             context.logger.log(project.name, 3, "Creating $result")
             if (! Features.USE_TIMESTAMPS || isOutdated(project.directory, includedFiles, result)) {
                 try {
-                    MetaArchive(result, manifest).use { metaArchive ->
-                        JarUtils.addFiles(project.directory, includedFiles, metaArchive, expandJarFiles)
+                    outputStreamFactory(FileOutputStream(result)).use {
+                        JarUtils.addFiles(project.directory, includedFiles, it, expandJarFiles)
                         context.logger.log(project.name, 2, "Added ${includedFiles.size} files to $result")
                         context.logger.log(project.name, 1, "  Created $result")
                     }
@@ -49,6 +50,8 @@ class Archives {
                 context.logger.log(project.name, 3, "  $result is up to date")
             }
 
+            project.projectProperties.put(JAR_NAME, result.absolutePath)
+
             return result
         }
 

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

@@ -8,7 +8,7 @@ import com.beust.kobalt.api.annotation.Directive
  */
 open class Jar(override val project: Project,
         override var name : String = Archives.defaultArchiveName(project) + ".jar",
-        override var fatJar: Boolean = false) : Zip(project, name, fatJar), AttributeHolder {
+        var fatJar: Boolean = false) : Zip(project, name), AttributeHolder {
     @Directive
     fun manifest(init: Manifest.(p: Manifest) -> Unit) : Manifest {
         val m = Manifest(this)
@@ -18,7 +18,7 @@ open class Jar(override val project: Project,
 
     // Need to specify the version or attributes will just be dropped
     @Directive
-    override val attributes = arrayListOf(Pair("Manifest-Version", "1.0"))
+    val attributes = arrayListOf(Pair("Manifest-Version", "1.0"))
 
     override fun addAttribute(k: String, v: String) {
         attributes.add(Pair(k, v))

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

@@ -1,125 +0,0 @@
-package com.beust.kobalt.archive
-
-import com.beust.kobalt.Glob
-import com.beust.kobalt.misc.KFiles
-import org.apache.commons.compress.archivers.ArchiveEntry
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
-import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
-import java.io.Closeable
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.util.jar.Manifest
-import org.apache.commons.compress.archivers.zip.ZipFile as ApacheZipFile
-
-/**
- * Abstraction of a zip/jar/war archive that automatically manages the addition of expanded jar files.
- * Uses ZipArchiveOutputStream for fast inclusion of expanded jar files.
- */
-class MetaArchive(outputFile: File, val manifest: Manifest?) : Closeable {
-    companion object {
-        const val MANIFEST_MF = "META-INF/MANIFEST.MF"
-    }
-
-    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)
-                }
-            }
-        }
-    }
-
-    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
-            for (entry in jarEntries) {
-                maybeAddEntry(entry) {
-                    zos.addRawArchiveEntry(entry, jar.getRawInputStream(entry))
-                }
-            }
-        }
-    }
-
-
-
-    private fun okToAdd(name: String) : Boolean {
-        val result = !KFiles.isExcluded(name,
-                Glob("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", MANIFEST_MF))
-//        if (name.startsWith("META-INF")) println((if (result) "ADDING" else "NOT ADDING") + " $name")
-        return result
-    }
-
-    override fun close() = zos.close()
-
-    private fun addEntry(entry: ArchiveEntry, inputStream: FileInputStream?) {
-        zos.putArchiveEntry(entry)
-        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 (!seen.contains(name) && okToAdd(name)) {
-                action()
-            }
-            seen.add(name)
-        }
-    }
-}

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

@@ -6,7 +6,7 @@ import com.beust.kobalt.glob
 class War(override val project: Project, override var name: String = Archives.defaultArchiveName(project) + ".war")
         : Jar(project, name), AttributeHolder {
     init {
-        include(from("src/main/webapp"), to(""), glob("**"))
+        include(from("src/main/webapp"),to(""), glob("**"))
         include(from("kobaltBuild/classes"), to("WEB-INF/classes"), glob("**"))
     }
 }

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

@@ -1,13 +1,22 @@
 package com.beust.kobalt.archive
 
-import com.beust.kobalt.*
+import com.beust.kobalt.Glob
+import com.beust.kobalt.IFileSpec
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.annotation.Directive
+import com.beust.kobalt.misc.From
+import com.beust.kobalt.misc.IncludedFile
+import com.beust.kobalt.misc.To
 
-open class Zip(open val project: Project, open var name: String = Archives.defaultArchiveName(project) + ".zip",
-        open var fatJar: Boolean = false): AttributeHolder, IncludeFromTo()  {
+open class Zip(open val project: Project, open var name: String = Archives.defaultArchiveName(project) + ".zip") {
     val excludes = arrayListOf<Glob>()
 
+    @Directive
+    fun from(s: String) = From(s)
+
+    @Directive
+    fun to(s: String) = To(s)
+
     @Directive
     fun exclude(vararg files: String) {
         files.forEach { excludes.add(Glob(it)) }
@@ -19,9 +28,26 @@ open class Zip(open val project: Project, open var name: String = Archives.defau
     }
 
     @Directive
-    open val attributes = arrayListOf(Pair("Manifest-Version", "1.0"))
-
-    override fun addAttribute(k: String, v: String) {
-        attributes.add(Pair(k, v))
+    fun include(vararg files: String) {
+        includedFiles.add(IncludedFile(files.map { IFileSpec.FileSpec(it) }))
     }
+
+    @Directive
+    fun include(from: From, to: To, vararg specs: String) {
+        includedFiles.add(IncludedFile(from, to, specs.map { IFileSpec.FileSpec(it) }))
+    }
+
+    @Directive
+    fun include(from: From, to: To, vararg specs: IFileSpec.GlobSpec) {
+        includedFiles.add(IncludedFile(from, to, listOf(*specs)))
+    }
+
+    /**
+     * Prefix path to be removed from the zip file. For example, if you add "build/lib/a.jar" to the zip
+     * file and the excludePrefix is "build/lib", then "a.jar" will be added at the root of the zip file.
+     */
+    val includedFiles = arrayListOf<IncludedFile>()
+
 }
+
+

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

@@ -1,6 +1,7 @@
 package com.beust.kobalt.internal
 
 import com.beust.kobalt.api.IProjectAffinity
+import com.beust.kobalt.api.ISimpleAffinity
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 
@@ -10,13 +11,19 @@ class ActorUtils {
          * Return the plug-in actor with the highest affinity.
          */
         fun <T : IProjectAffinity> selectAffinityActor(project: Project, context: KobaltContext, actors: List<T>)
-                = actors.maxBy { it.affinity(project, context) }
+            = actors.maxBy { it.affinity(project, context) }
 
         /**
          * Return all the plug-in actors with a non zero affinity sorted from the highest to the lowest.
          */
         fun <T : IProjectAffinity> selectAffinityActors(project: Project, context: KobaltContext, actors: List<T>)
                 = actors.filter { it.affinity(project, context) > 0 }
-                .sortedByDescending { it.affinity(project, context) }
+                        .sortedByDescending { it.affinity(project, context) }
+
+        /**
+         * Return the plug-in actor with the highest affinity.
+         */
+        fun <T : ISimpleAffinity<A>, A> selectAffinityActor(actors: List<T>, arg: A) = actors.maxBy { it.affinity(arg) }
     }
+
 }

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

@@ -12,7 +12,7 @@ abstract class BaseJvmPlugin<T>(open val configActor: ConfigActor<T>) :
         ICompilerFlagContributor {
     companion object {
         // Run before other flag contributors
-        val FLAG_CONTRIBUTOR_PRIORITY = FlagContributor.DEFAULT_FLAG_PRIORITY - 10
+        val FLAG_CONTRIBUTOR_PRIORITY = ICompilerFlagContributor.DEFAULT_FLAG_PRIORITY - 10
     }
 
     protected fun maybeCompilerArgs(sourceSuffixes: List<String>, suffixesBeingCompiled: List<String>,
@@ -21,17 +21,14 @@ abstract class BaseJvmPlugin<T>(open val configActor: ConfigActor<T>) :
 
     override val flagPriority = FLAG_CONTRIBUTOR_PRIORITY
 
-    override fun accept(project: Project) = sourceFileCount(project) > 0
+    override fun accept(project: Project) = hasSourceFiles(project)
 
     // IBuildConfigContributor
-    protected fun sourceFileCount(project: Project)
-            = KFiles.findSourceFiles(project.directory, project.sourceDirectories, sourceSuffixes()).size +
-            KFiles.findSourceFiles(project.directory, project.sourceDirectoriesTest, sourceSuffixes()).size
 
-    fun affinity(project: Project) = sourceFileCount(project)
+    private fun hasSourceFiles(project: Project)
+            = KFiles.findSourceFiles(project.directory, project.sourceDirectories, sourceSuffixes()).size > 0
 
-    // IDocContributor
-    open fun affinity(project: Project, context: KobaltContext) = sourceFileCount(project)
+    fun affinity(project: Project) = if (hasSourceFiles(project)) 1 else 0
 
     abstract fun sourceSuffixes() : List<String>
 }

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

@@ -1,7 +1,5 @@
 package com.beust.kobalt.internal
 
-import com.beust.kobalt.TestResult
-import com.beust.kobalt.api.IBuildListener
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.ProjectBuildStatus
@@ -27,14 +25,9 @@ abstract class BaseProjectRunner {
         }
 
         fun runBuildListenersForTask(project: Project, context: KobaltContext, taskName: String, start: Boolean,
-                success: Boolean = false, testResult: TestResult? = null) {
+                success: Boolean = false) {
             context.pluginInfo.buildListeners.forEach {
-                if (start) {
-                    it.taskStart(project, context, taskName)
-                } else {
-                    val info = IBuildListener.TaskEndInfo(success, testResult?.shortMessage, testResult?.longMessage)
-                    it.taskEnd(project, context, taskName, info)
-                }
+                if (start) it.taskStart(project, context, taskName) else it.taskEnd(project, context, taskName, success)
             }
         }
 
@@ -57,20 +50,6 @@ abstract class BaseProjectRunner {
                 accept: (T) -> Boolean):
                 DynamicGraph<T> {
 
-            /**
-             * Add an edge from @param from to all its tasks.
-             */
-            fun addEdge(result: DynamicGraph<T>, from: String, to: String, newToProcess: ArrayList<T>, text: String) {
-                val froms = nodeMap[from]
-                froms.forEach { f: T ->
-                    nodeMap[to].forEach { t: T ->
-                        kobaltLog(TAG, "                                  Adding edge ($text) $f -> $t")
-                        result.addEdge(f, t)
-                        newToProcess.add(t)
-                    }
-                }
-            }
-
             val result = DynamicGraph<T>()
             val newToProcess = arrayListOf<T>()
             val seen = hashSetOf<String>()
@@ -100,6 +79,20 @@ abstract class BaseProjectRunner {
 
             while (toProcess.size > 0) {
 
+                /**
+                 * Add an edge from @param from to all its tasks.
+                 */
+                fun addEdge(result: DynamicGraph<T>, from: String, to: String, newToProcess: ArrayList<T>, text: String) {
+                    val froms = nodeMap[from]
+                    froms.forEach { f: T ->
+                        nodeMap[to].forEach { t: T ->
+                            kobaltLog(TAG, "                                  Adding edge ($text) $f -> $t")
+                            result.addEdge(f, t)
+                            newToProcess.add(t)
+                        }
+                    }
+                }
+
                 /**
                  * Whenever a task is added to the graph, we also add its alwaysRunAfter tasks.
                  */
@@ -151,35 +144,32 @@ abstract class BaseProjectRunner {
                         addEdge(result, taskName, to, newToProcess, "dependsOn")
                     }
 
+                    //
+                    // runBefore and runAfter (task ordering) are only considered for explicit tasks (tasks that were
+                    // explicitly requested by the user)
+                    //
+                    val passedTaskNames = passedTasks.map { it.taskName }.toSet()
+                    passedTaskNames.let { taskNames ->
+                        runBefore[taskName].forEach { from ->
+                            if (passedTaskNames.contains(from)) {
+                                addEdge(result, from, taskName, newToProcess, "runBefore")
+                            }
+                        }
+                        runAfter[taskName].forEach { to ->
+                            if (passedTaskNames.contains(to)) {
+                                addEdge(result, to, taskName, newToProcess, "runAfter")
+                            }
+                        }
+                    }
                     seen.add(taskName)
                 }
 
                 newToProcess.forEach { processAlways(always, it) }
 
                 toProcess.clear()
-                toProcess.addAll(
-                    newToProcess
-                        .filter { !seen.contains(toName(it)) }
-                        .map { TaskManager.TaskInfo(toName(it)) })
+                toProcess.addAll(newToProcess.filter { !seen.contains(toName(it)) }.map { TaskManager.TaskInfo(toName(it)) })
                 newToProcess.clear()
             }
-
-            //
-            // Now that we have all the tasks tnat need to run, process runBefore/runAfter, which
-            // are not allowed to add new tasks. Therefore, we only add edges to the graph if both
-            // the from and the to are already present.
-            //
-            val finalTaskNames = result.nodes.map { TaskManager.TaskInfo(it.toString()).taskName }
-            finalTaskNames.forEach { taskName ->
-                runBefore[taskName].filter { finalTaskNames.contains(it) }.forEach { from ->
-                    addEdge(result, from, taskName, newToProcess, "runBefore")
-                }
-                runAfter[taskName].filter { finalTaskNames.contains(it) }.forEach { to ->
-                    addEdge(result, to, taskName, newToProcess, "runAfter")
-                }
-            }
-
-
             return result
         }
     }

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

@@ -11,8 +11,7 @@ import java.util.concurrent.ConcurrentHashMap
  */
 class BuildListeners : IBuildListener, IBuildReportContributor {
     class ProfilerInfo(val taskName: String, val durationMillis: Long)
-    class ProjectInfo(val projectName: String, var durationMillis: Long = 0,
-            var shortMessage: String? = null, var longMessage: String? = null)
+    class ProjectInfo(val projectName: String, var durationMillis: Long = 0)
 
     private val startTimes = ConcurrentHashMap<String, Long>()
     private val timings = arrayListOf<ProfilerInfo>()
@@ -30,21 +29,18 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
     }
 
     // IBuildListener
-    override fun taskEnd(project: Project, context: KobaltContext, taskName: String, info: IBuildListener.TaskEndInfo) {
-        val success = info.success
+    override fun taskEnd(project: Project, context: KobaltContext, taskName: String, success: Boolean) {
         if (! success) hasFailures = true
         startTimes[taskName]?.let {
             val taskTime = System.currentTimeMillis() - it
             timings.add(ProfilerInfo(taskName, taskTime))
             projectInfos[project.name]?.let {
-                it.durationMillis += taskTime
-                if (info.shortMessage != null && it.shortMessage == null) it.shortMessage = info.shortMessage
-                if (info.longMessage != null && it.longMessage == null) it.longMessage = info.longMessage
+                it.durationMillis += taskTime.toLong()
             }
         }
     }
 
-    private val projectStatuses = arrayListOf<Pair<Project, String>>()
+    private val projectStatuses = arrayListOf<Pair<Project, ProjectBuildStatus>>()
 
     // IBuildListener
     override fun projectStart(project: Project, context: KobaltContext) {
@@ -53,9 +49,7 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
 
     // IBuildListener
     override fun projectEnd(project: Project, context: KobaltContext, status: ProjectBuildStatus) {
-        val shortMessage = projectInfos[project.name]?.shortMessage
-        val statusText = status.toString() + (if (shortMessage != null) " ($shortMessage)" else "")
-        projectStatuses.add(Pair(project, statusText))
+        projectStatuses.add(Pair(project, status))
     }
 
     // IBuildReportContributor
@@ -65,6 +59,7 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
         fun formatMillisLeft(millis: Long, length: Int) = formatMillis(millis, "%1\$-$length.2f")
 
         fun millisToSeconds(millis: Long) = (millis.toDouble() / 1000).toInt()
+        val buildTime = millisToSeconds(System.currentTimeMillis() - buildStartTime!!)
 
         val profiling = args.profiling
         if (profiling) {
@@ -76,15 +71,10 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
 
         }
 
-        // Calculate the longest short message so we can create a column long enough to contain it
-        val width = 12 + (projectInfos.values.map { it.shortMessage?.length ?: 0 }.maxBy { it } ?: 0)
-
         fun col1(s: String) = String.format(" %1\$-30s", s)
-        fun col2(s: String) = String.format(" %1\$-${width}s", s)
+        fun col2(s: String) = String.format(" %1\$-13s", s)
         fun col3(s: String) = String.format(" %1\$-8s", s)
 
-
-
         // Only print the build report if there is more than one project and at least one of them failed
         if (timings.any()) {
 //        if (timings.size > 1 && hasFailures) {
@@ -94,7 +84,7 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
             table.append(AsciiArt.logBox(listOf(line), AsciiArt.bottomLeft2, AsciiArt.bottomRight2, indent = 10) + "\n")
             projectStatuses.forEach { pair ->
                 val projectName = pair.first.name
-                val cl = listOf(col1(projectName), col2(pair.second),
+                val cl = listOf(col1(projectName), col2(pair.second.toString()),
                         col3(formatMillisLeft(projectInfos[projectName]!!.durationMillis, 8)))
                         .joinToString(AsciiArt.verticalBar)
                 table.append("          " + AsciiArt.verticalBar + " " + cl + " " + AsciiArt.verticalBar + "\n")
@@ -104,19 +94,14 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
 //        }
         }
 
-        val buildTime =
-            if (buildStartTime != null)
-                millisToSeconds(System.currentTimeMillis() - buildStartTime!!)
-            else
-                0
         // BUILD SUCCESSFUL / FAILED message
         val message =
             if (hasFailures) {
                 String.format("BUILD FAILED", buildTime)
-            } else if (! args.sequential) {
+            } else if (args.parallel) {
                 val sequentialBuildTime = ((projectInfos.values.sumByDouble { it.durationMillis.toDouble() }) / 1000)
                     .toInt()
-                String.format("PARALLEL BUILD SUCCESSFUL (%d SECONDS), sequential build would have taken %d seconds",
+                String.format("PARALLEL BUILD SUCCESSFUL (%d SECONDS), sequential build sould have taken %d seconds",
                         buildTime, sequentialBuildTime)
             } else {
                 String.format("BUILD SUCCESSFUL (%d SECONDS)", buildTime)

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

@@ -3,6 +3,7 @@ package com.beust.kobalt.internal
 import com.beust.kobalt.TaskResult
 import com.beust.kobalt.api.*
 import com.beust.kobalt.maven.DependencyManager
+import com.beust.kobalt.maven.DependencyManager2
 import com.beust.kobalt.maven.aether.Scope
 import com.beust.kobalt.maven.dependency.FileDependency
 import com.beust.kobalt.misc.KFiles
@@ -14,12 +15,14 @@ import java.util.*
 /**
  * Central place to compile files, used by plug-ins and non plug-ins.
  */
-class CompilerUtils @Inject constructor(val files: KFiles, val dependencyManager: DependencyManager) {
+class CompilerUtils @Inject constructor(val files: KFiles,
+        val dependencyManager: DependencyManager,
+        val dependencyManager2: DependencyManager2) {
 
     class CompilerResult(val successResults: List<TaskResult>, val failedResult: TaskResult?)
 
     fun invokeCompiler(project: Project, context: KobaltContext, compiler: ICompilerDescription,
-            sourceDirectories: List<File>, isTest: Boolean, buildDirectory: File): CompilerResult {
+            sourceDirectories: List<File>, isTest: Boolean): CompilerResult {
         val results = arrayListOf<TaskResult>()
         var failedResult: TaskResult? = null
         val contributedSourceDirs =
@@ -30,11 +33,11 @@ class CompilerUtils @Inject constructor(val files: KFiles, val dependencyManager
                 }
         val sourceFiles = KFiles.findSourceFiles(project.directory,
                 contributedSourceDirs.map { it.path }, compiler.sourceSuffixes)
-        if (sourceFiles.isNotEmpty()) {
+        if (sourceFiles.size > 0) {
             // TODO: createCompilerActionInfo recalculates the source files, only compute them
             // once and pass them
             val info = createCompilerActionInfo(project, context, compiler, isTest,
-                    sourceDirectories, sourceSuffixes = compiler.sourceSuffixes, buildDirectory = buildDirectory)
+                    sourceDirectories, sourceSuffixes = compiler.sourceSuffixes)
             val thisResult = invokeCompiler(project, context, compiler, info)
             results.addAll(thisResult.successResults)
             if (failedResult == null) {
@@ -65,22 +68,32 @@ class CompilerUtils @Inject constructor(val files: KFiles, val dependencyManager
      * Runs all the contributors and interceptors relevant to that task.
      */
     fun createCompilerActionInfo(project: Project, context: KobaltContext, compiler: ICompilerDescription,
-            isTest: Boolean, sourceDirectories: List<File>, sourceSuffixes: List<String>, buildDirectory: File)
-            : CompilerActionInfo {
+            isTest: Boolean, sourceDirectories: List<File>, sourceSuffixes: List<String>): CompilerActionInfo {
         copyResources(project, context, SourceSet.of(isTest))
 
-        val fullClasspath = dependencyManager.calculateDependencies(project, context,
-                scopes = if (isTest) {
-                    listOf(Scope.COMPILE, Scope.COMPILEONLY, Scope.TEST)
-                } else {
-                    listOf(Scope.COMPILE, Scope.COMPILEONLY)
-                })
+        val fullClasspath = dependencyManager2.resolve(project, context, isTest, listOf(Scope.COMPILE, Scope.TEST))
 
+//        if (project.name == "ktor-core" && isTest) {
+//            val contains = fullClasspath.filter{it.id.contains("json")}
+//            val fc1 =
+//                if (isTest) dependencyManager.testDependencies(project, context)
+//                else dependencyManager.dependencies(project, context)
+//
+//            println("DONOTCOMMIT")
+//            val d2 = dependencyManager2.resolve(project, context, isTest, listOf(Scope.COMPILE, Scope.TEST))
+//        }
+
+        // The directory where the classes get compiled
+        val buildDirectory =
+            if (isTest) File(project.buildDirectory, KFiles.TEST_CLASSES_DIR)
+            else File(project.classesDir(context))
 
         File(project.directory, buildDirectory.path).mkdirs()
 
         // Remove all the excluded dependencies from the classpath
-        var classpath = fullClasspath
+        var classpath = fullClasspath.filter {
+                ! isDependencyExcluded(it, project.excludedDependencies)
+            }
 
         // The classpath needs to contain $buildDirectory/classes as well so that projects that contain
         // multiple languages can use classes compiled by the compiler run before them.
@@ -124,8 +137,7 @@ class CompilerUtils @Inject constructor(val files: KFiles, val dependencyManager
         // depending on the compiler's ability, sourceFiles can actually contain a list of directories
         // instead of individual source files.
         val projectDirectory = File(project.directory)
-        val sourceFiles =
-            if (compiler.canCompileDirectories) {
+        val sourceFiles = if (compiler.canCompileDirectories) {
                 allSourceDirectories.map { File(projectDirectory, it.path).path }
             } else {
                 files.findRecursively(projectDirectory, allSourceDirectories,
@@ -173,7 +185,7 @@ class CompilerUtils @Inject constructor(val files: KFiles, val dependencyManager
         // Finally, alter the info with the compiler interceptors before returning it
         val initialActionInfo = CompilerActionInfo(projectDirectory.path, classpath, allSources,
                 sourceSuffixes, buildDirectory, emptyList() /* the flags will be provided by flag contributors */,
-                emptyList(), context.internalContext.forceRecompile)
+                emptyList())
         val result = context.pluginInfo.compilerInterceptors.fold(initialActionInfo, { ai, interceptor ->
             interceptor.intercept(project, context, ai)
         })
@@ -193,40 +205,28 @@ class CompilerUtils @Inject constructor(val files: KFiles, val dependencyManager
         val outputDir = sourceSet.outputDir
 
         val variantSourceDirs = context.variant.resourceDirectories(project, sourceSet)
-        if (variantSourceDirs.isNotEmpty()) {
+        if (variantSourceDirs.size > 0) {
             context.logger.log(project.name, 2, "Copying $sourceSet resources")
             val absOutputDir = File(KFiles.joinDir(project.directory, project.buildDirectory, outputDir))
             variantSourceDirs
                 .map { File(project.directory, it.path) }
                 .filter(File::exists)
                 .forEach {
-                    context.logger.log(project.name, 2, "Copying from $it to $absOutputDir")
-                        KFiles.copyRecursively(it, absOutputDir, replaceExisting = true)
+                context.logger.log(project.name, 2, "Copying from $it to $absOutputDir")
+                    KFiles.copyRecursively(it, absOutputDir, deleteFirst = false)
                 }
         } else {
             context.logger.log(project.name, 2, "No resources to copy for $sourceSet")
         }
     }
 
-    fun sourceCompilerFlags(project: Project?, context: KobaltContext, info: CompilerActionInfo) : List<String> {
-        val adapters = context.pluginInfo.compilerFlagContributors.map {
-            val closure = { project: Project, context: KobaltContext, currentFlags: List<String>,
-                    suffixesBeingCompiled: List<String>
-                -> it.compilerFlagsFor(project, context, currentFlags, suffixesBeingCompiled) }
-            FlagContributor(it.flagPriority, closure)
-        }
-        return compilerFlags(project, context, info, adapters)
-    }
 
-    fun compilerFlags(project: Project?, context: KobaltContext, info: CompilerActionInfo,
-            adapters: List<FlagContributor>) : List<String> {
-        val result = arrayListOf<String>()
-        if (project != null) {
-            adapters.sortedBy { it.flagPriority }
-            adapters.forEach {
-                result.addAll(it.flagsFor(project, context, result, info.suffixesBeingCompiled))
-            }
-        }
-        return result
-    }
+    /**
+     * Naïve implementation: just exclude all dependencies that start with one of the excluded dependencies.
+     * Should probably make exclusion more generic (full on string) or allow exclusion to be specified
+     * formally by groupId or artifactId.
+     */
+    private fun isDependencyExcluded(id: IClasspathDependency, excluded: List<IClasspathDependency>)
+            = excluded.any { id.id.startsWith(it.id) }
+
 }

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/DynamicGraph.kt

@@ -1,14 +1,17 @@
 package com.beust.kobalt.internal
 
-import com.beust.kobalt.*
-import com.beust.kobalt.misc.*
+import com.beust.kobalt.AsciiTable
+import com.beust.kobalt.KobaltException
+import com.beust.kobalt.TaskResult
+import com.beust.kobalt.misc.NamedThreadFactory
+import com.beust.kobalt.misc.error
+import com.beust.kobalt.misc.kobaltLog
 import com.google.common.collect.HashMultimap
 import java.lang.reflect.InvocationTargetException
 import java.util.*
 import java.util.concurrent.*
 
-open class TaskResult2<T>(success: Boolean, testResult: TestResult? = null,
-        errorMessage: String? = null, val value: T) : TaskResult(success, testResult, errorMessage) {
+open class TaskResult2<T>(success: Boolean, errorMessage: String?, val value: T) : TaskResult(success, errorMessage) {
     override fun toString() = com.beust.kobalt.misc.toString("TaskResult", "value", value, "success", success)
 }
 
@@ -61,18 +64,15 @@ class DynamicGraph<T> {
             }
         }
 
-        fun <T> transitiveClosureGraph(roots: List<T>, childrenFor: (T) -> List<T>,
-                filter: (T) -> Boolean): List<Node<T>>
-            = roots.map { transitiveClosureGraph(it, childrenFor, filter) }
+        fun <T> transitiveClosureGraph(roots: List<T>, childrenFor: (T) -> List<T>) : List<Node<T>>
+            = roots.map { transitiveClosureGraph(it, childrenFor) }
 
-        fun <T> transitiveClosureGraph(root: T, childrenFor: (T) -> List<T>,
-                filter: (T) -> Boolean = { t: T -> true },
-                seen: HashSet<T> = hashSetOf()) : Node<T> {
+        fun <T> transitiveClosureGraph(root: T, childrenFor: (T) -> List<T>, seen: HashSet<T> = hashSetOf()) : Node<T> {
             val children = arrayListOf<Node<T>>()
-            childrenFor(root).filter(filter).forEach { child ->
+            childrenFor(root).forEach { child ->
                 if (! seen.contains(child)) {
                     seen.add(child)
-                    val c = transitiveClosureGraph(child, childrenFor, filter, seen)
+                    val c = transitiveClosureGraph(child, childrenFor, seen)
                     children.add(c)
                 }
             }
@@ -189,7 +189,7 @@ class DynamicGraphExecutor<T>(val graph : DynamicGraph<T>, val factory: IThreadW
             = Executors.newFixedThreadPool(threadCount, NamedThreadFactory("DynamicGraphExecutor"))
     val completion = ExecutorCompletionService<TaskResult2<T>>(executor)
 
-    data class HistoryLog(val name: String, val timestamp: Long, val threadId: Long, val start: Boolean)
+    class HistoryLog(val name: String, val timestamp: Long, val threadId: Long, val start: Boolean)
 
     val historyLog = arrayListOf<HistoryLog>()
     val threadIds = ConcurrentHashMap<Long, Long>()
@@ -282,99 +282,60 @@ class DynamicGraphExecutor<T>(val graph : DynamicGraph<T>, val factory: IThreadW
 
         fun toSeconds(millis: Long) = (millis / 1000).toInt().toString()
 
-        fun displayCompressedLog(table: AsciiTable.Builder) : AsciiTable.Builder {
-            data class CompressedLog(val timestamp: Long, val threadMap: HashMap<Long, String>)
+//        class CompressedLog(val timestamp: Long, val threadMap: HashMap<Long, String>)
+//
+//        fun compressLog(historyLog: List<HistoryLog>): ArrayList<CompressedLog> {
+//            val compressed = arrayListOf<CompressedLog>()
+//
+//            var currentLog: CompressedLog? = null
+//
+//            historyLog.forEach { hl ->
+//                if (currentLog == null) {
+//                    currentLog = CompressedLog(hl.timestamp, hashMapOf(hl.threadId to hl.name))
+//                } else currentLog?.let { cl ->
+//                    if (hl.timestamp - cl.timestamp < 1000) {
+//                        cl.threadMap[hl.threadId] = hl.name
+//                    } else {
+//                        compressed.add(cl)
+//                        currentLog = null
+//                    }
+//                }
+//            }
+//            return compressed
+//        }
+//
+//        compressLog(historyLog).forEach {
+//            val row = arrayListOf<String>()
+//            row.add(toSeconds(it.timestamp))
+//            it.threadMap.values.forEach {
+//                row.add(it)
+//            }
+//            table.addRow(row)
+//        }
 
-            fun compressLog(historyLog: List<HistoryLog>): ArrayList<CompressedLog> {
-                val compressed = arrayListOf<CompressedLog>()
-
-                var currentLog: CompressedLog? = null
-
-                val projectStart = hashMapOf<String, Long>()
-                fun toName(hl: HistoryLog) : String {
+        val start = historyLog[0].timestamp
+        val projectStart = ConcurrentHashMap<String, Long>()
+        historyLog.forEach { line ->
+            val row = arrayListOf<String>()
+            row.add(toSeconds(line.timestamp - start))
+            threadIds.keys.forEach {
+                if (line.threadId == it) {
                     var duration = ""
-                    if (! hl.start) {
-                        val start = projectStart[hl.name]
-                        if (start != null) {
-                            duration = " (" + ((hl.timestamp - start) / 1000)
-                                    .toInt().toString() + ")"
-                        } else {
-                            kobaltLog(1, "DONOTCOMMIT")
-                        }
-                    }
-                    return hl.name + duration
-                }
-
-                historyLog.forEach { hl ->
-                    kobaltLog(1, "CURRENT LOG: " + currentLog + " HISTORY LINE: " + hl)
-                    if (hl.start) {
-                        projectStart[hl.name] = hl.timestamp
-                    }
-                    if (currentLog == null) {
-                        currentLog = CompressedLog(hl.timestamp, hashMapOf(hl.threadId to hl.name))
-                    } else currentLog?.let { cl ->
-                        if (! hl.start || hl.timestamp - cl.timestamp < 1000) {
-                            kobaltLog(1, "    CURRENT LOG IS WITHING ONE SECOND: $hl")
-                            cl.threadMap[hl.threadId] = toName(hl)
-                        } else {
-                            kobaltLog(1, "  ADDING COMPRESSED LINE $cl")
-                            compressed.add(cl)
-                            currentLog = CompressedLog(hl.timestamp, hashMapOf(hl.threadId to toName(hl)))
-                        }
-                    }
-                }
-                return compressed
-            }
-
-            compressLog(historyLog).forEach {
-                val row = arrayListOf<String>()
-                row.add(toSeconds(it.timestamp))
-                it.threadMap.values.forEach {
-                    row.add(it)
-                }
-                table.addRow(row)
-            }
-
-            return table
-        }
-
-        fun displayRegularLog(table: AsciiTable.Builder) : AsciiTable.Builder {
-            if (historyLog.any()) {
-                if (historyLog[0] != null) {
-                    val start = historyLog[0].timestamp
-                    val projectStart = ConcurrentHashMap<String, Long>()
-                    historyLog.forEach { line ->
-                        val row = arrayListOf<String>()
-                        row.add(toSeconds(line.timestamp - start))
-                        threadIds.keys.forEach {
-                            if (line.threadId == it) {
-                                var duration = ""
-                                if (line.start) {
-                                    projectStart[line.name] = line.timestamp
-                                } else {
-                                    val projectStart = projectStart[line.name]
-                                    if (projectStart != null) {
-                                        duration = " (" + ((line.timestamp - projectStart) / 1000)
-                                                .toInt().toString() + ")"
-                                    } else {
-                                        warn("Couldn't determine project start: " + line.name)
-                                    }
-                                }
-                                row.add((line.name + duration))
-                            } else {
-                                row.add("")
-                            }
-                        }
-                        table.addRow(row)
+                    if (line.start) {
+                        projectStart[line.name] = line.timestamp
+                    } else {
+                        duration = " (" + ((line.timestamp - projectStart[line.name]!!) / 1000)
+                            .toInt().toString() + ")"
                     }
+                    row.add((line.name + duration))
                 } else {
-                    warn("Couldn't find historyLog")
+                    row.add("")
                 }
             }
-            return table
+            table.addRow(row)
         }
 
-        kobaltLog(1, displayRegularLog(table).build())
+        println(table.build())
     }
 }
 
@@ -394,7 +355,7 @@ fun main(argv: Array<String>) {
                 object: IWorker<String> {
                     override fun call(): TaskResult2<String>? {
                         kobaltLog(1, "  Running worker $it")
-                        return TaskResult2(true, value = it)
+                        return TaskResult2(true, null, it)
                     }
 
                     override val priority: Int get() = 0

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

@@ -2,9 +2,9 @@ package com.beust.kobalt.internal
 
 import com.beust.kobalt.*
 import com.beust.kobalt.api.*
+import com.beust.kobalt.maven.DependencyManager2
 import com.beust.kobalt.misc.KFiles
 import com.google.common.annotations.VisibleForTesting
-import com.google.inject.Inject
 import java.io.File
 import java.util.*
 
@@ -16,31 +16,17 @@ abstract class GenericTestRunner: ITestRunnerContributor {
     abstract val dependencyName : String
     abstract val mainClass: String
     abstract val annotationPackage: String
-    abstract val runnerName: String
-    open var shortMessage: String? = null
-    open var longMessage: String? = null
-
-    @Inject
-    private lateinit var jvm: Jvm
-
     abstract fun args(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
             testConfig: TestConfig) : List<String>
 
-    open fun onFinish(project: Project) {}
-
-    open val extraClasspath: List<String> = emptyList()
-
-    open fun filterTestClasses(project: Project, context: KobaltContext, classes: List<String>) : List<String> = classes
-
     override fun run(project: Project, context: KobaltContext, configName: String,
-            classpath: List<IClasspathDependency>) : TaskResult {
-        val tr = runTests(project, context, classpath, configName)
-        return TaskResult(tr.success, testResult = tr)
-    }
+            classpath: List<IClasspathDependency>)
+        = TaskResult(runTests(project, context, classpath, configName))
 
     override fun affinity(project: Project, context: KobaltContext) : Int {
+        val td = Kobalt.INJECTOR.getInstance(DependencyManager2::class.java).resolve(project, context, isTest = true)
         val result =
-            if (project.testDependencies.any { it.id.contains(dependencyName) }) IAffinity.DEFAULT_POSITIVE_AFFINITY
+            if (td.any { it.id.contains(dependencyName) }) IAffinity.DEFAULT_POSITIVE_AFFINITY
             else 0
         return result
     }
@@ -69,7 +55,7 @@ abstract class GenericTestRunner: ITestRunnerContributor {
 //            }
 
         context.logger.log(project.name, 2, "Found ${result.size} test classes")
-        return filterTestClasses(project, context, result.map { it.second })
+        return result.map { it.second }
     }
 
     /**
@@ -108,20 +94,17 @@ abstract class GenericTestRunner: ITestRunnerContributor {
     /**
      * @return true if all the tests passed
      */
-    open fun runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
-            configName: String) : TestResult {
+    fun runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
+            configName: String) : Boolean {
         var result = false
 
-        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) {
 
-                val java = jvm.javaExecutable
+                val java = JavaInfo.create(File(SystemProperties.javaBase)).javaExecutable
                 val jvmArgs = calculateAllJvmArgs(project, context, testConfig, classpath,
                         Kobalt.INJECTOR.getInstance (PluginInfo::class.java))
                 val allArgs = arrayListOf<String>().apply {
@@ -137,7 +120,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")
@@ -146,16 +134,7 @@ abstract class GenericTestRunner: ITestRunnerContributor {
         } else {
             throw KobaltException("Couldn't find a test configuration named \"$configName\"")
         }
-
-        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)
+        return result
     }
 
     /*
@@ -164,13 +143,11 @@ abstract class GenericTestRunner: ITestRunnerContributor {
     @VisibleForTesting
     fun calculateAllJvmArgs(project: Project, context: KobaltContext,
             testConfig: TestConfig, classpath: List<IClasspathDependency>, pluginInfo: IPluginInfo) : List<String> {
-        val fullClasspath = classpath.map { it.jarFile.get().absolutePath } + extraClasspath
         // Default JVM args
         val jvmFlags = arrayListOf<String>().apply {
             addAll(testConfig.jvmArgs)
-            add("-ea")
             add("-classpath")
-            add(fullClasspath.joinToString(File.pathSeparator))
+            add(classpath.map { it.jarFile.get().absolutePath }.joinToString(File.pathSeparator))
         }
 
         // JVM flags from the contributors

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

@@ -1,35 +0,0 @@
-package com.beust.kobalt.internal
-
-/**
- * Generic operations on graph-like structures.
- */
-object GraphUtil {
-    /**
-     * Apply the operation in `closure` to all the nodes in the tree.
-     */
-    fun <T> map(roots: List<T>, children: (T) -> List<T>, closure: (T) -> Unit) {
-        roots.forEach {
-            closure(it)
-            map(children(it), children, closure)
-        }
-    }
-
-    /**
-     * Display each node in the roots by calling the `display` function on each of them.
-     */
-    fun <T> displayGraph(roots: List<T>,
-            children: (T) -> List<T>,
-            display: (node: T, indent: String) -> Unit) {
-
-        fun pd(node: T, indent: String) {
-            display(node, indent)
-            children(node).forEach {
-                pd(it, indent + "    ")
-            }
-        }
-        roots.forEach {
-            pd(it, "")
-        }
-    }
-}
-

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

@@ -1,152 +0,0 @@
-package com.beust.kobalt.internal
-
-import com.beust.jcommander.JCommander
-import com.beust.jcommander.Parameter
-import com.beust.kobalt.TestConfig
-import com.beust.kobalt.api.IAffinity
-import com.beust.kobalt.api.IClasspathDependency
-import com.beust.kobalt.api.KobaltContext
-import com.beust.kobalt.api.Project
-import com.beust.kobalt.misc.KFiles
-import com.beust.kobalt.misc.KobaltLogger
-import com.google.inject.Inject
-import org.junit.platform.engine.TestExecutionResult
-import org.junit.platform.engine.discovery.DiscoverySelectors
-import org.junit.platform.engine.reporting.ReportEntry
-import org.junit.platform.engine.support.descriptor.MethodSource
-import org.junit.platform.launcher.LauncherDiscoveryRequest
-import org.junit.platform.launcher.TestExecutionListener
-import org.junit.platform.launcher.TestIdentifier
-import org.junit.platform.launcher.TestPlan
-import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder
-import org.junit.platform.launcher.core.LauncherFactory
-import java.io.File
-import java.nio.file.Paths
-
-/**
- * Runner for JUnit 5 tests. This class also contains a main() entry point since JUnit 5 no longer supplies one.
- */
-class JUnit5Runner @Inject constructor(kFiles: KFiles) : GenericTestRunner() {
-
-    override val dependencyName = "jupiter"
-    override val annotationPackage = "org.junit.jupiter.api"
-    override val mainClass = "com.beust.kobalt.internal.JUnit5RunnerKt"
-    override val runnerName = "JUnit 5"
-
-    override fun affinity(project: Project, context: KobaltContext) : Int {
-        val result =
-                if (project.testDependencies.any { it.id.contains("junit5") || it.id.contains("jupiter") })
-                    IAffinity.DEFAULT_POSITIVE_AFFINITY + 100
-                else 0
-        return result
-
-    }
-
-    override fun args(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>, testConfig: TestConfig): List<String> {
-        val testClassDir = KFiles.joinDir(project.buildDirectory, KFiles.TEST_CLASSES_DIR)
-        val classDir = KFiles.joinDir(project.buildDirectory, KFiles.CLASSES_DIR)
-        val args = listOf("--testClassDir", testClassDir,
-                "--classDir", classDir,
-                "--log", KobaltLogger.LOG_LEVEL.toString())
-        return args
-    }
-
-    override val extraClasspath = kFiles.kobaltJar
-}
-
-private class Args {
-    @Parameter(names = arrayOf("--log"))
-    var log: Int = 1
-
-    @Parameter(names = arrayOf("--testClassDir"))
-    var testClassDir: String = "kobaltBuild/test-classes"
-
-    @Parameter(names = arrayOf("--classDir"))
-    var classDir: String = "kobaltBuild/classes"
-}
-
-fun main(argv: Array<String>) {
-    val args = Args()
-    val jc = JCommander(args)
-    jc.parse(*argv)
-
-    val testClassDir = File(args.testClassDir).absolutePath
-    val classDir = File(args.classDir).absolutePath
-    val request : LauncherDiscoveryRequest = LauncherDiscoveryRequestBuilder()
-            .selectors(DiscoverySelectors.selectClasspathRoots(setOf(
-                    Paths.get(testClassDir),
-                    Paths.get(classDir)
-            )))
-            .selectors(DiscoverySelectors.selectDirectory(testClassDir))
-            .build()
-
-    fun testName(id: TestIdentifier) : String? {
-        val result =
-                if (id.source.isPresent) {
-                    val source = id.source.get()
-                    if (source is MethodSource) {
-                        source.className + "." + source.methodName
-                    } else {
-                        null
-                    }
-                } else {
-                    null
-                }
-        return result
-    }
-
-    var passed = 0
-    var failed = 0
-    var skipped = 0
-    var aborted = 0
-
-    fun log(level: Int, s: String) {
-        if (level <= args.log) println(s)
-    }
-
-    val listener = object: TestExecutionListener {
-        override fun executionFinished(testIdentifier: TestIdentifier, testExecutionResult: TestExecutionResult) {
-            val testName = testName(testIdentifier)
-            if (testName != null) {
-                when(testExecutionResult.status) {
-                    TestExecutionResult.Status.FAILED -> {
-                        log(1, "FAILED: $testName, reason: " + testExecutionResult.throwable.get().toString())
-                        failed++
-                    }
-                    TestExecutionResult.Status.ABORTED -> {
-                        log(1, "ABORTED: $testName, reason: " + testExecutionResult.throwable.get().toString())
-                        aborted++
-                    }
-                    TestExecutionResult.Status.SUCCESSFUL -> {
-                        log(2, "PASSED: $testName")
-                        passed++
-                    } else -> {
-
-                    }
-                }
-            }
-        }
-
-        override fun executionSkipped(testIdentifier: TestIdentifier, reason: String) {
-            testName(testIdentifier)?.let {
-                log(1, "Skipping $it because $reason")
-                skipped++
-            }
-        }
-
-        override fun executionStarted(testIdentifier: TestIdentifier) {
-            testName(testIdentifier)?.let {
-                log(2, "Starting $it")
-            }
-        }
-
-        override fun testPlanExecutionStarted(testPlan: TestPlan?) {}
-        override fun dynamicTestRegistered(testIdentifier: TestIdentifier?) {}
-        override fun reportingEntryPublished(testIdentifier: TestIdentifier?, entry: ReportEntry?) {}
-        override fun testPlanExecutionFinished(testPlan: TestPlan?) {}
-    }
-
-    LauncherFactory.create().execute(request, listener)
-
-    log(1, "TEST RESULTS: $passed PASSED, $failed FAILED, $skipped SKIPPED, $aborted ABORTED")
-}

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

@@ -4,29 +4,16 @@ import com.beust.kobalt.TestConfig
 import com.beust.kobalt.api.IClasspathDependency
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
-import com.beust.kobalt.maven.DependencyManager
-import com.google.inject.Inject
-import java.lang.reflect.Modifier
-import java.net.URLClassLoader
 
 open class JUnitRunner() : GenericTestRunner() {
 
     override val mainClass = "org.junit.runner.JUnitCore"
+
     override val annotationPackage = "org.junit"
+
     override val dependencyName = "junit"
-    override val runnerName = "JUnit 4"
 
     override fun args(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
             testConfig: TestConfig) = findTestClasses(project, context, testConfig)
-
-    @Inject
-    lateinit var dependencyManager: DependencyManager
-
-    override fun filterTestClasses(project: Project, context: KobaltContext, classes: List<String>) : List<String> {
-        val deps = dependencyManager.testDependencies(project, context)
-        val cl = URLClassLoader(deps.map { it.jarFile.get().toURI().toURL() }.toTypedArray())
-        return classes.filter { !Modifier.isAbstract(cl.loadClass(it).modifiers) }
-    }
-
 }
 

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

@@ -15,25 +15,36 @@ import java.util.*
  * Also validates the classpath and run all the contributors.
  */
 class JvmCompiler @Inject constructor(val dependencyManager: DependencyManager) {
+
     /**
      * Take the given CompilerActionInfo and enrich it with all the applicable contributors and
      * then pass it to the ICompilerAction.
      */
-    fun doCompile(project: Project?, context: KobaltContext?, action: ICompilerAction, info: CompilerActionInfo,
-            flags: List<String>): TaskResult {
+    fun doCompile(project: Project?, context: KobaltContext?, action: ICompilerAction, info: CompilerActionInfo)
+            : TaskResult {
 
         // Dependencies
-        val allDependencies = (info.dependencies + dependencyManager.calculateDependencies(project, context!!,
-                passedDependencies = info.dependencies))
+        val allDependencies = (info.dependencies
+                + dependencyManager.calculateDependencies(project, context!!, passedDependencies = info.dependencies))
             .distinct()
 
         // Plugins that add flags to the compiler
-        val contributorFlags : List<String> = if (project != null) flags else emptyList()
+        val currentFlags = arrayListOf<String>().apply { addAll(info.compilerArgs) }
+        val contributorFlags : List<String> = if (project != null) {
+            val contributors = context.pluginInfo.compilerFlagContributors
+            contributors.sortBy { it.flagPriority }
+            context.pluginInfo.compilerFlagContributors.forEach {
+                currentFlags.addAll(it.flagsFor(project, context, currentFlags, info.suffixesBeingCompiled))
+            }
+            currentFlags
+        } else {
+            emptyList()
+        }
 
         val addedFlags = contributorFlags + ArrayList(info.compilerArgs)
 
         validateClasspath(allDependencies.map { it.jarFile.get().absolutePath })
-        return action.compile(project, info.copy(dependencies = allDependencies, compilerArgs = addedFlags))
+        return action.compile(project?.name, info.copy(dependencies = allDependencies, compilerArgs = addedFlags))
     }
 
     private fun validateClasspath(cp: List<String>) {
@@ -46,5 +57,5 @@ class JvmCompiler @Inject constructor(val dependencyManager: DependencyManager)
 }
 
 interface ICompilerAction {
-    fun compile(project: Project?, info: CompilerActionInfo): TaskResult
+    fun compile(projectName: String?, info: CompilerActionInfo): TaskResult
 }

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

@@ -9,8 +9,9 @@ import com.beust.kobalt.api.annotation.ExportedProjectProperty
 import com.beust.kobalt.api.annotation.IncrementalTask
 import com.beust.kobalt.api.annotation.Task
 import com.beust.kobalt.maven.DependencyManager
+import com.beust.kobalt.maven.DependencyManager2
+import com.beust.kobalt.maven.LocalRepo
 import com.beust.kobalt.maven.Md5
-import com.beust.kobalt.maven.aether.Scope
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
 import com.beust.kobalt.misc.error
@@ -21,13 +22,15 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * This plug-in takes care of compilation: it declares several common tasks ("compile", "compileTest")
+ * This plug-in takes care of compilation: it declares a bunch of tasks ("compile", "compileTest") and
  * and picks up all the compiler contributors in order to run them whenever a compilation is requested.
  */
 @Singleton
 open class JvmCompilerPlugin @Inject constructor(
+        open val localRepo: LocalRepo,
         open val files: KFiles,
         open val dependencyManager: DependencyManager,
+        open val dependencyManager2: DependencyManager2,
         open val executors: KobaltExecutors,
         open val taskContributor : TaskContributor,
         val compilerUtils: CompilerUtils)
@@ -85,13 +88,9 @@ open class JvmCompilerPlugin @Inject constructor(
                 context.pluginInfo.testRunnerContributors)
         if (testContributor != null && testContributor.affinity(project, context) > 0) {
 //            val td1 = dependencyManager.testDependencies(project, context)
-            val testDependencies = dependencyManager.calculateDependencies(project, context,
-                    dependencyFilter = dependencyManager.createDependencyFilter(project, project.testDependencies),
-                    scopes = listOf(Scope.TEST))
-            val compileDependencies = dependencyManager.calculateDependencies(project, context,
-                    scopes = listOf(Scope.COMPILE, Scope.COMPILEONLY))
-            val allDependencies = (testDependencies + compileDependencies).distinct()
-            return testContributor.run(project, context, configName, allDependencies.toList())
+            val testDependencies = dependencyManager2.resolve(project, context, isTest = true)
+            val compileDependencies = dependencyManager2.resolve(project, context, isTest = false)
+            return testContributor.run(project, context, configName, testDependencies + compileDependencies)
         } else {
             context.logger.log(project.name, 2,
                 "Couldn't find a test runner for project ${project.name}, did you specify dependenciesTest{}?")
@@ -151,16 +150,13 @@ open class JvmCompilerPlugin @Inject constructor(
         val results = arrayListOf<TaskResult>()
 
         val compilerContributors = context.pluginInfo.compilerContributors
-                ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors)
+                ActorUtils.selectAffinityActors(project, context,
+                context.pluginInfo.compilerContributors)
 
         var failedResult: TaskResult? = null
         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()
 
             /**
@@ -174,10 +170,7 @@ open class JvmCompilerPlugin @Inject constructor(
                     if (wi.value.sourceSuffixes.contains("java")) ij = wi.index
                     if (wi.value.sourceSuffixes.contains("kt")) ik = wi.index
                 }
-
-                if (ik >= 0 && ij >= 0) {
-                    Collections.swap(result, ik, ij)
-                }
+                Collections.swap(result, ik, ij)
                 return result
             }
 
@@ -185,14 +178,9 @@ open class JvmCompilerPlugin @Inject constructor(
             val hasKapt = project.projectProperties.get("kaptConfig") != null
             val allCompilersSorted = if (hasKapt) swapJavaAndKotlin(allCompilers) else allCompilers
             var done = false
-            // The directory where the classes get compiled
-            val buildDirectory =
-                    if (isTest) File(KFiles.joinDir(project.buildDirectory, KFiles.TEST_CLASSES_DIR))
-                    else File(KFiles.joinDir(project.classesDir(context)))
-
             allCompilersSorted.doWhile({ ! done }) { compiler ->
                 val compilerResults = compilerUtils.invokeCompiler(project, context, compiler,
-                        sourceDirectories(project, context, isTest), isTest, buildDirectory)
+                        sourceDirectories(project, context, isTest), isTest)
                 results.addAll(compilerResults.successResults)
                 if (failedResult == null) failedResult = compilerResults.failedResult
                 compilerResults.failedResult?.let { failedResult ->
@@ -225,12 +213,10 @@ open class JvmCompilerPlugin @Inject constructor(
         }
     }
 
-    @Task(name = "doc", description = "Generate the documentation for the project", group = GROUP_DOCUMENTATION,
-            runBefore = arrayOf("assemble"), runAfter = arrayOf("clean"))
+    @Task(name = "doc", description = "Generate the documentation for the project", group = GROUP_DOCUMENTATION)
     fun taskJavadoc(project: Project): TaskResult {
         val docGenerator = ActorUtils.selectAffinityActor(project, context, context.pluginInfo.docContributors)
         if (docGenerator != null) {
-            val buildDirectory = File(project.buildDirectory, JvmCompilerPlugin.DOCS_DIRECTORY)
             val contributors =
                     ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors)
             var result: TaskResult? = null
@@ -239,7 +225,7 @@ open class JvmCompilerPlugin @Inject constructor(
                     result = docGenerator.generateDoc(project, context,
                             compilerUtils.createCompilerActionInfo(project, context, compiler,
                                     isTest = false, sourceDirectories = sourceDirectories(project, context, false),
-                            sourceSuffixes = compiler.sourceSuffixes, buildDirectory = buildDirectory))
+                            sourceSuffixes = compiler.sourceSuffixes))
                 }
             }
             return result!!

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

@@ -72,13 +72,13 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
     val plugins = arrayListOf<IPlugin>()
     val projectContributors = arrayListOf<IProjectContributor>()
     val classpathContributors = arrayListOf<IClasspathContributor>()
-    val templateContributors = arrayListOf<ITemplateContributor>()
+    val initContributors = arrayListOf<ITemplateContributor>()
     val repoContributors = arrayListOf<IRepoContributor>()
     val compilerFlagContributors = arrayListOf<ICompilerFlagContributor>()
     val compilerInterceptors = arrayListOf<ICompilerInterceptor>()
     val sourceDirectoriesInterceptors = arrayListOf<ISourceDirectoryInterceptor>()
     val buildDirectoryInterceptors = arrayListOf<IBuildDirectoryInterceptor>()
-//    val runnerContributors = arrayListOf<IRunnerContributor>()
+    val runnerContributors = arrayListOf<IRunnerContributor>()
     val testRunnerContributors = arrayListOf<ITestRunnerContributor>()
     val classpathInterceptors = arrayListOf<IClasspathInterceptor>()
     val compilerContributors = arrayListOf<ICompilerContributor>()
@@ -98,7 +98,6 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
     val localMavenRepoPathInterceptors = arrayListOf<ILocalMavenRepoPathInterceptor>()
     val buildListeners = arrayListOf<IBuildListener>()
     val buildReportContributors = arrayListOf<IBuildReportContributor>()
-    val docFlagContributors = arrayListOf<IDocFlagContributor>()
 
     // Note: intentionally repeating them here even though they are defined by our base class so
     // that this class always contains the full list of contributors and interceptors
@@ -172,8 +171,9 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
             }
 
             val result = loadClass(className, classLoader)
-                    ?: loadClass(className, pluginClassLoader)
                     ?: Class.forName(className)
+                    ?: loadClass(className, pluginClassLoader)
+                    ?: throw ClassNotFoundException(className)
 
             return result
         }
@@ -193,11 +193,11 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
                 if (this is ICompilerFlagContributor) compilerFlagContributors.add(this)
                 if (this is ICompilerInterceptor) compilerInterceptors.add(this)
                 if (this is IDocContributor) docContributors.add(this)
-                if (this is ITemplateContributor) templateContributors.add(this)
+                if (this is ITemplateContributor) initContributors.add(this)
                 if (this is IPlugin) plugins.add(this)
                 if (this is IProjectContributor) projectContributors.add(this)
                 if (this is IRepoContributor) repoContributors.add(this)
-//                if (this is IRunnerContributor) runnerContributors.add(this)
+                if (this is IRunnerContributor) runnerContributors.add(this)
                 if (this is ISourceDirectoryContributor) sourceDirContributors.add(this)
                 if (this is ISourceDirectoryInterceptor) sourceDirectoriesInterceptors.add(this)
                 if (this is ITaskContributor) taskContributors.add(this)
@@ -216,24 +216,25 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
                 if (this is ILocalMavenRepoPathInterceptor) localMavenRepoPathInterceptors.add(this)
                 if (this is IBuildListener) buildListeners.add(this)
                 if (this is IBuildReportContributor) buildReportContributors.add(this)
-                if (this is IDocFlagContributor) docFlagContributors.add(this)
             }
         }
     }
 
     fun cleanUp() {
-        listOf(projectContributors, classpathContributors, templateContributors,
+        listOf(projectContributors, classpathContributors, initContributors,
                 repoContributors, compilerFlagContributors, compilerInterceptors,
                 sourceDirectoriesInterceptors, buildDirectoryInterceptors,
-                /* runnerContributors, */ testRunnerContributors, classpathInterceptors,
+                runnerContributors, testRunnerContributors, classpathInterceptors,
                 compilerContributors, docContributors, sourceDirContributors,
                 testSourceDirContributors, buildConfigFieldContributors,
                 taskContributors, incrementalTaskContributors, assemblyContributors,
                 incrementalAssemblyContributors, testJvmFlagInterceptors,
                 jvmFlagContributors, localMavenRepoPathInterceptors, buildListeners,
-                buildReportContributors, docFlagContributors
+                buildReportContributors
             ).forEach {
-                it.forEach(IPluginActor::cleanUpActors)
+                it.forEach {
+                    it.cleanUpActors()
+                }
             }
     }
 
@@ -246,13 +247,13 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
         plugins.addAll(pluginInfo.plugins)
         classpathContributors.addAll(pluginInfo.classpathContributors)
         projectContributors.addAll(pluginInfo.projectContributors)
-        templateContributors.addAll(pluginInfo.templateContributors)
+        initContributors.addAll(pluginInfo.initContributors)
         repoContributors.addAll(pluginInfo.repoContributors)
         compilerFlagContributors.addAll(pluginInfo.compilerFlagContributors)
         compilerInterceptors.addAll(pluginInfo.compilerInterceptors)
         sourceDirectoriesInterceptors.addAll(pluginInfo.sourceDirectoriesInterceptors)
         buildDirectoryInterceptors.addAll(pluginInfo.buildDirectoryInterceptors)
-//        runnerContributors.addAll(pluginInfo.runnerContributors)
+        runnerContributors.addAll(pluginInfo.runnerContributors)
         testRunnerContributors.addAll(pluginInfo.testRunnerContributors)
         classpathInterceptors.addAll(pluginInfo.classpathInterceptors)
         compilerContributors.addAll(pluginInfo.compilerContributors)
@@ -272,7 +273,6 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
         localMavenRepoPathInterceptors.addAll(pluginInfo.localMavenRepoPathInterceptors)
         buildListeners.addAll(pluginInfo.buildListeners)
         buildReportContributors.addAll(pluginInfo.buildReportContributors)
-        docFlagContributors.addAll(pluginInfo.docFlagContributors)
     }
 }
 

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

@@ -1,11 +1,10 @@
 package com.beust.kobalt.internal
 
-import com.beust.kobalt.BUILD_SCRIPT_CONFIG
-import com.beust.kobalt.Constants
 import com.beust.kobalt.ProxyConfig
 import com.beust.kobalt.homeDir
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.kobaltLog
+import com.beust.kobalt.misc.log
 import com.google.inject.Inject
 import com.google.inject.Singleton
 import java.io.File
@@ -25,26 +24,17 @@ class KobaltSettingsXml {
     @XmlElement(name = "localMavenRepo") @JvmField
     var localMavenRepo: String = homeDir(KFiles.KOBALT_DOT_DIR, "localMavenRepo")
 
-    @XmlElement(name = "defaultRepos") @JvmField
+    @XmlElement(name = "defaulRepos") @JvmField
     var defaultRepos: DefaultReposXml? = null
 
     @XmlElement(name = "proxies") @JvmField
     var proxies: ProxiesXml? = null
 
     @XmlElement(name = "kobaltCompilerVersion") @JvmField
-    var kobaltCompilerVersion: String = Constants.KOTLIN_COMPILER_VERSION
+    var kobaltCompilerVersion: String = "1.0.4-eap-62"
 
     @XmlElement(name = "kobaltCompilerRepo") @JvmField
     var kobaltCompilerRepo: String? = null
-
-    @XmlElement(name = "kobaltCompilerFlags") @JvmField
-    var kobaltCompilerFlags: String? = null
-
-    @XmlElement(name = "kobaltCompilerSeparateProcess") @JvmField
-    var kobaltCompilerSeparateProcess: Boolean = false
-
-    @XmlElement(name = "autoUpdate") @JvmField
-    var autoUpdate: Boolean = false
 }
 
 class ProxiesXml {
@@ -88,17 +78,6 @@ class KobaltSettings @Inject constructor(val xmlFile: KobaltSettingsXml) {
      */
     val localMavenRepo = KFiles.makeDir(xmlFile.localMavenRepo)
 
-    /**
-     * If true, Kobalt will automatically update itself if a new version is found.
-     */
-    val autoUpdate = xmlFile.autoUpdate
-
-    /**
-     * If true, the Kotlin compiler will always be launched in a separate JVM, even if the requested
-     * version is the same as the internal version.
-     */
-    val kobaltCompilerSeparateProcess = xmlFile.kobaltCompilerSeparateProcess
-
     val defaultRepos = xmlFile.defaultRepos?.repo
 
     val proxyConfigs = with(xmlFile.proxies?.proxy) {
@@ -117,32 +96,8 @@ class KobaltSettings @Inject constructor(val xmlFile: KobaltSettingsXml) {
         }
     }
 
-    val kobaltCompilerVersion : String?
-        get() {
-            return if (BUILD_SCRIPT_CONFIG != null && BUILD_SCRIPT_CONFIG?.kobaltCompilerVersion != null) {
-                BUILD_SCRIPT_CONFIG?.kobaltCompilerVersion
-            } else {
-                xmlFile.kobaltCompilerVersion
-            }
-        }
-
-    val kobaltCompilerRepo : String?
-        get() {
-            return if (BUILD_SCRIPT_CONFIG != null && BUILD_SCRIPT_CONFIG?.kobaltCompilerRepo != null) {
-                BUILD_SCRIPT_CONFIG?.kobaltCompilerRepo
-            } else {
-                xmlFile.kobaltCompilerRepo
-            }
-        }
-
-    val kobaltCompilerFlags : String?
-        get() {
-            return if (BUILD_SCRIPT_CONFIG != null && BUILD_SCRIPT_CONFIG?.kobaltCompilerFlags != null) {
-                BUILD_SCRIPT_CONFIG?.kobaltCompilerFlags
-            } else {
-                xmlFile.kobaltCompilerFlags
-            }
-        }
+    var kobaltCompilerVersion = xmlFile.kobaltCompilerVersion
+    var kobaltCompilerRepo = xmlFile.kobaltCompilerRepo
 
     companion object {
         val SETTINGS_FILE_PATH = KFiles.joinDir(KFiles.HOME_KOBALT_DIR.absolutePath, "settings.xml")

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/KotlinTestRunner.kt

@@ -1,21 +0,0 @@
-package com.beust.kobalt.internal
-
-import com.beust.kobalt.api.KobaltContext
-import com.beust.kobalt.api.Project
-
-/**
- * KotlinTestRunner triggers if it finds a dependency on io.kotlintest but other than that, it just
- * uses the regular JUnitRunner.
- */
-class KotlinTestRunner : JUnitRunner() {
-    override val dependencyName = "io.kotlintest"
-    override val runnerName = "Kotlin Test"
-
-    /**
-     * KotlinTestRunner runs tests in the init{} initializer, so ignore all the extra
-     * classes generated by the Kotlin compiler.
-     */
-    override fun filterTestClasses(projet: Project, context: KobaltContext, classes: List<String>)
-            = classes.filter { !it.contains("$") }
-}
-

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

@@ -2,7 +2,9 @@ package com.beust.kobalt.internal
 
 import com.beust.kobalt.Args
 import com.beust.kobalt.KobaltException
-import com.beust.kobalt.misc.*
+import com.beust.kobalt.misc.kobaltError
+import com.beust.kobalt.misc.kobaltLog
+import com.beust.kobalt.misc.kobaltWarn
 import com.google.inject.Inject
 import com.google.inject.Singleton
 import java.util.*
@@ -65,9 +67,9 @@ class ParallelLogger @Inject constructor(val args: Args) : ILogger {
     }
 
     private fun debug(s: CharSequence) {
-        if (args.log >= 3) {
+        if (args.log >= 2) {
             val time = System.currentTimeMillis() - startTime!!
-            kobaltLog(1, "                    ### [$time] $s")
+            println("                    ### [$time] $s")
         }
     }
 
@@ -114,10 +116,10 @@ class ParallelLogger @Inject constructor(val args: Args) : ILogger {
     }
 
     override fun log(tag: CharSequence, level: Int, message: CharSequence, newLine: Boolean) {
-        if (args.sequential) {
-            kobaltLog(level, message, newLine)
-        } else {
+        if (args.parallel) {
             addLogLine(tag, LogLine(tag, level, message, Type.LOG, newLine))
+        } else {
+            kobaltLog(level, message, newLine)
         }
     }
 
@@ -125,6 +127,6 @@ class ParallelLogger @Inject constructor(val args: Args) : ILogger {
         runningProjects.forEach {
             emptyProjectLog(it)
         }
-        kobaltLog(1, "")
+        println("")
     }
 }

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

@@ -54,12 +54,12 @@ class ParallelProjectRunner(val tasksByNames: (Project) -> ListMultimap<String,
                             runBuildListenersForTask(project, context, task.name, start = true)
                             logger.log(project.name, 1,
                                     AsciiArt.taskColor(AsciiArt.horizontalSingleLine + " ${project.name}:${task.name}"))
-                            val thisResult = if (dryRun) TaskResult2(true, value = task) else task.call()
+                            val thisResult = if (dryRun) TaskResult2(true, null, task) else task.call()
                             if (lastResult.success) {
                                 lastResult = thisResult
                             }
                             runBuildListenersForTask(project, context, task.name, start = false,
-                                    success = thisResult.success, testResult = thisResult.testResult)
+                                    success = thisResult.success)
                         }
                     }
                     graph.freeNodes.forEach { graph.removeNode(it) }
@@ -69,7 +69,7 @@ class ParallelProjectRunner(val tasksByNames: (Project) -> ListMultimap<String,
                 runBuildListenersForProject(project, context, false,
                         if (lastResult.success) ProjectBuildStatus.SUCCESS else ProjectBuildStatus.FAILED)
 
-                return TaskResult2(lastResult.success, errorMessage = lastResult.errorMessage, value = this)
+                return TaskResult2(lastResult.success, lastResult.errorMessage, this)
             }
 
         }
@@ -93,8 +93,7 @@ class ParallelProjectRunner(val tasksByNames: (Project) -> ListMultimap<String,
 
         val projectGraph = DynamicGraph<ProjectTask>().apply {
             projects.forEach { project ->
-                addNode(ProjectTask(project, args.dryRun))
-                project.allProjectDependedOn().forEach {
+                project.dependsOn.forEach {
                     addEdge(ProjectTask(project, args.dryRun), ProjectTask(it, args.dryRun))
                 }
             }
@@ -106,7 +105,7 @@ class ParallelProjectRunner(val tasksByNames: (Project) -> ListMultimap<String,
 
         logger.shutdown()
 
-        if (! args.sequential) {
+        if (args.parallel) {
             executor.dumpHistory()
         }
         return TaskManager.RunTargetResult(taskResult, emptyList())

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

@@ -39,7 +39,7 @@ class SequentialProjectRunner(val tasksByNames: (Project) -> ListMultimap<String
             klog(1, AsciiArt.logBox("Building $projectName", indent = 5))
 
             // Does the current project depend on any failed projects?
-            val fp = project.allProjectDependedOn().filter { failedProjects.contains(it.name) }.map(Project::name)
+            val fp = project.dependsOn.filter { failedProjects.contains(it.name) }.map(Project::name)
 
             if (fp.size > 0) {
                 klog(2, "Marking project $projectName as skipped")

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

@@ -6,6 +6,5 @@ package com.beust.kobalt.internal
  */
 class SpekRunner : JUnitRunner() {
     override val dependencyName = "org.jetbrains.spek"
-    override val runnerName = "Spek"
 }
 

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

@@ -17,7 +17,7 @@ import javax.inject.Singleton
 @Singleton
 class TaskManager @Inject constructor(val args: Args,
         val incrementalManagerFactory: IncrementalManager.IFactory,
-        val kobaltLog: ParallelLogger) {
+        val pluginInfo: PluginInfo, val kobaltLog: ParallelLogger) {
     private val dependsOn = TreeMultimap.create<String, String>()
     private val reverseDependsOn = TreeMultimap.create<String, String>()
     private val runBefore = TreeMultimap.create<String, String>()
@@ -80,9 +80,6 @@ class TaskManager @Inject constructor(val args: Args,
         }
     }
 
-//    @Inject
-//    lateinit var pluginInfo: PluginInfo
-
     fun runTargets(passedTaskNames: List<String>, allProjects: List<Project>): RunTargetResult {
         // Check whether tasks passed at command line exist
         passedTaskNames.forEach {
@@ -90,7 +87,6 @@ class TaskManager @Inject constructor(val args: Args,
                 throw KobaltException("Unknown task: $it")
         }
 
-        val pluginInfo = Kobalt.INJECTOR.getInstance(PluginInfo::class.java)
         var taskInfos = calculateDependentTaskNames(passedTaskNames, allProjects)
 
         // Remove non existing tasks (e.g. dynamic task defined for a single project)
@@ -98,13 +94,10 @@ class TaskManager @Inject constructor(val args: Args,
 
         val projectsToRun = findProjectsToRun(taskInfos, allProjects)
         val projectRunner =
-            if (args.sequential) {
-                SequentialProjectRunner({ p -> tasksByNames(p) }, dependsOn,
-                        reverseDependsOn, runBefore, runAfter, alwaysRunAfter, args, pluginInfo)
-            } else {
-                ParallelProjectRunner({ p -> tasksByNames(p) }, dependsOn,
-                        reverseDependsOn, runBefore, runAfter, alwaysRunAfter, args, pluginInfo, kobaltLog)
-            }
+            if (args.parallel) ParallelProjectRunner({ p -> tasksByNames(p) }, dependsOn,
+                    reverseDependsOn, runBefore, runAfter, alwaysRunAfter, args, pluginInfo, kobaltLog)
+            else SequentialProjectRunner({ p -> tasksByNames(p) }, dependsOn,
+                    reverseDependsOn, runBefore, runAfter, alwaysRunAfter, args, pluginInfo)
         return projectRunner.runProjects(taskInfos, projectsToRun)
     }
 
@@ -149,7 +142,7 @@ class TaskManager @Inject constructor(val args: Args,
             val topological = Topological<Project>().apply {
                 projects.forEach { project ->
                     addNode(project)
-                    project.allProjectDependedOn().forEach {
+                    project.dependsOn.forEach {
                         addEdge(project, it)
                     }
                 }
@@ -164,7 +157,7 @@ class TaskManager @Inject constructor(val args: Args,
             return result
         } else {
             val rootProject = projects.find { it.name == ti.project }!!
-            val allProjects = DynamicGraph.transitiveClosure(rootProject, Project::allProjectDependedOn)
+            val allProjects = DynamicGraph.transitiveClosure(rootProject, { p -> p.dependsOn })
             val sortedProjects = sortProjectsTopologically(allProjects)
             val sortedMaps = sortedProjects.map { TaskInfo(it.name, "compile")}
             val result = sortedMaps.subList(0, sortedMaps.size - 1) + listOf(ti)
@@ -196,7 +189,6 @@ class TaskManager @Inject constructor(val args: Args,
             = TaskAnnotation(method, plugin, ta.name, ta.description, ta.group, ta.dependsOn, ta.reverseDependsOn,
                 ta.runBefore, ta.runAfter, ta.alwaysRunAfter,
             { project ->
-                Kobalt.context?.variant = Variant()
                 method.invoke(plugin, project) as TaskResult
             })
 
@@ -272,8 +264,7 @@ class TaskManager @Inject constructor(val args: Args,
                 object : BasePluginTask(plugin, name, description, group, project) {
                     override fun call(): TaskResult2<ITask> {
                         val taskResult = task(project)
-                        return TaskResult2(taskResult.success, errorMessage = taskResult.errorMessage, value = this,
-                            testResult = taskResult.testResult)
+                        return TaskResult2(taskResult.success, taskResult.errorMessage, this)
                     }
                 })
         dependsOn.forEach { dependsOn(it, name) }
@@ -320,11 +311,9 @@ class TaskWorker(val tasks: List<ITask>, val dryRun: Boolean, val pluginInfo: Pl
             val tr = if (dryRun) TaskResult() else it.call()
             BaseProjectRunner.runBuildListenersForTask(it.project, context, name, start = false, success = tr.success)
             success = success and tr.success
-            tr.errorMessage?.let {
-                errorMessages.add(it)
-            }
+            if (tr.errorMessage != null) errorMessages.add(tr.errorMessage)
         }
-        return TaskResult2(success, errorMessage = errorMessages.joinToString("\n"), value = tasks[0])
+        return TaskResult2(success, errorMessages.joinToString("\n"), tasks[0])
     }
 
 //    override val timeOut : Long = 10000

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

@@ -1,53 +1,28 @@
 package com.beust.kobalt.internal
 
-import com.beust.kobalt.AsciiArt
 import com.beust.kobalt.TestConfig
-import com.beust.kobalt.TestResult
 import com.beust.kobalt.api.IClasspathDependency
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
-import com.beust.kobalt.maven.aether.AetherDependency
-import com.beust.kobalt.misc.*
-import org.testng.remote.RemoteArgs
-import org.testng.remote.strprotocol.JsonMessageSender
-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 com.beust.kobalt.misc.KFiles
+import com.beust.kobalt.misc.warn
 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() {
 
     override val mainClass = "org.testng.TestNG"
-    override val dependencyName = "testng"
-    override val annotationPackage = "org.testng"
-    override val runnerName = "TestNG"
 
-    private fun defaultOutputWithoutProjectDir(project: Project)
-            = KFiles.joinDir(project.buildDirectory, "test-output")
-    private fun defaultOutput(project: Project)
-            = KFiles.joinDir(project.directory, project.buildDirectory, "test-output")
+    override val dependencyName = "testng"
+
+    override val annotationPackage = "org.testng"
+
+    fun defaultOutput(project: Project) = KFiles.joinDir(project.buildDirectory, "test-output")
 
     override fun args(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
             testConfig: TestConfig) = arrayListOf<String>().apply {
-
-        if (KobaltLogger.isQuiet) {
-            add("-log")
-            add("0")
-        }
-
-        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
-            // running the tests
-            add(defaultOutputWithoutProjectDir(project))
+        var addOutput = true
+        testConfig.testArgs.forEach { arg ->
+            if (arg == "-d") addOutput = false
         }
 
         if (testConfig.testArgs.size == 0) {
@@ -57,212 +32,27 @@ class TestNgRunner : GenericTestRunner() {
                 add(testngXml.absolutePath)
             } else {
                 val testClasses = findTestClasses(project, context, testConfig)
-                if (testClasses.isNotEmpty()) {
+                if (testClasses.size > 0) {
+                    if (addOutput) {
+                        add("-d")
+                        add(defaultOutput(project))
+                    }
                     addAll(testConfig.testArgs)
 
                     add("-testclass")
                     add(testClasses.joinToString(","))
                 } else {
-                    if (!testConfig.isDefault) warn("Couldn't find any test classes for ${project.name}")
+                    if (! testConfig.isDefault) warn("Couldn't find any test classes for ${project.name}")
                     // else do nothing: since the user didn't specify an explicit test{} directive, not finding
                     // any test sources is not a problem
                 }
             }
         } else {
+            if (addOutput) {
+                add("-d")
+                add(defaultOutput(project))
+            }
             addAll(testConfig.testArgs)
         }
     }
-
-    /**
-     * Extract test results from testng-results.xml and initialize shortMessage.
-     */
-    override fun onFinish(project: Project) {
-        File(defaultOutput(project), "testng-results.xml").let { file ->
-            val ins = InputSource(FileReader(file))
-            val doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(ins)
-
-            val root = doc.documentElement
-            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) {
-                    "failed" -> failed = Integer.parseInt(attribute.value)
-                    "skipped" -> skipped = Integer.parseInt(attribute.value)
-                    "passed" -> passed = Integer.parseInt(attribute.value)
-                }
-            }
-
-            if (failed == 0) {
-                shortMessage = "$passed tests"
-            } else if (failed > 0) {
-                shortMessage = "$failed failed" + (if (skipped > 0) ", $skipped skipped" else "") + " tests"
-                longMessage = "Failed tests:\n  " + failedMethods.joinToString("\n  ")
-            }
-        }
-    }
-
-    val VERSION_6_10 = StringVersion("6.10")
-
-    fun _runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
-//    override fun runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
-            configName: String): TestResult {
-
-        val testConfig = project.testConfigs.firstOrNull { it.name == configName }
-
-        if (testConfig != null) {
-            context.logger.log(project.name, 1, "Running enhanced TestNG runner")
-
-            val testngDependency = (project.testDependencies.filter { it.id.contains("testng") }
-                    .firstOrNull() as AetherDependency).version
-            val versions = findRemoteRunnerVersion(testngDependency)
-            val useOldRunner = System.getProperty("testng.oldRunner") != null
-            val result =
-                if (versions != null && ! useOldRunner) {
-                    context.logger.log(project.name, 1, "Modern TestNG, displaying colors")
-                    displayPrettyColors(project, context, classpath, testConfig, versions)
-                } else {
-                    context.logger.log(project.name, 1, "Older TestNG ($testngDependency), using the old runner")
-                    super.runTests(project, context, classpath, configName)
-                }
-            return result
-        } else {
-            return TestResult(true)
-        }
-    }
-
-    private fun findRemoteRunnerVersion(testngVersion: String) : Pair<String, String>? {
-        val tng = StringVersion(testngVersion)
-        val result =
-            if (tng >= VERSION_6_10) Pair(testngVersion, "testng-remote6_10")
-            else if (tng >= StringVersion("6.9.10")) Pair("6.9.10", "testng-remote6_9_10")
-            else if (tng >= StringVersion("6.9.7")) Pair("6.9.7", "testng-remote6_9_7")
-            else if (tng >= StringVersion("6.5.1")) Pair("6.5.1", "testng-remote6_5_0")
-            else if (tng >= StringVersion("6.0")) Pair("6.0", "testng-remote6_0")
-            else null
-        return result
-    }
-
-    private fun displayPrettyColors(project: Project, context: KobaltContext,
-            classpath: List<IClasspathDependency>, testConfig: TestConfig, versions: Pair<String, String>)
-            : TestResult {
-        val port = 2345
-//        launchRemoteServer(project, context, classpath, testConfig, versions, port)
-
-        val mh = MessageHub(JsonMessageSender("localhost", port, true))
-        mh.setDebug(true)
-        mh.initReceiver()
-        val passed = arrayListOf<String>()
-
-        data class FailedTest(val method: String, val cls: String, val stackTrace: String)
-
-        val failed = arrayListOf<FailedTest>()
-        val skipped = arrayListOf<String>()
-
-        fun d(n: Int, color: String)
-                = AsciiArt.wrap(String.format("%4d", n), color)
-
-        fun red(s: String) = AsciiArt.wrap(s, AsciiArt.RED)
-        fun green(s: String) = AsciiArt.wrap(s, AsciiArt.GREEN)
-        fun yellow(s: String) = AsciiArt.wrap(s, AsciiArt.YELLOW)
-
-        try {
-            var message = mh.receiveMessage()
-            kobaltLog(1, "")
-            kobaltLog(1, green("PASSED") + " | " + red("FAILED") + " | " + yellow("SKIPPED"))
-            while (message != null) {
-                message = mh.receiveMessage()
-                if (message is TestResultMessage) {
-                    when (message.result) {
-                        MessageHelper.PASSED_TEST -> passed.add(message.name)
-                        MessageHelper.FAILED_TEST -> failed.add(FailedTest(message.testClass,
-                                message.method, message.stackTrace))
-                        MessageHelper.SKIPPED_TEST -> skipped.add(message.name)
-                    }
-                }
-                if (!KobaltLogger.isQuiet) {
-                    print("\r  " + d(passed.size, AsciiArt.GREEN)
-                            + " |   " + d(failed.size, AsciiArt.RED)
-                            + " |   " + d(skipped.size, AsciiArt.YELLOW))
-                }
-            }
-        } catch(ex: IOException) {
-             kobaltLog(1, "Exception: ${ex.message}")
-        }
-        kobaltLog(1, "\nPassed: " + passed.size + ", Failed: " + failed.size + ", Skipped: " + skipped.size)
-        failed.forEach {
-            val top = it.stackTrace.substring(0, it.stackTrace.indexOf("\n"))
-             kobaltLog(1, "  " + it.cls + "." + it.method + "\n    " + top)
-        }
-        return TestResult(failed.isEmpty() && skipped.isEmpty())
-    }
-
-    fun launchRemoteServer(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
-            testConfig: TestConfig, versions: Pair<String, String>, port: Int) {
-        val testngVersion = versions.first
-        val remoteRunnerVersion = versions.second
-        val dep = with(context.dependencyManager) {
-            val jf = create("org.testng.testng-remote:testng-remote:1.3.0")
-            val tr = create("org.testng.testng-remote:$remoteRunnerVersion:1.3.0")
-            val testng = create("org.testng:testng:6.11")
-            transitiveClosure(kotlin.collections.listOf(jf, tr /*, testng */))
-        }
-
-        val cp = (classpath + dep).distinct().map { it.jarFile.get() }
-                .joinToString(File.pathSeparator)
-        val calculatedArgs = args(project, context, classpath, testConfig)
-
-        val jvmArgs = arrayListOf("-classpath", cp)
-        if (testConfig.jvmArgs.any()) {
-            jvmArgs.addAll(testConfig.jvmArgs)
-        }
-        val remoteArgs = listOf(
-                "org.testng.remote.RemoteTestNG",
-                "-serport", port.toString(),
-                "-version", testngVersion,
-                "-dontexit",
-                RemoteArgs.PROTOCOL,
-                "json")
-
-        val passedArgs = jvmArgs +  remoteArgs + calculatedArgs
-
-        Thread {
-            runCommand {
-                command = "java"
-                directory = File(project.directory)
-                args = passedArgs
-            }
-        }.start()
-
-//        Thread {
-//            val args2 = arrayOf("-serport", port.toString(), "-dontexit", RemoteArgs.PROTOCOL, "json",
-//                    "-version", "6.10",
-//                    "src/test/resources/testng.xml")
-//            RemoteTestNG.main(args2)
-//        }.start()
-    }
-}
-
-fun main(args: Array<String>) {
-    fun d(n: Int, color: String)
-            = AsciiArt.wrap(String.format("%4d", n), color)
-
-    if (!KobaltLogger.isQuiet) {
-        println("PASSED | FAILED | SKIPPED")
-        repeat(20) { i ->
-            print("\r  " + d(i, AsciiArt.GREEN) + " |   " + d(i * 2, AsciiArt.RED) + " | " + d(i, AsciiArt.YELLOW))
-            Thread.sleep(500)
-        }
-        println("")
-    }
 }

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

@@ -1,8 +1,10 @@
 package com.beust.kobalt.internal.build
 
+import com.beust.kobalt.misc.KFiles
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
+import java.nio.file.attribute.BasicFileAttributes
 /**
  * Sometimes, build files are moved to temporary files, so we give them a specific name for clarity.
  * @param path is the path where that file was moved, @param realPath is where the actual file is.
@@ -10,5 +12,23 @@ import java.nio.file.Path
 class BuildFile(val path: Path, val name: String, val realPath: Path = path) {
     fun exists() : Boolean = Files.exists(path)
 
+    val lastModified : Long
+        get() = Files.readAttributes(realPath, BasicFileAttributes::class.java).lastModifiedTime().toMillis()
+
     val directory : File get() = path.toFile().parentFile
+
+    /**
+     * @return the .kobalt directory where this build file will be compiled.
+     */
+    val dotKobaltDir: File get() = File(directory.parentFile.parentFile, KFiles.KOBALT_DOT_DIR).apply {
+        mkdirs()
+    }
+
+    /**
+     * @return the absolute directory of this project's location, assuming the build file is in
+     * $project/kobalt/src/Build.kt.
+     */
+    val absoluteDir : File? get() {
+        return path.parent?.parent?.parent?.toFile()
+    }
 }

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

@@ -1,61 +0,0 @@
-package com.beust.kobalt.internal.build
-
-import com.beust.kobalt.homeDir
-import java.io.File
-import java.nio.file.*
-import java.nio.file.attribute.BasicFileAttributes
-
-/**
- * The abstraction to represent a directory that contains source files. @param{root} is typically
- * the root of the project and build files are searched under root/kobalt/src/ *kt.
- */
-interface IBuildSources {
-    fun findSourceFiles() : List<File>
-    val root: File
-    fun exists(): Boolean
-}
-
-class SingleFileBuildSources(val file: File) : IBuildSources {
-    override fun exists() = file.exists()
-    override fun findSourceFiles() = listOf(file)
-    override val root: File = file.parentFile.parentFile.parentFile
-    override fun toString() : String = file.path
-}
-
-class BuildSources(val file: File = File("")) : IBuildSources {
-
-    override val root = file
-
-    override fun findSourceFiles() : List<File> {
-        return findBuildFiles(listOf(file))
-    }
-
-    override fun exists() = findSourceFiles().isNotEmpty()
-
-    override fun toString() = "{BuildSources " + findSourceFiles().joinToString(", ") + "}"
-
-    fun findBuildFiles(roots: List<File>) : List<File> {
-        val result = arrayListOf<File>()
-        roots.forEach { file ->
-            Files.walkFileTree(Paths.get(file.path), object : SimpleFileVisitor<Path>() {
-            override fun preVisitDirectory(dir: Path?, attrs: BasicFileAttributes?): FileVisitResult {
-                if (dir != null) {
-                    val path = dir.toFile()
-                    if (path.name == "src" && path.parentFile.name == "kobalt") {
-                            val sources = path.listFiles().filter { it.name.endsWith(".kt") }
-                        result.addAll(sources)
-                    }
-                }
-
-                return FileVisitResult.CONTINUE
-            }
-        })
-        }
-        return result
-    }
-}
-
-fun main(args: Array<String>) {
-    val sources = BuildSources(File(homeDir("kotlin/kobalt"))).findSourceFiles()
-    println("sources: " + sources)
-}

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

@@ -0,0 +1,14 @@
+package com.beust.kobalt.internal.remote
+
+import com.beust.kobalt.Constants
+import java.io.PrintWriter
+import java.net.Socket
+
+fun main(argv: Array<String>) {
+    Socket("localhost", 1234).use { socket ->
+        (PrintWriter(socket.outputStream, true)).use { out ->
+            out.println("""{ "name" : "getDependencies", "buildFile":
+            "/Users/beust/kotlin/kobalt/kobalt/src/${Constants.BUILD_FILE_NAME}"}""")
+        }
+    }
+}

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

@@ -9,7 +9,7 @@ import java.net.URLClassLoader
  * Will probably be made obsolete by making the wrapper a standalone module instead of
  * being inside Kobalt itself.
  */
-class ParentLastClassLoader(val classpath: List<URL>)
+public class ParentLastClassLoader(val classpath: List<URL>)
         : ClassLoader(Thread.currentThread().contextClassLoader) {
     private val childClassLoader: ChildURLClassLoader
 
@@ -22,7 +22,7 @@ class ParentLastClassLoader(val classpath: List<URL>)
      * This class makes it possible to call findClass on a classloader
      */
     private class FindClassClassLoader(parent: ClassLoader) : ClassLoader(parent) {
-        override fun findClass(name: String) = super.findClass(name)
+        override public fun findClass(name: String) = super.findClass(name)
     }
 
     /**
@@ -43,7 +43,7 @@ class ParentLastClassLoader(val classpath: List<URL>)
         }
     }
 
-    override @Synchronized fun loadClass(name: String, resolve: Boolean) : Class<*> {
+    override public @Synchronized fun loadClass(name: String, resolve: Boolean) : Class<*> {
         try {
             // first we try to find a class inside the child classloader
             return childClassLoader.findClass(name)

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

@@ -3,7 +3,7 @@ package com.beust.kobalt.maven
 import java.util.concurrent.Future
 import java.util.concurrent.TimeUnit
 
-class CompletedFuture<T>(val value: T) : Future<T> {
+public class CompletedFuture<T>(val value: T) : Future<T> {
     override fun cancel(mayInterruptIfRunning: Boolean) = true
     override fun get(): T = value
     override fun get(timeout: Long, unit: TimeUnit): T = value

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

@@ -2,33 +2,30 @@ package com.beust.kobalt.maven
 
 import com.beust.kobalt.KobaltException
 import com.beust.kobalt.api.*
-import com.beust.kobalt.maven.aether.Filters
-import com.beust.kobalt.maven.aether.KobaltMavenResolver
+import com.beust.kobalt.maven.aether.KobaltAether
 import com.beust.kobalt.maven.aether.Scope
 import com.beust.kobalt.maven.dependency.FileDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
 import com.google.common.collect.ArrayListMultimap
-import org.eclipse.aether.graph.DependencyFilter
-import org.eclipse.aether.util.filter.OrDependencyFilter
 import java.io.File
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class DependencyManager @Inject constructor(val executors: KobaltExecutors,
-        val resolver: KobaltMavenResolver) : IDependencyManager {
+class DependencyManager @Inject constructor(val executors: KobaltExecutors, val aether: KobaltAether)
+        : IDependencyManager {
 
     companion object {
-        fun create(id: String, optional: Boolean = false, projectDirectory: String? = null) =
-                Kobalt.INJECTOR.getInstance(DependencyManager::class.java).create(id, optional, projectDirectory)
+        fun create(id: String, projectDirectory: String? = null) =
+                Kobalt.INJECTOR.getInstance(DependencyManager::class.java).create(id, projectDirectory)
     }
 
     /**
      * Parse the id and return the correct IClasspathDependency
      */
-    override fun create(id: String, optional: Boolean, projectDirectory: String?) : IClasspathDependency {
+    override fun create(id: String, projectDirectory: String?) : IClasspathDependency {
         if (id.startsWith(FileDependency.PREFIX_FILE)) {
             val path = if (projectDirectory != null) {
                 val idPath = id.substring(FileDependency.PREFIX_FILE.length)
@@ -53,14 +50,19 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
         } else {
             // Convert to a Kobalt id first (so that if it doesn't have a version, it gets translated to
             // an Aether ranged id "[0,)")
-            return createMaven(MavenId.create(id).toId, optional)
+            return createMaven(MavenId.create(id).toId)
         }
     }
 
     /**
      * Create an IClasspathDependency from a Maven id.
      */
-    override fun createMaven(id: String, optional: Boolean) : IClasspathDependency = resolver.create(id, optional)
+    override fun createMaven(id: String) : IClasspathDependency=
+        if (KobaltAether.isRangeVersion(id)) {
+            Kobalt.INJECTOR.getInstance(KobaltAether::class.java).resolve(id).dependency
+        } else {
+            aether.create(id)
+        }
 
     /**
      * Create an IClasspathDependency from a path.
@@ -70,14 +72,12 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
     /**
      * @return the source dependencies for this project, including the contributors.
      */
-    override fun dependencies(project: Project, context: KobaltContext, scopes: List<Scope>)
-            = privateDependencies(project, context, listOf(Scope.COMPILE))
+    override fun dependencies(project: Project, context: KobaltContext) = dependencies(project, context, false)
 
     /**
      * @return the test dependencies for this project, including the contributors.
      */
-    override fun testDependencies(project: Project, context: KobaltContext)
-            = privateDependencies(project, context, listOf(Scope.COMPILE, Scope.TEST))
+    override fun testDependencies(project: Project, context: KobaltContext) = dependencies(project, context, true)
 
     /**
      * Transitive dependencies for the compilation of this project.
@@ -87,15 +87,12 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
 //            project.compileDependencies + project.compileRuntimeDependencies)
 
     /**
-     * @return the classpath for this project, including the IClasspathContributors. Excluded dependencies
-     * are removed from the result.
-     *
-     * @param{allDependencies} is typically either compileDependencies or testDependencies. If no dependencies
+     * @return the classpath for this project, including the IClasspathContributors.
+     * allDependencies is typically either compileDependencies or testDependencies. If no dependencies
      * are passed, they are calculated from the scope filters.
      */
     override fun calculateDependencies(project: Project?, context: KobaltContext,
-            dependencyFilter: DependencyFilter,
-            scopes: List<Scope>,
+            scopeFilters: Collection<Scope>,
             vararg passedDependencies: List<IClasspathDependency>): List<IClasspathDependency> {
         val result = arrayListOf<IClasspathDependency>()
 
@@ -103,13 +100,9 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
          * Extract the correct dependencies from the project based on the scope filters.
          */
         fun filtersToDependencies(project: Project, scopes: Collection<Scope>): List<IClasspathDependency> {
-            val result = arrayListOf<IClasspathDependency>().apply {
+            return arrayListOf<IClasspathDependency>().apply {
                 if (scopes.contains(Scope.COMPILE)) {
                     addAll(project.compileDependencies)
-                    addAll(project.compileProvidedDependencies)
-                }
-                if (scopes.contains(Scope.COMPILEONLY)) {
-                    addAll(project.compileOnlyDependencies)
                 }
                 if (scopes.contains(Scope.RUNTIME)) {
                     addAll(project.compileRuntimeDependencies)
@@ -118,50 +111,22 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
                     addAll(project.testDependencies)
                 }
             }
-            return result.filter { ! it.optional }
         }
 
         val allDependencies : Array<out List<IClasspathDependency>> =
             if (project == null || passedDependencies.any()) passedDependencies
-            else arrayOf(filtersToDependencies(project, scopes))
-
-        // Make sure that classes/ and test-classes/ are always at the top of this classpath,
-        // so that older versions of that project on the classpath don't shadow them
-        if (project != null && scopes.contains(Scope.TEST)) {
-            result.add(FileDependency(KFiles.makeOutputDir(project).path))
-            result.add(FileDependency(KFiles.makeOutputTestDir(project).path))
-        }
+            else arrayOf(filtersToDependencies(project, scopeFilters))
 
         allDependencies.forEach { dependencies ->
-            result.addAll(transitiveClosure(dependencies, dependencyFilter, project?.name))
+            result.addAll(transitiveClosure(dependencies, scopeFilters, project?.name))
         }
         result.addAll(runClasspathContributors(project, context))
-        result.addAll(dependentProjectDependencies(project, context, dependencyFilter, scopes))
-
-        /**
-         * Naïve implementation: just exclude all dependencies that start with one of the excluded dependencies.
-         * Should probably make exclusion more generic (full on string) or allow exclusion to be specified
-         * formally by groupId or artifactId.
-         */
-        fun isDependencyExcluded(dep: IClasspathDependency, excluded: List<IClasspathDependency>): Boolean {
-            excluded.any { excluded -> dep.id == excluded.id }.let { result ->
-                if (result) {
-                    context.logger.log(project?.name ?: "", 2, "  Excluding dependency $dep")
-                }
-                return result
-            }
-        }
+        result.addAll(dependentProjectDependencies(project, context, scopeFilters))
 
         // Dependencies get reordered by transitiveClosure() but since we just added a bunch of new ones,
         // we need to reorder them again in case we're adding dependencies that are already present
         // but with a different version
-        val shortResult =
-            if (project != null) {
-                result.filter { ! isDependencyExcluded(it, project.excludedDependencies) }
-            } else {
-                result
-            }.toHashSet()
-        val reordered = reorderDependencies(shortResult)
+        val reordered = reorderDependencies(result)
         return reordered
     }
 
@@ -179,14 +144,14 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
      * TODO: This should be private, everyone should be calling calculateDependencies().
      */
     fun transitiveClosure(dependencies : List<IClasspathDependency>,
-            filter: DependencyFilter = Filters.EXCLUDE_OPTIONAL_FILTER,
+            scopeFilter: Collection<Scope> = emptyList(),
             requiredBy: String? = null): List<IClasspathDependency> {
         val result = arrayListOf<IClasspathDependency>()
-        dependencies.forEach { dependency ->
-            result.add(dependency)
-            if (dependency.isMaven) {
-                val resolved = resolver.resolveToIds(dependency.id, null, filter).map { create(it) }
-                result.addAll(resolved)
+        dependencies.forEach {
+            result.add(it)
+            if (it.isMaven) {
+                val resolved = aether.resolveAll(it.id, null, scopeFilter).map { it.toString() }
+                result.addAll(resolved.map { create(it) })
             }
         }
         val reordered = reorderDependencies(result)
@@ -218,7 +183,7 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
      * their own dependencies
      */
     private fun dependentProjectDependencies(project: Project?, context: KobaltContext,
-            dependencyFilter: DependencyFilter, scopes: List<Scope>): List<IClasspathDependency> {
+            scopeFilters: Collection<Scope>): List<IClasspathDependency> {
         if (project == null) {
             return emptyList()
         } else {
@@ -232,57 +197,36 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
                 }
             }
 
-            val isTest = scopes.contains(Scope.TEST)
-
             project.dependsOn.forEach { p ->
                 maybeAddClassDir(KFiles.joinDir(p.directory, p.classesDir(context)))
-                if (isTest) maybeAddClassDir(KFiles.makeOutputTestDir(project).path)
-                val otherDependencies = calculateDependencies(p, context, dependencyFilter, scopes)
+                if (scopeFilters.contains(Scope.TEST)) maybeAddClassDir(KFiles.makeOutputTestDir(project).path)
+                val otherDependencies = calculateDependencies(p, context, scopeFilters)
                 result.addAll(otherDependencies)
-            }
 
-            if (isTest) {
-                project.testsDependOn.forEach { p ->
-                    val otherDependencies = calculateDependencies(p, context, dependencyFilter, scopes)
-                    result.addAll(otherDependencies)
-                }
             }
             return result
         }
     }
 
-    private fun privateDependencies(project: Project, context: KobaltContext, passedScopes: List<Scope>)
+    private fun dependencies(project: Project, context: KobaltContext, isTest: Boolean)
             : List<IClasspathDependency> {
-        val isTest = passedScopes.contains(Scope.TEST)
         val transitive = hashSetOf<IClasspathDependency>()
         with(project) {
-            val scopeFilters : ArrayList<Scope> = arrayListOf(Scope.COMPILE)
+            val scopeFilters = arrayListOf(Scope.COMPILE)
             context.variant.let { variant ->
-                val deps: ArrayList<ArrayList<IClasspathDependency>> =
-                    if (passedScopes.contains(Scope.COMPILE)) {
-                        arrayListOf(compileDependencies, compileProvidedDependencies,
-                                variant.buildType.compileDependencies,
-                                variant.buildType.compileProvidedDependencies,
-                                variant.productFlavor.compileDependencies,
-                                variant.productFlavor.compileProvidedDependencies)
-                    } else if (passedScopes.contains(Scope.RUNTIME)) {
-                        arrayListOf(compileRuntimeDependencies)
-                    } else {
-                        arrayListOf(arrayListOf<IClasspathDependency>())
-                    }
-                val runtimeDeps = arrayListOf(compileRuntimeDependencies)
+                val deps = arrayListOf(compileDependencies, compileProvidedDependencies,
+                        variant.buildType.compileDependencies,
+                        variant.buildType.compileProvidedDependencies,
+                        variant.productFlavor.compileDependencies,
+                        variant.productFlavor.compileProvidedDependencies
+                )
                 if (isTest) {
                     deps.add(testDependencies)
                     deps.add(testProvidedDependencies)
                     scopeFilters.add(Scope.TEST)
                 }
-                val filter =
-                    if (isTest) OrDependencyFilter(Filters.COMPILE_FILTER, Filters.TEST_FILTER)
-                    else Filters.COMPILE_FILTER
-                runtimeDeps.filter { it.any() }.forEach {
-                    transitive.addAll(calculateDependencies(project, context, filter,
-                            passedScopes, // scopes = Scope.toScopes(isTest),
-                            passedDependencies = it))
+                deps.filter { it.any() }.forEach {
+                    transitive.addAll(calculateDependencies(project, context, scopeFilters, it))
                 }
             }
         }

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

@@ -0,0 +1,181 @@
+package com.beust.kobalt.maven
+
+import com.beust.kobalt.KobaltException
+import com.beust.kobalt.api.*
+import com.beust.kobalt.internal.DynamicGraph
+import com.beust.kobalt.maven.aether.KobaltAether
+import com.beust.kobalt.maven.aether.Scope
+import com.beust.kobalt.maven.dependency.FileDependency
+import com.beust.kobalt.misc.KFiles
+import com.google.common.collect.ArrayListMultimap
+import com.google.inject.Inject
+import java.io.File
+import java.util.*
+
+class DependencyManager2 @Inject constructor(val aether: KobaltAether) {
+    /**
+     * Create an IClasspathDependency from a Maven id.
+     */
+    fun createMaven(id: String) : IClasspathDependency = aether.create(id)
+
+    /**
+     * Create an IClasspathDependency from a path.
+     */
+    fun createFile(path: String) : IClasspathDependency = FileDependency(path)
+
+    /**
+     * Parse the id and return the correct IClasspathDependency
+     */
+    fun create(id: String, projectDirectory: String?) : IClasspathDependency {
+        if (id.startsWith(FileDependency.PREFIX_FILE)) {
+            val path = if (projectDirectory != null) {
+                val idPath = id.substring(FileDependency.PREFIX_FILE.length)
+                if (! File(idPath).isAbsolute) {
+                    // If the project directory is relative, we might not be in the correct directory to locate
+                    // that file, so we'll use the absolute directory deduced from the build file path. Pick
+                    // the first one that produces an actual file
+                    val result = listOf(File(projectDirectory), Kobalt.context?.internalContext?.absoluteDir).map {
+                        File(it, idPath)
+                    }.firstOrNull {
+                        it.exists()
+                    }
+                    result ?: throw KobaltException("Couldn't find $id")
+
+                } else {
+                    File(idPath)
+                }
+            } else {
+                File(id.substring(FileDependency.PREFIX_FILE.length))
+            }
+            return createFile(path.path)
+        } else {
+            // Convert to a Kobalt id first (so that if it doesn't have a version, it gets translated to
+            // an Aether ranged id "[0,)")
+            return createMaven(MavenId.create(id).toId)
+        }
+    }
+
+    /**
+     * Resolve the dependencies for the give project based on the scope filters.
+     */
+    fun resolve(project: Project, context: KobaltContext, isTest: Boolean,
+            passedScopeFilters : List<Scope> = emptyList(),
+            passedIds: List<IClasspathDependency> = emptyList()): List<IClasspathDependency> {
+        val result = hashSetOf<IClasspathDependency>()
+        val nonMavenDependencies = hashSetOf<IClasspathDependency>()
+
+        val scopeFilters =
+            if (passedScopeFilters.isEmpty())
+                if (isTest) listOf(Scope.TEST)
+                else listOf(Scope.COMPILE)
+            else passedScopeFilters
+
+        val toDependencies = Scope.toDependencyLambda(scopeFilters)
+
+        // Make sure that classes/ and test-classes/ are always at the top of this classpath,
+        // so that older versions of that project on the classpath don't shadow them
+        if (isTest) {
+            result.add(FileDependency(KFiles.makeOutputDir(project).path))
+            result.add(FileDependency(KFiles.makeOutputTestDir(project).path))
+        }
+
+        // Passed and direct ids
+        val ids = hashSetOf<IClasspathDependency>().apply {
+            addAll(passedIds)
+            addAll(toDependencies(project))
+        }
+
+        // Contributed id's
+        val contributedIds = runClasspathContributors(project, context)
+        contributedIds.forEach {
+            if (it.isMaven) ids.add(it)
+            else nonMavenDependencies.add(it)
+        }
+
+        // Dependent project id's
+        val dependentIds = dependentProjectDependencies(project, context, toDependencies)
+        dependentIds.forEach {
+            if (it.isMaven) ids.add(it)
+            else nonMavenDependencies.add(it)
+        }
+
+        //
+        // Now we have all the id's, resolve them
+        //
+        var i = 0
+        ids.forEach {
+            val resolved = aether.resolveAll(it.id, filterScopes = scopeFilters)
+                .map { create(it.toString(), project.directory) }
+            i++
+            result.addAll(resolved)
+        }
+
+        result.addAll(nonMavenDependencies)
+
+        return reorderDependencies(result)
+    }
+
+    /**
+     * Reorder dependencies so that if an artifact appears several times, only the one with the higest version
+     * is included.
+     */
+    private fun reorderDependencies(dependencies: Collection<IClasspathDependency>): List<IClasspathDependency> {
+        val result = arrayListOf<IClasspathDependency>()
+        val map : ArrayListMultimap<String, IClasspathDependency> = ArrayListMultimap.create()
+        // The multilist maps each artifact to a list of all the versions found
+        // (e.g. {org.testng:testng -> (6.9.5, 6.9.4, 6.1.1)}), then we return just the first one
+        dependencies.forEach {
+            map.put(it.shortId, it)
+        }
+        for (k in map.keySet()) {
+            val l = map.get(k)
+            Collections.sort(l, Collections.reverseOrder())
+            result.add(l[0])
+        }
+        return result
+    }
+
+    private fun runClasspathContributors(project: Project?, context: KobaltContext) :
+            Set<IClasspathDependency> {
+        val result = hashSetOf<IClasspathDependency>()
+        context.pluginInfo.classpathContributors.forEach { it: IClasspathContributor ->
+            result.addAll(it.classpathEntriesFor(project, context))
+        }
+        return result
+    }
+
+    /**
+     * If this project depends on other projects, we need to include their jar file and also
+     * their own dependencies
+     */
+    private fun dependentProjectDependencies(project: Project?, context: KobaltContext,
+            toDependencies: (Project) -> List<IClasspathDependency>)
+            : List<IClasspathDependency> {
+        // Get the transitive closure of all the projects this project depends on
+        val transitiveProjects =
+            if (project == null) emptyList()
+            else DynamicGraph.transitiveClosure(project, Project::dependsOn)
+
+        val result = arrayListOf<IClasspathDependency>()
+
+        /**
+         * Add the class directories of projects depended upon
+         */
+        fun maybeAddClassDir(classDir: String) {
+            // A project is allowed not to have any kobaltBuild/classes or test-classes directory if it doesn't have
+            // any sources
+            if (File(classDir).exists()) {
+                result.add(FileDependency(classDir))
+            }
+        }
+        transitiveProjects.filter { it.name != project?.name }.forEach { p ->
+            maybeAddClassDir(KFiles.joinDir(p.directory, p.classesDir(context)))
+            maybeAddClassDir(KFiles.makeOutputTestDir(p).path)
+        }
+
+        // And add all the transitive projects
+        result.addAll(transitiveProjects.flatMap { toDependencies(it) })
+        return result
+    }
+
+}

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) {
+public 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/Kurl.kt

@@ -1,8 +1,9 @@
 package com.beust.kobalt.maven
 
 import com.beust.kobalt.HostConfig
-import com.beust.kobalt.maven.aether.KobaltMavenResolver
+import com.beust.kobalt.KobaltException
 import com.beust.kobalt.maven.dependency.FileDependency
+import com.beust.kobalt.misc.LocalProperties
 import java.io.*
 import java.net.HttpURLConnection
 import java.net.URL
@@ -20,7 +21,27 @@ class Kurl(val hostInfo: HostConfig) {
     }
 
     init {
-        KobaltMavenResolver.initAuthentication(hostInfo)
+        // See if the URL needs to be authenticated. Look in local.properties for keys
+        // of the format authUrl.<host>.user=xxx and authUrl.<host>.password=xxx
+        val properties = LocalProperties().localProperties
+        val host = java.net.URL(hostInfo.url).host
+        properties.entries.forEach {
+            val key = it.key.toString()
+            if (key == "$KEY.$host.$VALUE_USER") {
+                hostInfo.username = properties.getProperty(key)
+            } else if (key == "$KEY.$host.$VALUE_PASSWORD") {
+                hostInfo.password = properties.getProperty(key)
+            }
+        }
+        fun error(s1: String, s2: String) {
+            throw KobaltException("Found \"$s1\" but not \"$s2\" in local.properties for $KEY.$host",
+                    docUrl = "http://beust.com/kobalt/documentation/index.html#maven-repos-authenticated")
+        }
+        if (! hostInfo.username.isNullOrBlank() && hostInfo.password.isNullOrBlank()) {
+            error("username", "password")
+        } else if(hostInfo.username.isNullOrBlank() && ! hostInfo.password.isNullOrBlank()) {
+            error("password", "username")
+        }
     }
 
     override fun toString() = hostInfo.toString()