erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 00:38:11 -07:00
Code Releases Activity

Merge branch 'master' of https://github.com/cbeust/kobalt

Browse source
This commit is contained in:
Dmitry Zhuravlev 2016-06-14 15:57:27 +03:00
commit 4b17dade8e
52 changed files with 1022 additions and 607 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -10,4 +10,4 @@ jdk:
install: true install: true
script: ./kobaltw assemble test --log 1 script: ./build-travis.sh

4
build-travis.sh Executable file
View file

@ -0,0 +1,4 @@
java -Xmx2048m -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $* assemble
java -Xmx2048m -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $* test

2
dist/kobaltw.bat vendored
View file

@ -1,2 +1,2 @@
@echo off @echo off
java -jar "%~dp0/kobalt/wrapper/kobalt-wrapper.jar" %* java -jar "%~dp0/../kobalt/wrapper/kobalt-wrapper.jar" %*

85
kobalt.iml
View file

@ -3,9 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <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/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/test/kotlin" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
@ -16,7 +14,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library name="Kobalt: org.testng:testng:jar:6.9.10"> <library name="Kobalt: org.testng:testng:jar:6.9.10">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/testng/testng/6.9.10/testng-6.9.10.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/testng/testng/6.9.10/testng-6.9.10.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -25,7 +23,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library name="Kobalt: org.beanshell:bsh:jar:2.0b4"> <library name="Kobalt: org.beanshell:bsh:jar:2.0b4">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -34,7 +32,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library name="Kobalt: com.beust:jcommander:jar:1.48"> <library name="Kobalt: com.beust:jcommander:jar:1.48">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/beust/jcommander/1.48/jcommander-1.48.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -43,7 +41,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library name="Kobalt: org.assertj:assertj-core:jar:3.4.1"> <library name="Kobalt: org.assertj:assertj-core:jar:3.4.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/assertj/assertj-core/3.4.1/assertj-core-3.4.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/assertj/assertj-core/3.4.1/assertj-core-3.4.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -52,7 +50,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.google.inject:guice:jar:4.0"> <library name="Kobalt: com.google.inject:guice:jar:4.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/google/inject/guice/4.0/guice-4.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/guice/4.0/guice-4.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -61,7 +59,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: biz.aQute.bnd:bndlib:jar:2.4.0"> <library name="Kobalt: biz.aQute.bnd:bndlib:jar:2.4.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/biz/aQute/bnd/bndlib/2.4.0/bndlib-2.4.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/biz/aQute/bnd/bndlib/2.4.0/bndlib-2.4.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -70,7 +68,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.google.guava:guava:jar:16.0.1"> <library name="Kobalt: com.google.guava:guava:jar:16.0.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/google/guava/guava/16.0.1/guava-16.0.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/16.0.1/guava-16.0.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -79,16 +77,16 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.squareup.retrofit2:converter-gson:jar:2.0.0"> <library name="Kobalt: com.squareup.retrofit2:converter-gson:jar:2.0.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/squareup/retrofit2/converter-gson/2.0.0/converter-gson-2.0.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/converter-gson/2.0.0/converter-gson-2.0.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.jetbrains.kotlin:kotlin-compiler-embeddable:jar:1.0.0"> <library name="Kobalt: org.jetbrains.kotlin:kotlin-compiler-embeddable:jar:1.0.2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0/kotlin-compiler-embeddable-1.0.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.2/kotlin-compiler-embeddable-1.0.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -97,7 +95,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty:jetty-xml:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty:jetty-xml:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/jetty-xml/9.3.6.v20151106/jetty-xml-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/jetty-xml/9.3.6.v20151106/jetty-xml-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -106,7 +104,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.google.code.findbugs:jsr305:jar:3.0.1"> <library name="Kobalt: com.google.code.findbugs:jsr305:jar:3.0.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -115,7 +113,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.maven:maven-model:jar:3.3.9"> <library name="Kobalt: org.apache.maven:maven-model:jar:3.3.9">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -124,7 +122,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: javax.inject:javax.inject:jar:1"> <library name="Kobalt: javax.inject:javax.inject:jar:1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/javax/inject/javax.inject/1/javax.inject-1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -133,7 +131,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty.websocket:websocket-server:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty.websocket:websocket-server:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/websocket/websocket-server/9.3.6.v20151106/websocket-server-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/websocket/websocket-server/9.3.6.v20151106/websocket-server-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -142,7 +140,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty.websocket:websocket-client:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty.websocket:websocket-client:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/websocket/websocket-client/9.3.6.v20151106/websocket-client-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/websocket/websocket-client/9.3.6.v20151106/websocket-client-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -151,7 +149,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.squareup.okhttp3:okhttp:jar:3.2.0"> <library name="Kobalt: com.squareup.okhttp3:okhttp:jar:3.2.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -160,7 +158,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty:jetty-servlet:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty:jetty-servlet:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/jetty-servlet/9.3.6.v20151106/jetty-servlet-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/jetty-servlet/9.3.6.v20151106/jetty-servlet-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -169,7 +167,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty:jetty-util:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty:jetty-util:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/jetty-util/9.3.6.v20151106/jetty-util-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/jetty-util/9.3.6.v20151106/jetty-util-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -178,7 +176,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.squareup.okhttp3:logging-interceptor:jar:3.2.0"> <library name="Kobalt: com.squareup.okhttp3:logging-interceptor:jar:3.2.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/squareup/okhttp3/logging-interceptor/3.2.0/logging-interceptor-3.2.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/logging-interceptor/3.2.0/logging-interceptor-3.2.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -187,7 +185,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty:jetty-http:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty:jetty-http:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/jetty-http/9.3.6.v20151106/jetty-http-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/jetty-http/9.3.6.v20151106/jetty-http-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -196,7 +194,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.beust:jcommander:jar:1.48"> <library name="Kobalt: com.beust:jcommander:jar:1.48">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/beust/jcommander/1.48/jcommander-1.48.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -205,7 +203,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.squareup.retrofit2:retrofit:jar:2.0.0"> <library name="Kobalt: com.squareup.retrofit2:retrofit:jar:2.0.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/squareup/retrofit2/retrofit/2.0.0/retrofit-2.0.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/retrofit/2.0.0/retrofit-2.0.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -214,7 +212,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty.websocket:websocket-common:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty.websocket:websocket-common:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/websocket/websocket-common/9.3.6.v20151106/websocket-common-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/websocket/websocket-common/9.3.6.v20151106/websocket-common-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -223,7 +221,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty.websocket:websocket-api:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty.websocket:websocket-api:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/websocket/websocket-api/9.3.6.v20151106/websocket-api-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/websocket/websocket-api/9.3.6.v20151106/websocket-api-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -232,7 +230,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty:jetty-security:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty:jetty-security:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/jetty-security/9.3.6.v20151106/jetty-security-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/jetty-security/9.3.6.v20151106/jetty-security-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -241,7 +239,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.codehaus.plexus:plexus-utils:jar:3.0.22"> <library name="Kobalt: org.codehaus.plexus:plexus-utils:jar:3.0.22">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -250,7 +248,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.slf4j:slf4j-api:jar:1.7.13"> <library name="Kobalt: org.slf4j:slf4j-api:jar:1.7.13">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -259,7 +257,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.commons:commons-lang3:jar:3.4"> <library name="Kobalt: org.apache.commons:commons-lang3:jar:3.4">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -268,7 +266,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.google.code.gson:gson:jar:2.6.2"> <library name="Kobalt: com.google.code.gson:gson:jar:2.6.2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -277,7 +275,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty.websocket:websocket-servlet:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty.websocket:websocket-servlet:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/websocket/websocket-servlet/9.3.6.v20151106/websocket-servlet-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/websocket/websocket-servlet/9.3.6.v20151106/websocket-servlet-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -286,7 +284,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.osgi:org.osgi.core:jar:4.3.1"> <library name="Kobalt: org.osgi:org.osgi.core:jar:4.3.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -295,7 +293,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty:jetty-webapp:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty:jetty-webapp:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/jetty-webapp/9.3.6.v20151106/jetty-webapp-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/jetty-webapp/9.3.6.v20151106/jetty-webapp-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -304,7 +302,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.github.spullara.mustache.java:compiler:jar:0.9.1"> <library name="Kobalt: com.github.spullara.mustache.java:compiler:jar:0.9.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/github/spullara/mustache/java/compiler/0.9.1/compiler-0.9.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/github/spullara/mustache/java/compiler/0.9.1/compiler-0.9.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -313,7 +311,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.sparkjava:spark-core:jar:2.5"> <library name="Kobalt: com.sparkjava:spark-core:jar:2.5">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/sparkjava/spark-core/2.5/spark-core-2.5.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/sparkjava/spark-core/2.5/spark-core-2.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -322,7 +320,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty:jetty-io:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty:jetty-io:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/jetty-io/9.3.6.v20151106/jetty-io-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/jetty-io/9.3.6.v20151106/jetty-io-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -331,7 +329,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.squareup.okio:okio:jar:1.6.0"> <library name="Kobalt: com.squareup.okio:okio:jar:1.6.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -340,7 +338,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: javax.servlet:javax.servlet-api:jar:3.1.0"> <library name="Kobalt: javax.servlet:javax.servlet-api:jar:3.1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -349,7 +347,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.jetty:jetty-server:jar:9.3.6.v20151106"> <library name="Kobalt: org.eclipse.jetty:jetty-server:jar:9.3.6.v20151106">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/jetty/jetty-server/9.3.6.v20151106/jetty-server-9.3.6.v20151106.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/jetty/jetty-server/9.3.6.v20151106/jetty-server-9.3.6.v20151106.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -358,7 +356,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.google.inject.extensions:guice-assistedinject:jar:4.0"> <library name="Kobalt: com.google.inject.extensions:guice-assistedinject:jar:4.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -367,12 +365,13 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: aopalliance:aopalliance:jar:1.0"> <library name="Kobalt: aopalliance:aopalliance:jar:1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module" module-name="kobalt-wrapper" /> <orderEntry type="module" module-name="kobalt-wrapper" />
<orderEntry type="library" name="kobalt.jar" level="project" />
</component> </component>
</module> </module>

19
kobalt/src/Build.kt
View file

@ -21,13 +21,11 @@ import java.nio.file.StandardCopyOption
object Versions { object Versions {
val okhttp = "3.2.0" val okhttp = "3.2.0"
val okio = "1.6.0" val okio = "1.6.0"
val retrofit = "2.0.0" val retrofit = "2.0.2"
val gson = "2.6.2" val gson = "2.6.2"
val aether = "1.1.0" val aether = "1.1.0"
val sonatypeAether = "1.13.1" val sonatypeAether = "1.13.1"
val maven = "3.3.9" val maven = "3.3.9"
val jersey = "2.22.2"
val jetty = "8.1.19.v20160209" // "9.3.9.M1"
} }
val wrapper = project { val wrapper = project {
@ -69,16 +67,16 @@ val kobaltPluginApi = project {
developerConnection = "git@github.com:cbeust/kobalt.git") developerConnection = "git@github.com:cbeust/kobalt.git")
dependencies { dependencies {
compile("org.jetbrains.kotlinx:kotlinx.dom:0.0.10", compile(
"com.google.inject:guice:4.0", "com.google.inject:guice:4.0",
"com.google.inject.extensions:guice-assistedinject:4.0", "com.google.inject.extensions:guice-assistedinject:4.0",
"javax.inject:javax.inject:1", "javax.inject:javax.inject:1",
"com.google.guava:guava:19.0-rc2", "com.google.guava:guava:19.0",
"org.apache.maven:maven-model:${Versions.maven}", "org.apache.maven:maven-model:${Versions.maven}",
"io.reactivex:rxjava:1.0.16", "io.reactivex:rxjava:1.1.5",
"com.google.code.gson:gson:${Versions.gson}",
"com.squareup.okio:okio:${Versions.okio}", "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:retrofit:${Versions.retrofit}",
"com.squareup.retrofit2:converter-gson:${Versions.retrofit}", "com.squareup.retrofit2:converter-gson:${Versions.retrofit}",
"com.beust:jcommander:1.48", "com.beust:jcommander:1.48",
@ -126,7 +124,7 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
dependencies { dependencies {
// Used by the plugins // Used by the plugins
compile("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.0.0") compile("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.0.2")
// Used by the main app // Used by the main app
compile("com.github.spullara.mustache.java:compiler:0.9.1", compile("com.github.spullara.mustache.java:compiler:0.9.1",
@ -137,7 +135,6 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
"org.apache.maven:maven-model:${Versions.maven}", "org.apache.maven:maven-model:${Versions.maven}",
"com.google.code.findbugs:jsr305:3.0.1", "com.google.code.findbugs:jsr305:3.0.1",
"com.google.code.gson:gson:${Versions.gson}", "com.google.code.gson:gson:${Versions.gson}",
"com.squareup.okhttp3:okhttp:${Versions.okhttp}",
"com.squareup.retrofit2:retrofit:${Versions.retrofit}", "com.squareup.retrofit2:retrofit:${Versions.retrofit}",
"com.squareup.retrofit2:converter-gson:${Versions.retrofit}", "com.squareup.retrofit2:converter-gson:${Versions.retrofit}",
"org.codehaus.plexus:plexus-utils:3.0.22", "org.codehaus.plexus:plexus-utils:3.0.22",
@ -159,7 +156,7 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
} }
dependenciesTest { dependenciesTest {
compile("org.testng:testng:6.9.10", compile("org.testng:testng:6.9.11",
"org.assertj:assertj-core:3.4.1") "org.assertj:assertj-core:3.4.1")
} }

2
kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1 @@
kobalt.version=0.789 kobalt.version=0.814

2
kobaltw.bat
View file

@ -1,2 +1,2 @@
@echo off @echo off
java -jar "%~dp0/../kobalt/wrapper/kobalt-wrapper.jar" %* java -jar "%~dp0/kobalt/wrapper/kobalt-wrapper.jar" %*

101
modules/kobalt-plugin-api/kobalt-plugin-api.iml
View file

@ -12,9 +12,9 @@
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.jetbrains.kotlin:kotlin-runtime:jar:1.0.0"> <library name="Kobalt: org.jetbrains.kotlin:kotlin-runtime:jar:1.0.2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/jetbrains/kotlin/kotlin-runtime/1.0.0/kotlin-runtime-1.0.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/jetbrains/kotlin/kotlin-runtime/1.0.2/kotlin-runtime-1.0.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -23,7 +23,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.aether:aether-api:jar:1.1.0"> <library name="Kobalt: org.eclipse.aether:aether-api:jar:1.1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/aether/aether-api/1.1.0/aether-api-1.1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/aether/aether-api/1.1.0/aether-api-1.1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -32,7 +32,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.google.inject:guice:jar:4.0"> <library name="Kobalt: com.google.inject:guice:jar:4.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/google/inject/guice/4.0/guice-4.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/guice/4.0/guice-4.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -41,7 +41,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-6"> <library name="Kobalt: org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-6">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -50,7 +50,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.sonatype.aether:aether-spi:jar:1.13.1"> <library name="Kobalt: org.sonatype.aether:aether-spi:jar:1.13.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -59,7 +59,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.codehaus.plexus:plexus-component-annotations:jar:1.6"> <library name="Kobalt: org.codehaus.plexus:plexus-component-annotations:jar:1.6">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -68,7 +68,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.google.guava:guava:jar:19.0-rc2"> <library name="Kobalt: com.google.guava:guava:jar:19.0-rc2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/google/guava/guava/19.0-rc2/guava-19.0-rc2.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/19.0-rc2/guava-19.0-rc2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -77,7 +77,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.squareup.retrofit2:converter-gson:jar:2.0.0"> <library name="Kobalt: com.squareup.retrofit2:converter-gson:jar:2.0.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/squareup/retrofit2/converter-gson/2.0.0/converter-gson-2.0.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/converter-gson/2.0.0/converter-gson-2.0.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -86,7 +86,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.maven:maven-aether-provider:jar:3.3.9"> <library name="Kobalt: org.apache.maven:maven-aether-provider:jar:3.3.9">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -95,7 +95,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.sonatype.sisu:sisu-inject-bean:jar:2.2.3"> <library name="Kobalt: org.sonatype.sisu:sisu-inject-bean:jar:2.2.3">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/sonatype/sisu/sisu-inject-bean/2.2.3/sisu-inject-bean-2.2.3.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/sonatype/sisu/sisu-inject-bean/2.2.3/sisu-inject-bean-2.2.3.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -104,7 +104,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.slf4j:jcl-over-slf4j:jar:1.6.2"> <library name="Kobalt: org.slf4j:jcl-over-slf4j:jar:1.6.2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/slf4j/jcl-over-slf4j/1.6.2/jcl-over-slf4j-1.6.2.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/slf4j/jcl-over-slf4j/1.6.2/jcl-over-slf4j-1.6.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -113,7 +113,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: io.reactivex:rxjava:jar:1.0.16"> <library name="Kobalt: io.reactivex:rxjava:jar:1.0.16">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/io/reactivex/rxjava/1.0.16/rxjava-1.0.16.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/io/reactivex/rxjava/1.0.16/rxjava-1.0.16.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -122,7 +122,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.sonatype.aether:aether-api:jar:1.13.1"> <library name="Kobalt: org.sonatype.aether:aether-api:jar:1.13.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -131,7 +131,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.maven:maven-model-builder:jar:3.3.9"> <library name="Kobalt: org.apache.maven:maven-model-builder:jar:3.3.9">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -140,7 +140,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.maven:maven-model:jar:3.3.9"> <library name="Kobalt: org.apache.maven:maven-model:jar:3.3.9">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -149,7 +149,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.aether:aether-spi:jar:1.1.0"> <library name="Kobalt: org.eclipse.aether:aether-spi:jar:1.1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/aether/aether-spi/1.1.0/aether-spi-1.1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/aether/aether-spi/1.1.0/aether-spi-1.1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -158,7 +158,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: javax.inject:javax.inject:jar:1"> <library name="Kobalt: javax.inject:javax.inject:jar:1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/javax/inject/javax.inject/1/javax.inject-1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -167,7 +167,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.codehaus.plexus:plexus-classworlds:jar:2.4"> <library name="Kobalt: org.codehaus.plexus:plexus-classworlds:jar:2.4">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -176,7 +176,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.squareup.okhttp3:okhttp:jar:3.2.0"> <library name="Kobalt: com.squareup.okhttp3:okhttp:jar:3.2.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -185,7 +185,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.maven:maven-repository-metadata:jar:3.3.9"> <library name="Kobalt: org.apache.maven:maven-repository-metadata:jar:3.3.9">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -194,7 +194,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.sonatype.aether:aether-connector-wagon:jar:1.13.1"> <library name="Kobalt: org.sonatype.aether:aether-connector-wagon:jar:1.13.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/sonatype/aether/aether-connector-wagon/1.13.1/aether-connector-wagon-1.13.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/sonatype/aether/aether-connector-wagon/1.13.1/aether-connector-wagon-1.13.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -203,7 +203,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.slf4j:slf4j-nop:jar:1.6.0"> <library name="Kobalt: org.slf4j:slf4j-nop:jar:1.6.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/slf4j/slf4j-nop/1.6.0/slf4j-nop-1.6.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/slf4j/slf4j-nop/1.6.0/slf4j-nop-1.6.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -212,7 +212,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.aether:aether-transport-http:jar:1.1.0"> <library name="Kobalt: org.eclipse.aether:aether-transport-http:jar:1.1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/aether/aether-transport-http/1.1.0/aether-transport-http-1.1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/aether/aether-transport-http/1.1.0/aether-transport-http-1.1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -221,7 +221,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.httpcomponents:httpclient:jar:4.3.5"> <library name="Kobalt: org.apache.httpcomponents:httpclient:jar:4.3.5">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/httpcomponents/httpclient/4.3.5/httpclient-4.3.5.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/httpcomponents/httpclient/4.3.5/httpclient-4.3.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -230,7 +230,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.aether:aether-transport-file:jar:1.1.0"> <library name="Kobalt: org.eclipse.aether:aether-transport-file:jar:1.1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/aether/aether-transport-file/1.1.0/aether-transport-file-1.1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/aether/aether-transport-file/1.1.0/aether-transport-file-1.1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -239,7 +239,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.sonatype.aether:aether-util:jar:1.13.1"> <library name="Kobalt: org.sonatype.aether:aether-util:jar:1.13.1">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -248,7 +248,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.maven:maven-artifact:jar:3.3.9"> <library name="Kobalt: org.apache.maven:maven-artifact:jar:3.3.9">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -257,7 +257,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.sonatype.sisu:sisu-guice:jar:no_aop:3.0.3"> <library name="Kobalt: org.sonatype.sisu:sisu-guice:jar:no_aop:3.0.3">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/sonatype/sisu/sisu-guice/3.0.3/sisu-guice-3.0.3-no_aop.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/sonatype/sisu/sisu-guice/3.0.3/sisu-guice-3.0.3-no_aop.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -266,7 +266,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.beust:jcommander:jar:1.48"> <library name="Kobalt: com.beust:jcommander:jar:1.48">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/beust/jcommander/1.48/jcommander-1.48.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -275,7 +275,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.maven:maven-builder-support:jar:3.3.9"> <library name="Kobalt: org.apache.maven:maven-builder-support:jar:3.3.9">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -284,7 +284,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.squareup.retrofit2:retrofit:jar:2.0.0"> <library name="Kobalt: com.squareup.retrofit2:retrofit:jar:2.0.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/squareup/retrofit2/retrofit/2.0.0/retrofit-2.0.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/retrofit/2.0.0/retrofit-2.0.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -293,7 +293,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.codehaus.plexus:plexus-utils:jar:3.0.22"> <library name="Kobalt: org.codehaus.plexus:plexus-utils:jar:3.0.22">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -302,7 +302,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.httpcomponents:httpcore:jar:4.3.2"> <library name="Kobalt: org.apache.httpcomponents:httpcore:jar:4.3.2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -311,7 +311,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.apache.commons:commons-lang3:jar:3.4"> <library name="Kobalt: org.apache.commons:commons-lang3:jar:3.4">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -320,7 +320,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.slf4j:slf4j-api:jar:1.6.2"> <library name="Kobalt: org.slf4j:slf4j-api:jar:1.6.2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/slf4j/slf4j-api/1.6.2/slf4j-api-1.6.2.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/slf4j/slf4j-api/1.6.2/slf4j-api-1.6.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -329,7 +329,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.google.code.gson:gson:jar:2.6.2"> <library name="Kobalt: com.google.code.gson:gson:jar:2.6.2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -338,7 +338,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.aether:aether-connector-basic:jar:1.1.0"> <library name="Kobalt: org.eclipse.aether:aether-connector-basic:jar:1.1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/aether/aether-connector-basic/1.1.0/aether-connector-basic-1.1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/aether/aether-connector-basic/1.1.0/aether-connector-basic-1.1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -347,7 +347,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.aether:aether-util:jar:1.1.0"> <library name="Kobalt: org.eclipse.aether:aether-util:jar:1.1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/aether/aether-util/1.1.0/aether-util-1.1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/aether/aether-util/1.1.0/aether-util-1.1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -356,7 +356,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.codehaus.plexus:plexus-interpolation:jar:1.21"> <library name="Kobalt: org.codehaus.plexus:plexus-interpolation:jar:1.21">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -365,7 +365,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.eclipse.aether:aether-impl:jar:1.1.0"> <library name="Kobalt: org.eclipse.aether:aether-impl:jar:1.1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/eclipse/aether/aether-impl/1.1.0/aether-impl-1.1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/eclipse/aether/aether-impl/1.1.0/aether-impl-1.1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -374,7 +374,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.squareup.okio:okio:jar:1.6.0"> <library name="Kobalt: com.squareup.okio:okio:jar:1.6.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -383,16 +383,16 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.sonatype.sisu:sisu-inject-plexus:jar:2.2.3"> <library name="Kobalt: org.sonatype.sisu:sisu-inject-plexus:jar:2.2.3">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/sonatype/sisu/sisu-inject-plexus/2.2.3/sisu-inject-plexus-2.2.3.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/sonatype/sisu/sisu-inject-plexus/2.2.3/sisu-inject-plexus-2.2.3.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.jetbrains.kotlin:kotlin-stdlib:jar:1.0.0"> <library name="Kobalt: org.jetbrains.kotlin:kotlin-stdlib:jar:1.0.2">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/jetbrains/kotlin/kotlin-stdlib/1.0.0/kotlin-stdlib-1.0.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/jetbrains/kotlin/kotlin-stdlib/1.0.2/kotlin-stdlib-1.0.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -401,7 +401,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: commons-logging:commons-logging:jar:1.1.3"> <library name="Kobalt: commons-logging:commons-logging:jar:1.1.3">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -410,7 +410,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: org.jetbrains.kotlinx:kotlinx.dom:jar:0.0.10"> <library name="Kobalt: org.jetbrains.kotlinx:kotlinx.dom:jar:0.0.10">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/org/jetbrains/kotlinx/kotlinx.dom/0.0.10/kotlinx.dom-0.0.10.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/org/jetbrains/kotlinx/kotlinx.dom/0.0.10/kotlinx.dom-0.0.10.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -419,7 +419,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.google.inject.extensions:guice-assistedinject:jar:4.0"> <library name="Kobalt: com.google.inject.extensions:guice-assistedinject:jar:4.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -428,7 +428,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: aopalliance:aopalliance:jar:1.0"> <library name="Kobalt: aopalliance:aopalliance:jar:1.0">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -437,11 +437,12 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: commons-codec:commons-codec:jar:1.6"> <library name="Kobalt: commons-codec:commons-codec:jar:1.6">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.m2/commons-codec/commons-codec/1.6/commons-codec-1.6.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/repository/commons-codec/commons-codec/1.6/commons-codec-1.6.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" name="kobalt.jar" level="project" />
</component> </component>
</module> </module>

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

@ -45,6 +45,10 @@ class Args {
@Parameter(names = arrayOf("--log"), description = "Define the log level (1-3)") @Parameter(names = arrayOf("--log"), description = "Define the log level (1-3)")
var log: Int = 1 var log: Int = 1
@Parameter(names = arrayOf("--forceIncremental"),
description = "Force the build to be incremental even if the build file was modified")
var forceIncremental: Boolean = false
@Parameter(names = arrayOf("--noIncremental"), description = "Turn off incremental builds") @Parameter(names = arrayOf("--noIncremental"), description = "Turn off incremental builds")
var noIncremental: Boolean = false var noIncremental: Boolean = false

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

@ -2,10 +2,8 @@ package com.beust.kobalt
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.api.ProjectDescription
import com.beust.kobalt.archive.Archives import com.beust.kobalt.archive.Archives
import com.beust.kobalt.archive.Jar import com.beust.kobalt.archive.Jar
import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.misc.* import com.beust.kobalt.misc.*
import com.google.inject.Inject import com.google.inject.Inject
@ -93,26 +91,23 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
// If fatJar is true, add all the transitive dependencies as well: compile, runtime and dependent projects // If fatJar is true, add all the transitive dependencies as well: compile, runtime and dependent projects
// //
if (jar.fatJar) { if (jar.fatJar) {
log(2, "Creating fat jar") log(2, "Finding included files for fat jar")
val seen = hashSetOf<String>() val seen = hashSetOf<String>()
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val dependentProjects = project.projectProperties.get(JvmCompilerPlugin.DEPENDENT_PROJECTS)
as List<ProjectDescription>
val allDependencies = project.compileDependencies + project.compileRuntimeDependencies + val allDependencies = project.compileDependencies + project.compileRuntimeDependencies +
context.variant.buildType.compileDependencies + context.variant.buildType.compileDependencies +
context.variant.buildType.compileRuntimeDependencies + context.variant.buildType.compileRuntimeDependencies +
context.variant.productFlavor.compileDependencies + context.variant.productFlavor.compileDependencies +
context.variant.productFlavor.compileRuntimeDependencies context.variant.productFlavor.compileRuntimeDependencies
val transitiveDependencies = dependencyManager.calculateDependencies(project, context, dependentProjects, val transitiveDependencies = dependencyManager.calculateDependencies(project, context, allDependencies)
allDependencies)
transitiveDependencies.map { transitiveDependencies.map {
it.jarFile.get() it.jarFile.get()
}.forEach { file : File -> }.forEach { file : File ->
if (! seen.contains(file.path)) { if (! seen.contains(file.path)) {
seen.add(file.path) seen.add(file.path)
if (! KFiles.Companion.isExcluded(file, jar.excludes)) { if (! KFiles.Companion.isExcluded(file, jar.excludes)) {
result.add(IncludedFile(specs = arrayListOf(IFileSpec.FileSpec(file.path)), result.add(IncludedFile(specs = arrayListOf(IFileSpec.FileSpec(file.absolutePath)),
expandJarFiles = true)) expandJarFiles = true))
} }
} }

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

@ -12,6 +12,7 @@ import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.google.inject.Provider import com.google.inject.Provider
import java.io.File
import java.lang.reflect.Method import java.lang.reflect.Method
import java.lang.reflect.Modifier import java.lang.reflect.Modifier
import java.net.URLClassLoader import java.net.URLClassLoader
@ -78,7 +79,9 @@ class Plugins @Inject constructor (val taskManagerProvider : Provider<TaskManage
// Collect all the tasks from the task contributors // Collect all the tasks from the task contributors
context.pluginInfo.taskContributors.forEach { context.pluginInfo.taskContributors.forEach {
taskManager.dynamicTasks.addAll(it.tasksFor(context)) projects.forEach { project ->
taskManager.dynamicTasks.addAll(it.tasksFor(project, context))
}
} }
// Now that we have collected all static and dynamic tasks, turn them all into plug-in tasks // Now that we have collected all static and dynamic tasks, turn them all into plug-in tasks
@ -160,9 +163,17 @@ class Plugins @Inject constructor (val taskManagerProvider : Provider<TaskManage
// //
// Open the jar, parse its kobalt-plugin.xml and add the resulting PluginInfo to pluginInfo // Open the jar, parse its kobalt-plugin.xml and add the resulting PluginInfo to pluginInfo
// //
val pluginXml = JarUtils.extractTextFile(JarFile(it.jarFile.get()), PluginInfo.PLUGIN_XML) val file = it.jarFile.get()
val pluginXml = if (file.isDirectory) {
// The plug-in can point to a directory (e.g. plugin("classes")), in which case we just
// read kobalt-plugin.xml directly
File(file, PluginInfo.PLUGIN_XML).readText()
} else {
// The plug-in is pointing to a jar file, read kobalt-plugin.xml from it
JarUtils.extractTextFile(JarFile(file), PluginInfo.PLUGIN_XML)
}
if (pluginXml != null) { if (pluginXml != null) {
val pluginClassLoader = URLClassLoader(arrayOf(it.jarFile.get().toURI().toURL())) val pluginClassLoader = URLClassLoader(arrayOf(file.toURI().toURL()))
val thisPluginInfo = PluginInfo.readPluginXml(pluginXml, pluginClassLoader, scriptClassLoader) val thisPluginInfo = PluginInfo.readPluginXml(pluginXml, pluginClassLoader, scriptClassLoader)
pluginInfo.addPluginInfo(thisPluginInfo) pluginInfo.addPluginInfo(thisPluginInfo)
thisPluginInfo.plugins.forEach { thisPluginInfo.plugins.forEach {

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IBuildDirectoryInterceptor.kt
View file

@ -3,7 +3,7 @@ package com.beust.kobalt.api
/** /**
* Plug-ins can alter the build directory by implementing this interface. * Plug-ins can alter the build directory by implementing this interface.
*/ */
interface IBuildDirectoryIncerceptor : IInterceptor { interface IBuildDirectoryInterceptor : IInterceptor {
fun intercept(project: Project, context: KobaltContext, buildDirectory: String) : String fun intercept(project: Project, context: KobaltContext, buildDirectory: String) : String
} }

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

@ -34,6 +34,5 @@ interface IDependencyManager {
* allDependencies is typically either compileDependencies or testDependencies * allDependencies is typically either compileDependencies or testDependencies
*/ */
fun calculateDependencies(project: Project?, context: KobaltContext, fun calculateDependencies(project: Project?, context: KobaltContext,
dependentProjects: List<ProjectDescription> = emptyList(),
vararg allDependencies: List<IClasspathDependency>): List<IClasspathDependency> vararg allDependencies: List<IClasspathDependency>): List<IClasspathDependency>
} }

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ISourceDirectoriesInterceptor.kt
View file

@ -5,7 +5,7 @@ import java.io.File
/** /**
* Plug-ins can alter the source directories by implementing this interface. * Plug-ins can alter the source directories by implementing this interface.
*/ */
interface ISourceDirectoryIncerceptor : IInterceptor { interface ISourceDirectoryInterceptor : IInterceptor {
fun intercept(project: Project, context: KobaltContext, sourceDirectories: List<File>) : List<File> fun intercept(project: Project, context: KobaltContext, sourceDirectories: List<File>) : List<File>
} }

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

@ -8,7 +8,7 @@ import com.beust.kobalt.internal.TaskResult2
* to implement this interface. * to implement this interface.
*/ */
interface ITaskContributor : IContributor { interface ITaskContributor : IContributor {
fun tasksFor(context: KobaltContext) : List<DynamicTask> fun tasksFor(project: Project, context: KobaltContext) : List<DynamicTask>
} }
class DynamicTask(override val plugin: IPlugin, override val name: String, override val doc: String, class DynamicTask(override val plugin: IPlugin, override val name: String, override val doc: String,

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

@ -123,6 +123,8 @@ open class Project(
}) })
return result return result
} }
override fun toString() = "[Project $name]"
} }
class Sources(val project: Project, val sources: HashSet<String>) { class Sources(val project: Project, val sources: HashSet<String>) {

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

@ -53,6 +53,7 @@ class TaskContributor @Inject constructor(val incrementalManagerFactory: Increme
runTask: (Project) -> IncrementalTaskInfo) { runTask: (Project) -> IncrementalTaskInfo) {
Variant.allVariants(project).forEach { variant -> Variant.allVariants(project).forEach { variant ->
val variantTaskName = variant.toTask(taskName) val variantTaskName = variant.toTask(taskName)
context.variant = variant
dynamicTasks.add(DynamicTask(plugin, variantTaskName, variantTaskName, group, project, dynamicTasks.add(DynamicTask(plugin, variantTaskName, variantTaskName, group, project,
dependsOn = dependsOn.map { variant.toTask(it) }, dependsOn = dependsOn.map { variant.toTask(it) },
reverseDependsOn = reverseDependsOn.map { variant.toTask(it) }, reverseDependsOn = reverseDependsOn.map { variant.toTask(it) },
@ -62,5 +63,5 @@ class TaskContributor @Inject constructor(val incrementalManagerFactory: Increme
} }
} }
override fun tasksFor(context: KobaltContext) : List<DynamicTask> = dynamicTasks override fun tasksFor(project: Project, context: KobaltContext) : List<DynamicTask> = dynamicTasks
} }

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

@ -33,12 +33,19 @@ class Archives {
val result = File(archiveDir.path, fullArchiveName) val result = File(archiveDir.path, fullArchiveName)
log(3, "Creating $result") log(3, "Creating $result")
if (! Features.USE_TIMESTAMPS || isOutdated(project.directory, includedFiles, result)) { if (! Features.USE_TIMESTAMPS || isOutdated(project.directory, includedFiles, result)) {
val outStream = outputStreamFactory(FileOutputStream(result)) try {
JarUtils.addFiles(project.directory, includedFiles, outStream, expandJarFiles) outputStreamFactory(FileOutputStream(result)).use {
JarUtils.addFiles(project.directory, includedFiles, it, expandJarFiles)
log(2, text = "Added ${includedFiles.size} files to $result") log(2, text = "Added ${includedFiles.size} files to $result")
outStream.flush()
outStream.close()
log(1, " Created $result") log(1, " Created $result")
}
} catch (e: Throwable) {
// make sure that incomplete archive is deleted
// otherwise incremental build does not work on next run
result.delete()
throw e
}
} else { } else {
log(3, " $result is up to date") log(3, " $result is up to date")
} }

192
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt Normal file
View file

@ -0,0 +1,192 @@
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.dependency.FileDependency
import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log
import com.google.inject.Inject
import java.io.File
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 CompilerResult(val successResults: List<TaskResult>, val failedResult: TaskResult?)
fun invokeCompiler(project: Project, context: KobaltContext, compiler: ICompiler,
sourceDirectories: List<File>, isTest: Boolean): CompilerResult {
val results = arrayListOf<TaskResult>()
var failedResult: TaskResult? = null
val contributedSourceDirs =
if (isTest) {
context.testSourceDirectories(project)
} else {
context.sourceDirectories(project)
}
val sourceFiles = KFiles.findSourceFiles(project.directory,
contributedSourceDirs.map { it.path }, compiler.sourceSuffixes)
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)
val thisResult = invokeCompiler(project, context, compiler, info)
results.addAll(thisResult.successResults)
if (failedResult == null) {
failedResult = thisResult.failedResult
}
} else {
log(2, "Compiler $compiler not running on ${project.name} since no source files were found")
}
return CompilerResult(results, failedResult)
}
fun invokeCompiler(project: Project, context: KobaltContext, compiler: ICompiler, info: CompilerActionInfo)
: CompilerResult {
val results = arrayListOf<TaskResult>()
var failedResult: TaskResult? = null
val thisResult = compiler.compile(project, context, info)
results.add(thisResult)
if (!thisResult.success && failedResult == null) {
failedResult = thisResult
}
return CompilerResult(results, failedResult)
}
/**
* Create a CompilerActionInfo (all the information that a compiler needs to know) for the given parameters.
* Runs all the contributors and interceptors relevant to that task.
*/
fun createCompilerActionInfo(project: Project, context: KobaltContext, compiler: ICompiler,
isTest: Boolean, sourceDirectories: List<File>, sourceSuffixes: List<String>): CompilerActionInfo {
copyResources(project, context, SourceSet.of(isTest))
val fullClasspath = if (isTest) dependencyManager.testDependencies(project, context)
else dependencyManager.dependencies(project, context)
// 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.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.
if (buildDirectory.exists()) {
classpath += FileDependency(buildDirectory.path)
}
val initialSourceDirectories = ArrayList<File>(sourceDirectories)
// Source directories from the contributors
val contributedSourceDirs =
if (isTest) {
context.pluginInfo.testSourceDirContributors.flatMap { it.testSourceDirectoriesFor(project, context) }
} else {
context.pluginInfo.sourceDirContributors.flatMap { it.sourceDirectoriesFor(project, context) }
}
initialSourceDirectories.addAll(contributedSourceDirs)
// Transform them with the interceptors, if any
val allSourceDirectories =
if (isTest) {
initialSourceDirectories
} else {
context.pluginInfo.sourceDirectoriesInterceptors.fold(initialSourceDirectories.toList(),
{ sd, interceptor -> interceptor.intercept(project, context, sd) })
}.filter {
File(project.directory, it.path).exists()
}.filter {
! KFiles.isResource(it.path)
}.distinct()
// Now that we have all the source directories, find all the source files in them
val projectDirectory = File(project.directory)
val sourceFiles = if (compiler.canCompileDirectories) {
allSourceDirectories.map { File(projectDirectory, it.path).path }
} else {
files.findRecursively(projectDirectory, allSourceDirectories,
{ file -> sourceSuffixes.any { file.endsWith(it) } })
.map { File(projectDirectory, it).path }
}
// Special treatment if we are compiling Kotlin files and the project also has a java source
// directory. In this case, also pass that java source directory to the Kotlin compiler as is
// so that it can parse its symbols
// Note: this should actually be queried on the compiler object so that this method, which
// is compiler agnostic, doesn't hardcode Kotlin specific stuff
val extraSourceFiles = arrayListOf<String>()
if (sourceSuffixes.any { it.contains("kt")}) {
project.sourceDirectories.forEach {
val javaDir = KFiles.joinDir(project.directory, it)
if (File(javaDir).exists()) {
if (it.contains("java")) {
extraSourceFiles.add(javaDir)
// Add all the source directories contributed as potential Java directories too
// (except our own)
context.pluginInfo.sourceDirContributors
// .filter { it != this }
.forEach {
extraSourceFiles.addAll(it.sourceDirectoriesFor(project, context).map { it.path })
}
}
}
}
}
val allSources = (sourceFiles + extraSourceFiles)
.map { File(it).canonicalPath }
.distinct()
.filter { File(it).exists() }
// 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 */)
val result = context.pluginInfo.compilerInterceptors.fold(initialActionInfo, { ai, interceptor ->
interceptor.intercept(project, context, ai)
})
return result
}
/**
* Copy the resources from a source directory to the build one
*/
private fun copyResources(project: Project, context: KobaltContext, sourceSet: SourceSet) {
val outputDir = sourceSet.outputDir
val variantSourceDirs = context.variant.resourceDirectories(project, sourceSet)
if (variantSourceDirs.size > 0) {
JvmCompilerPlugin.lp(project, "Copying $sourceSet resources")
val absOutputDir = File(KFiles.joinDir(project.directory, project.buildDirectory, outputDir))
variantSourceDirs.map { File(project.directory, it.path) }.filter {
it.exists()
}.forEach {
log(2, "Copying from $it to $absOutputDir")
KFiles.copyRecursively(it, absOutputDir, deleteFirst = false)
}
} else {
JvmCompilerPlugin.lp(project, "No resources to copy for $sourceSet")
}
}
/**
* 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) }
}

18
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/IncrementalManager.kt
View file

@ -19,16 +19,17 @@ import java.nio.file.Files
import java.nio.file.Paths import java.nio.file.Paths
import java.util.* import java.util.*
data class TaskInfo(val taskName: String, var inputChecksum: String? = null, var outputChecksum: String? = null)
class BuildInfo(var tasks: List<TaskInfo>)
/** /**
* Manage the file .kobalt/buildInfo.json, which keeps track of input and output checksums to manage * Manage the file .kobalt/buildInfo.json, which keeps track of input and output checksums to manage
* incremental builds. * incremental builds.
*/ */
class IncrementalManager @Inject constructor(val args: Args, @Assisted val fileName : String) { class IncrementalManager @Inject constructor(val args: Args, @Assisted val fileName : String) {
private data class TaskInfo(val taskName: String, var inputChecksum: String? = null,
var outputChecksum: String? = null)
private class BuildInfo(var tasks: List<TaskInfo>)
interface IFactory { interface IFactory {
fun create(@Assisted fileName: String = IncrementalManager.BUILD_INFO_FILE) : IncrementalManager fun create(@Assisted fileName: String = IncrementalManager.BUILD_INFO_FILE) : IncrementalManager
} }
@ -79,6 +80,7 @@ class IncrementalManager @Inject constructor(val args: Args, @Assisted val fileN
fun outputChecksumFor(taskName: String) : String? = fun outputChecksumFor(taskName: String) : String? =
taskInfoFor(taskInfos(), taskName).outputChecksum taskInfoFor(taskInfos(), taskName).outputChecksum
/** /**
* @param method is assumed to return an IncrementalTaskInfo. * @param method is assumed to return an IncrementalTaskInfo.
* @return a closure that invokes that method and decide whether to run the task or not based * @return a closure that invokes that method and decide whether to run the task or not based
@ -93,7 +95,8 @@ class IncrementalManager @Inject constructor(val args: Args, @Assisted val fileN
var upToDate = false var upToDate = false
var taskOutputChecksum : String? = null var taskOutputChecksum : String? = null
if (args.noIncremental || (Kobalt.context?.internalContext?.buildFileOutOfDate as Boolean)) { if (! args.forceIncremental &&
(args.noIncremental || (Kobalt.context?.internalContext?.buildFileOutOfDate as Boolean))) {
// //
// If the user turned off incremental builds or if the build file was modified, always run this task // If the user turned off incremental builds or if the build file was modified, always run this task
// //
@ -124,7 +127,8 @@ class IncrementalManager @Inject constructor(val args: Args, @Assisted val fileN
if (outputChecksum == taskOutputChecksum) { if (outputChecksum == taskOutputChecksum) {
upToDate = true upToDate = true
} else { } else {
logIncremental(LEVEL, "Incremental task $taskName output is out of date, running it") logIncremental(LEVEL, "Incremental task $taskName output is out of date" +
" (different output checksums), running it")
} }
} }
} else { } else {
@ -132,7 +136,7 @@ class IncrementalManager @Inject constructor(val args: Args, @Assisted val fileN
logIncremental(LEVEL, "Project ${project.name} depends on dirty project, running $taskName") logIncremental(LEVEL, "Project ${project.name} depends on dirty project, running $taskName")
} else { } else {
logIncremental(LEVEL, "Incremental task $taskName input is out of date, running it" logIncremental(LEVEL, "Incremental task $taskName input is out of date, running it"
+ " old: $inputChecksum new: ${iti.inputChecksum()}") + " (different input checksums old: $inputChecksum new: ${iti.inputChecksum()})")
} }
project.projectExtra.isDirty = true project.projectExtra.isDirty = true
} }

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

@ -30,7 +30,8 @@ open class JvmCompilerPlugin @Inject constructor(
open val files: KFiles, open val files: KFiles,
open val dependencyManager: DependencyManager, open val dependencyManager: DependencyManager,
open val executors: KobaltExecutors, open val executors: KobaltExecutors,
open val taskContributor : TaskContributor) open val taskContributor : TaskContributor,
val compilerUtils: CompilerUtils)
: BasePlugin(), ISourceDirectoryContributor, IProjectContributor, ITaskContributor by taskContributor { : BasePlugin(), ISourceDirectoryContributor, IProjectContributor, ITaskContributor by taskContributor {
companion object { companion object {
@ -52,19 +53,19 @@ open class JvmCompilerPlugin @Inject constructor(
const val GROUP_TEST = "test" const val GROUP_TEST = "test"
const val GROUP_BUILD = "build" const val GROUP_BUILD = "build"
const val GROUP_DOCUMENTATION = "documentation" const val GROUP_DOCUMENTATION = "documentation"
/**
* Log with a project.
*/
fun lp(project: Project, s: String) {
log(2, "${project.name}: $s")
}
} }
override val name: String = PLUGIN_NAME override val name: String = PLUGIN_NAME
override fun accept(project: Project) = true override fun accept(project: Project) = true
/**
* Log with a project.
*/
protected fun lp(project: Project, s: String) {
log(2, "${project.name}: $s")
}
override fun apply(project: Project, context: KobaltContext) { override fun apply(project: Project, context: KobaltContext) {
super.apply(project, context) super.apply(project, context)
// cleanUpActors() // cleanUpActors()
@ -112,41 +113,9 @@ open class JvmCompilerPlugin @Inject constructor(
return TaskResult() return TaskResult()
} }
/**
* Copy the resources from a source directory to the build one
*/
protected fun copyResources(project: Project, sourceSet: SourceSet) {
var outputDir = sourceSet.outputDir
val variantSourceDirs = context.variant.resourceDirectories(project, sourceSet)
if (variantSourceDirs.size > 0) {
lp(project, "Copying $sourceSet resources")
val absOutputDir = File(KFiles.joinDir(project.directory, project.buildDirectory, outputDir))
variantSourceDirs.map { File(project.directory, it.path) }.filter {
it.exists()
}.forEach {
log(2, "Copying from $it to $absOutputDir")
KFiles.copyRecursively(it, absOutputDir, deleteFirst = false)
}
} else {
lp(project, "No resources to copy for $sourceSet")
}
}
protected fun compilerArgsFor(project: Project): List<String> {
val result = project.projectProperties.get(COMPILER_ARGS)
if (result != null) {
@Suppress("UNCHECKED_CAST")
return result as List<String>
} else {
return emptyList()
}
}
@IncrementalTask(name = TASK_COMPILE_TEST, description = "Compile the tests", group = GROUP_BUILD, @IncrementalTask(name = TASK_COMPILE_TEST, description = "Compile the tests", group = GROUP_BUILD,
dependsOn = arrayOf(TASK_COMPILE)) dependsOn = arrayOf(TASK_COMPILE))
fun taskCompileTest(project: Project): IncrementalTaskInfo { fun taskCompileTest(project: Project): IncrementalTaskInfo {
sourceTestDirectories.addAll(context.variant.sourceDirectories(project, context, SourceSet.of(isTest = true)))
return IncrementalTaskInfo( return IncrementalTaskInfo(
inputChecksum = { inputChecksum = {
Md5.toMd5Directories(context.testSourceDirectories(project).map { File(project.directory, it.path)}) Md5.toMd5Directories(context.testSourceDirectories(project).map { File(project.directory, it.path)})
@ -159,12 +128,12 @@ open class JvmCompilerPlugin @Inject constructor(
) )
} }
private fun sourceDirectories(project: Project, context: KobaltContext)
= context.variant.sourceDirectories(project, context, SourceSet.of(isTest = false))
@IncrementalTask(name = JvmCompilerPlugin.TASK_COMPILE, description = "Compile the project", group = GROUP_BUILD, @IncrementalTask(name = JvmCompilerPlugin.TASK_COMPILE, description = "Compile the project", group = GROUP_BUILD,
runAfter = arrayOf(TASK_CLEAN)) runAfter = arrayOf(TASK_CLEAN))
fun taskCompile(project: Project): IncrementalTaskInfo { fun taskCompile(project: Project): IncrementalTaskInfo {
// Set up the source files now that we have the variant
sourceDirectories.addAll(context.variant.sourceDirectories(project, context, SourceSet.of(isTest = false)))
return IncrementalTaskInfo( return IncrementalTaskInfo(
inputChecksum = { inputChecksum = {
Md5.toMd5Directories(context.sourceDirectories(project).map { File(project.directory, it.path) }) Md5.toMd5Directories(context.sourceDirectories(project).map { File(project.directory, it.path) })
@ -193,29 +162,32 @@ open class JvmCompilerPlugin @Inject constructor(
throw KobaltException("Couldn't find any compiler for project ${project.name}") throw KobaltException("Couldn't find any compiler for project ${project.name}")
} else { } else {
val allCompilers = compilerContributors.flatMap { it.compilersFor(project, context)}.sorted() val allCompilers = compilerContributors.flatMap { it.compilersFor(project, context)}.sorted()
allCompilers.forEach { compiler ->
val contributedSourceDirs = /**
if (isTest) { * Swap the Java and Kotlin compilers from the list.
context.testSourceDirectories(project) */
} else { fun swapJavaAndKotlin(allCompilers: List<ICompiler>): List<ICompiler> {
context.sourceDirectories(project) val result = ArrayList(allCompilers)
var ik = -1
var ij = -1
allCompilers.withIndex().forEach { wi ->
if (wi.value.sourceSuffixes.contains("java")) ij = wi.index
if (wi.value.sourceSuffixes.contains("kt")) ik = wi.index
} }
val sourceFiles = KFiles.findSourceFiles(project.directory, Collections.swap(result, ik, ij)
contributedSourceDirs.map { it.path }, compiler.sourceSuffixes) return result
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)
val thisResult = compiler.compile(project, context, info)
results.add(thisResult)
if (!thisResult.success && failedResult == null) {
failedResult = thisResult
}
} else {
log(2, "Compiler $compiler not running on ${project.name} since no source files were found")
} }
// If this project has a kapt{} directive, we want to run the Java compiler first
val hasKapt = project.projectProperties.get("kaptConfig") != null
val finalAllCompilers = if (hasKapt) swapJavaAndKotlin(allCompilers) else allCompilers
finalAllCompilers.forEach { compiler ->
val compilerResults = compilerUtils.invokeCompiler(project, context, compiler,
sourceDirectories(project, context), isTest)
results.addAll(compilerResults.successResults)
if (failedResult == null) failedResult = compilerResults.failedResult
} }
return if (failedResult != null) failedResult!! return if (failedResult != null) failedResult!!
else if (results.size > 0) results[0] else if (results.size > 0) results[0]
else TaskResult(true) else TaskResult(true)
@ -249,9 +221,9 @@ open class JvmCompilerPlugin @Inject constructor(
var result: TaskResult? = null var result: TaskResult? = null
contributors.forEach { contributors.forEach {
it.compilersFor(project, context).forEach { compiler -> it.compilersFor(project, context).forEach { compiler ->
result = docGenerator.generateDoc(project, context, createCompilerActionInfo(project, context, result = docGenerator.generateDoc(project, context,
compiler, compilerUtils.createCompilerActionInfo(project, context, compiler,
isTest = false, sourceDirectories = sourceDirectories, isTest = false, sourceDirectories = sourceDirectories(project, context),
sourceSuffixes = compiler.sourceSuffixes)) sourceSuffixes = compiler.sourceSuffixes))
} }
} }
@ -262,110 +234,10 @@ open class JvmCompilerPlugin @Inject constructor(
} }
} }
/**
* 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) }
/**
* Create a CompilerActionInfo (all the information that a compiler needs to know) for the given parameters.
* Runs all the contributors and interceptors relevant to that task.
*/
protected fun createCompilerActionInfo(project: Project, context: KobaltContext, compiler: ICompiler,
isTest: Boolean, sourceDirectories: List<File>, sourceSuffixes: List<String>): CompilerActionInfo {
copyResources(project, SourceSet.of(isTest))
val fullClasspath = if (isTest) dependencyManager.testDependencies(project, context)
else dependencyManager.dependencies(project, context)
// Remove all the excluded dependencies from the classpath
val classpath = fullClasspath.filter {
! isDependencyExcluded(it, project.excludedDependencies)
}
val buildDirectory = if (isTest) File(project.buildDirectory, KFiles.TEST_CLASSES_DIR)
else File(project.classesDir(context))
buildDirectory.mkdirs()
val initialSourceDirectories = ArrayList<File>(sourceDirectories)
// Source directories from the contributors
val contributedSourceDirs =
if (isTest) {
context.pluginInfo.testSourceDirContributors.flatMap { it.testSourceDirectoriesFor(project, context) }
} else {
context.pluginInfo.sourceDirContributors.flatMap { it.sourceDirectoriesFor(project, context) }
}
initialSourceDirectories.addAll(contributedSourceDirs)
// Transform them with the interceptors, if any
val allSourceDirectories =
if (isTest) {
initialSourceDirectories
} else {
context.pluginInfo.sourceDirectoriesInterceptors.fold(initialSourceDirectories.toList(),
{ sd, interceptor -> interceptor.intercept(project, context, sd) })
}.filter {
File(project.directory, it.path).exists()
}.filter {
! KFiles.isResource(it.path)
}.distinct()
// Now that we have all the source directories, find all the source files in them
val projectDirectory = File(project.directory)
val sourceFiles = if (compiler.canCompileDirectories) {
allSourceDirectories.map { File(projectDirectory, it.path).path }
} else {
files.findRecursively(projectDirectory, allSourceDirectories,
{ file -> sourceSuffixes.any { file.endsWith(it) } })
.map { File(projectDirectory, it).path }
}
// Special treatment if we are compiling Kotlin files and the project also has a java source
// directory. In this case, also pass that java source directory to the Kotlin compiler as is
// so that it can parse its symbols
// Note: this should actually be queried on the compiler object so that this method, which
// is compiler agnostic, doesn't hardcode Kotlin specific stuff
val extraSourceFiles = arrayListOf<String>()
if (sourceSuffixes.any { it.contains("kt")}) {
project.sourceDirectories.forEach {
val javaDir = KFiles.joinDir(project.directory, it)
if (File(javaDir).exists()) {
if (it.contains("java")) {
extraSourceFiles.add(javaDir)
// Add all the source directories contributed as potential Java directories too
// (except our own)
context.pluginInfo.sourceDirContributors.filter { it != this }.forEach {
extraSourceFiles.addAll(it.sourceDirectoriesFor(project, context).map { it.path })
}
}
}
}
}
val allSources = (sourceFiles + extraSourceFiles).distinct().filter { File(it).exists() }
// 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 */)
val result = context.pluginInfo.compilerInterceptors.fold(initialActionInfo, { ai, interceptor ->
interceptor.intercept(project, context, ai)
})
return result
}
val sourceDirectories = arrayListOf<File>()
val sourceTestDirectories = arrayListOf<File>()
// ISourceDirectoryContributor // ISourceDirectoryContributor
override fun sourceDirectoriesFor(project: Project, context: KobaltContext) override fun sourceDirectoriesFor(project: Project, context: KobaltContext)
= if (accept(project)) { = if (accept(project)) {
sourceDirectories.toList() sourceDirectories(project, context)
} else { } else {
arrayListOf() arrayListOf()
} }

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

@ -76,8 +76,8 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
val repoContributors = arrayListOf<IRepoContributor>() val repoContributors = arrayListOf<IRepoContributor>()
val compilerFlagContributors = arrayListOf<ICompilerFlagContributor>() val compilerFlagContributors = arrayListOf<ICompilerFlagContributor>()
val compilerInterceptors = arrayListOf<ICompilerInterceptor>() val compilerInterceptors = arrayListOf<ICompilerInterceptor>()
val sourceDirectoriesInterceptors = arrayListOf<ISourceDirectoryIncerceptor>() val sourceDirectoriesInterceptors = arrayListOf<ISourceDirectoryInterceptor>()
val buildDirectoryInterceptors = arrayListOf<IBuildDirectoryIncerceptor>() val buildDirectoryInterceptors = arrayListOf<IBuildDirectoryInterceptor>()
val runnerContributors = arrayListOf<IRunnerContributor>() val runnerContributors = arrayListOf<IRunnerContributor>()
val testRunnerContributors = arrayListOf<ITestRunnerContributor>() val testRunnerContributors = arrayListOf<ITestRunnerContributor>()
val classpathInterceptors = arrayListOf<IClasspathInterceptor>() val classpathInterceptors = arrayListOf<IClasspathInterceptor>()
@ -156,10 +156,22 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
GuiceFactory() GuiceFactory()
} }
fun forName(className: String) = fun forName(className: String) : Class<*> {
if (pluginClassLoader != null) pluginClassLoader.loadClass(className) fun loadClass(className: String, classLoader: ClassLoader?) : Class<*>? {
else if (classLoader != null) classLoader.loadClass(className) try {
else Class.forName(className) return classLoader?.loadClass(className)
} catch(ex: ClassNotFoundException) {
return null
}
}
val result = loadClass(className, classLoader)
?: Class.forName(className)
?: loadClass(className, pluginClassLoader)
?: throw ClassNotFoundException(className)
return result
}
// //
// Populate pluginInfo with what was found in Kobalt's own kobalt-plugin.xml // Populate pluginInfo with what was found in Kobalt's own kobalt-plugin.xml
@ -169,7 +181,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
with(factory.instanceOf(forName(it))) { with(factory.instanceOf(forName(it))) {
// Note: can't use "when" here since the same instance can implement multiple interfaces // Note: can't use "when" here since the same instance can implement multiple interfaces
if (this is IBuildConfigFieldContributor) buildConfigFieldContributors.add(this) if (this is IBuildConfigFieldContributor) buildConfigFieldContributors.add(this)
if (this is IBuildDirectoryIncerceptor) buildDirectoryInterceptors.add(this) if (this is IBuildDirectoryInterceptor) buildDirectoryInterceptors.add(this)
if (this is IClasspathContributor) classpathContributors.add(this) if (this is IClasspathContributor) classpathContributors.add(this)
if (this is IClasspathInterceptor) classpathInterceptors.add(this) if (this is IClasspathInterceptor) classpathInterceptors.add(this)
if (this is ICompilerContributor) compilerContributors.add(this) if (this is ICompilerContributor) compilerContributors.add(this)
@ -182,7 +194,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
if (this is IRepoContributor) repoContributors.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 ISourceDirectoryContributor) sourceDirContributors.add(this)
if (this is ISourceDirectoryIncerceptor) sourceDirectoriesInterceptors.add(this) if (this is ISourceDirectoryInterceptor) sourceDirectoriesInterceptors.add(this)
if (this is ITaskContributor) taskContributors.add(this) if (this is ITaskContributor) taskContributors.add(this)
if (this is ITestRunnerContributor) testRunnerContributors.add(this) if (this is ITestRunnerContributor) testRunnerContributors.add(this)
if (this is IMavenIdInterceptor) mavenIdInterceptors.add(this) if (this is IMavenIdInterceptor) mavenIdInterceptors.add(this)

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

@ -27,7 +27,7 @@ class KobaltSettingsXml {
var proxies: ProxiesXml? = null var proxies: ProxiesXml? = null
@XmlElement(name = "kobalt-compiler-version") @JvmField @XmlElement(name = "kobalt-compiler-version") @JvmField
var kobaltCompilerVersion: String = "1.0.0" var kobaltCompilerVersion: String = "1.0.2"
@XmlElement(name = "kobalt-compiler-repo") @JvmField @XmlElement(name = "kobalt-compiler-repo") @JvmField
var kobaltCompilerRepo: String? = null var kobaltCompilerRepo: String? = null

21
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KotlinJarFiles.kt Normal file
View file

@ -0,0 +1,21 @@
package com.beust.kobalt.internal
import com.beust.kobalt.maven.DependencyManager
import com.google.inject.Inject
import java.io.File
/**
* The jar files that Kotlin needs to run.
*/
class KotlinJarFiles @Inject constructor(val dependencyManager: DependencyManager,
val settings: KobaltSettings){
private fun getKotlinCompilerJar(name: String): File {
val id = "org.jetbrains.kotlin:kotlin-$name:${settings.kobaltCompilerVersion}"
val dep = dependencyManager.create(id)
return dep.jarFile.get().absoluteFile
}
val stdlib: File get() = getKotlinCompilerJar("stdlib")
val runtime: File get() = getKotlinCompilerJar("runtime")
val compiler: File get() = getKotlinCompilerJar("compiler-embeddable")
}

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

@ -4,10 +4,7 @@ import com.beust.kobalt.*
import com.beust.kobalt.api.* import com.beust.kobalt.api.*
import com.beust.kobalt.api.annotation.IncrementalTask import com.beust.kobalt.api.annotation.IncrementalTask
import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.misc.Strings import com.beust.kobalt.misc.*
import com.beust.kobalt.misc.benchmarkMillis
import com.beust.kobalt.misc.kobaltError
import com.beust.kobalt.misc.log
import com.google.common.annotations.VisibleForTesting import com.google.common.annotations.VisibleForTesting
import com.google.common.collect.ArrayListMultimap import com.google.common.collect.ArrayListMultimap
import com.google.common.collect.ListMultimap import com.google.common.collect.ListMultimap
@ -81,7 +78,41 @@ class TaskManager @Inject constructor(val args: Args,
} }
} }
fun runTargets(taskNames: List<String>, projects: List<Project>): RunTargetResult { fun runTargets(passedTaskNames: List<String>, allProjects: List<Project>): RunTargetResult {
val taskInfos = calculateDependentTaskNames(passedTaskNames, allProjects)
val projectsToRun = findProjectsToRun(taskInfos, allProjects)
return runProjects(taskInfos, projectsToRun)
}
/**
* Determine which projects to run based on the request tasks. Also make sure that all the requested projects
* exist.
*/
fun findProjectsToRun(taskInfos: List<TaskInfo>, projects: List<Project>) : List<Project> {
// Validate projects
val result = arrayListOf<Project>()
val projectMap = HashMap<String, Project>().apply {
projects.forEach { put(it.name, it)}
}
// Extract all the projects we need to run from the tasks
// val orderedTaskInfos = calculateDependentTaskNames(taskInfos.map { it.id }, projects)
taskInfos.forEach {
val p = it.project
if (p != null) {
if (! projectMap.containsKey(p)) {
throw KobaltException("Unknown project: ${it.project}")
}
result.add(projectMap[it.project]!!)
}
}
// If at least one task didn't specify a project, run them all
return if (result.any()) result else projects
}
private fun runProjects(taskInfos: List<TaskInfo>, projects: List<Project>) : RunTargetResult {
var result = 0 var result = 0
val failedProjects = hashSetOf<String>() val failedProjects = hashSetOf<String>()
val messages = Collections.synchronizedList(arrayListOf<String>()) val messages = Collections.synchronizedList(arrayListOf<String>())
@ -111,7 +142,7 @@ class TaskManager @Inject constructor(val args: Args,
log(3, " $it: " + tasksByNames.get(it)) log(3, " $it: " + tasksByNames.get(it))
} }
val graph = createGraph2(project.name, taskNames, tasksByNames, val graph = createGraph2(project.name, taskInfos, tasksByNames,
dependsOn, reverseDependsOn, runBefore, runAfter, alwaysRunAfter, dependsOn, reverseDependsOn, runBefore, runAfter, alwaysRunAfter,
{ task: ITask -> task.name }, { task: ITask -> task.name },
{ task: ITask -> task.plugin.accept(project) }) { task: ITask -> task.plugin.accept(project) })
@ -137,9 +168,65 @@ class TaskManager @Inject constructor(val args: Args,
} }
} }
} }
return RunTargetResult(result, messages) return RunTargetResult(result, messages)
} }
/**
* If the user wants to run a single task on a single project (e.g. "kobalt:assemble"), we need to
* see if that project depends on others and if it does, invoke these tasks on all of them. This
* function returns all these task names (including dependent).
*/
fun calculateDependentTaskNames(taskNames: List<String>, projects: List<Project>): List<TaskInfo> {
val projectMap = hashMapOf<String, Project>().apply {
projects.forEach { project -> put(project.name, project)}
}
val allTaskInfos = HashSet(taskNames.map { TaskInfo(it) })
with(Topological<TaskInfo>()) {
val toProcess = ArrayList(allTaskInfos)
val seen = HashSet(allTaskInfos)
val newTasks = hashSetOf<TaskInfo>()
fun maybeAdd(taskInfo: TaskInfo) {
if (!seen.contains(taskInfo)) {
newTasks.add(taskInfo)
seen.add(taskInfo)
}
}
while (toProcess.any()) {
toProcess.forEach { ti ->
val project = projectMap[ti.project]
if (project != null) {
val dependents = project.projectExtra.dependsOn
if (dependents.any()) {
dependents.forEach { depProject ->
val tiDep = TaskInfo(depProject.name, ti.taskName)
allTaskInfos.add(tiDep)
addEdge(ti, tiDep)
maybeAdd(tiDep)
}
} else {
allTaskInfos.add(ti)
addNode(ti)
}
} else {
// No project specified for this task, run that task in all the projects
projects.forEach {
maybeAdd(TaskInfo(it.name, ti.taskName))
}
}
}
toProcess.clear()
toProcess.addAll(newTasks)
newTasks.clear()
}
val result = sort()
return result
}
}
val LOG_LEVEL = 3 val LOG_LEVEL = 3
/** /**
@ -150,7 +237,8 @@ class TaskManager @Inject constructor(val args: Args,
* we'll be adding to the graph while @toName extracts the name of a node. * we'll be adding to the graph while @toName extracts the name of a node.
*/ */
@VisibleForTesting @VisibleForTesting
fun <T> createGraph2(projectName: String, taskNames: List<String>, nodeMap: Multimap<String, T>, fun <T> createGraph2(projectName: String, passedTasks: List<TaskInfo>,
nodeMap: Multimap<String, T>,
dependsOn: Multimap<String, String>, dependsOn: Multimap<String, String>,
reverseDependsOn: Multimap<String, String>, reverseDependsOn: Multimap<String, String>,
runBefore: Multimap<String, String>, runBefore: Multimap<String, String>,
@ -176,9 +264,9 @@ class TaskManager @Inject constructor(val args: Args,
} }
// //
// Turn the task names into the more useful TaskInfo and do some sanity checking on the way // Keep only the tasks we need to run.
// //
val taskInfos = taskNames.map { TaskInfo(it) }.filter { val taskInfos = passedTasks.filter {
if (!nodeMap.keys().contains(it.taskName)) { if (!nodeMap.keys().contains(it.taskName)) {
throw KobaltException("Unknown task: $it") throw KobaltException("Unknown task: $it")
} }
@ -262,6 +350,7 @@ class TaskManager @Inject constructor(val args: Args,
// runBefore and runAfter (task ordering) are only considered for explicit tasks (tasks that were // runBefore and runAfter (task ordering) are only considered for explicit tasks (tasks that were
// explicitly requested by the user) // explicitly requested by the user)
// //
passedTasks.map { it.id }.let { taskNames ->
runBefore[taskName].forEach { from -> runBefore[taskName].forEach { from ->
if (taskNames.contains(from)) { if (taskNames.contains(from)) {
addEdge(result, from, taskName, newToProcess, "runBefore") addEdge(result, from, taskName, newToProcess, "runBefore")
@ -272,6 +361,7 @@ class TaskManager @Inject constructor(val args: Args,
addEdge(result, taskName, to, newToProcess, "runAfter") addEdge(result, taskName, to, newToProcess, "runAfter")
} }
} }
}
seen.add(taskName) seen.add(taskName)
} }
@ -339,18 +429,16 @@ class TaskManager @Inject constructor(val args: Args,
*/ */
fun computePluginTasks(projects: List<Project>) { fun computePluginTasks(projects: List<Project>) {
installAnnotationTasks(projects) installAnnotationTasks(projects)
installDynamicTasks(projects) installDynamicTasks()
} }
private fun installDynamicTasks(projects: List<Project>) { private fun installDynamicTasks() {
dynamicTasks.forEach { task -> dynamicTasks.forEach { task ->
projects.filter { task.plugin.accept(it) }.forEach { project -> addTask(task.plugin, task.project, task.name, task.doc, task.group,
addTask(task.plugin, project, task.name, task.doc, task.group,
task.dependsOn, task.reverseDependsOn, task.runBefore, task.runAfter, task.alwaysRunAfter, task.dependsOn, task.reverseDependsOn, task.runBefore, task.runAfter, task.alwaysRunAfter,
task.closure) task.closure)
} }
} }
}
private fun installAnnotationTasks(projects: List<Project>) { private fun installAnnotationTasks(projects: List<Project>) {
taskAnnotations.forEach { staticTask -> taskAnnotations.forEach { staticTask ->

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

@ -85,14 +85,13 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
* allDependencies is typically either compileDependencies or testDependencies * allDependencies is typically either compileDependencies or testDependencies
*/ */
override fun calculateDependencies(project: Project?, context: KobaltContext, override fun calculateDependencies(project: Project?, context: KobaltContext,
dependentProjects: List<ProjectDescription>,
vararg allDependencies: List<IClasspathDependency>): List<IClasspathDependency> { vararg allDependencies: List<IClasspathDependency>): List<IClasspathDependency> {
val result = arrayListOf<IClasspathDependency>() val result = arrayListOf<IClasspathDependency>()
allDependencies.forEach { dependencies -> allDependencies.forEach { dependencies ->
result.addAll(transitiveClosure(dependencies)) result.addAll(transitiveClosure(dependencies))
} }
result.addAll(runClasspathContributors(project, context)) result.addAll(runClasspathContributors(project, context))
result.addAll(dependentProjectDependencies(dependentProjects, project, context)) result.addAll(dependentProjectDependencies(project, context))
return result return result
} }
@ -112,9 +111,9 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
*/ */
fun transitiveClosure(dependencies : List<IClasspathDependency>, indent : String = " "): fun transitiveClosure(dependencies : List<IClasspathDependency>, indent : String = " "):
List<IClasspathDependency> { List<IClasspathDependency> {
var executor = executors.newExecutor("JvmCompiler}", 10) val executor = executors.newExecutor("JvmCompiler}", 10)
var result = hashSetOf<IClasspathDependency>() val result = hashSetOf<IClasspathDependency>()
dependencies.forEach { projectDependency -> dependencies.forEach { projectDependency ->
log(ConsoleRepositoryListener.LOG_LEVEL, "$indent Resolving $projectDependency") log(ConsoleRepositoryListener.LOG_LEVEL, "$indent Resolving $projectDependency")
@ -169,27 +168,25 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
* If this project depends on other projects, we need to include their jar file and also * If this project depends on other projects, we need to include their jar file and also
* their own dependencies * their own dependencies
*/ */
private fun dependentProjectDependencies(projectDescriptions: List<ProjectDescription>, private fun dependentProjectDependencies(
project: Project?, context: KobaltContext) : List<IClasspathDependency> { project: Project?, context: KobaltContext) : List<IClasspathDependency> {
if (project == null) {
return emptyList()
} else {
val result = arrayListOf<IClasspathDependency>() val result = arrayListOf<IClasspathDependency>()
projectDescriptions.filter { project.projectExtra.dependsOn.forEach { p ->
it.project.name == project?.name
}.forEach { pd ->
pd.dependsOn.forEach { p ->
result.add(FileDependency(KFiles.joinDir(p.directory, p.classesDir(context)))) result.add(FileDependency(KFiles.joinDir(p.directory, p.classesDir(context))))
val otherDependencies = calculateDependencies(p, context, projectDescriptions, val otherDependencies = calculateDependencies(p, context, p.compileDependencies)
p.compileDependencies)
result.addAll(otherDependencies) result.addAll(otherDependencies)
}
}
}
return result return result
} }
}
private fun dependencies(project: Project, context: KobaltContext, isTest: Boolean) private fun dependencies(project: Project, context: KobaltContext, isTest: Boolean)
: List<IClasspathDependency> { : List<IClasspathDependency> {
val transitive = hashSetOf<IClasspathDependency>() val transitive = hashSetOf<IClasspathDependency>()
val projects = listOf(ProjectDescription(project, project.projectExtra.dependsOn))
with(project) { with(project) {
val deps = arrayListOf(compileDependencies, compileProvidedDependencies, val deps = arrayListOf(compileDependencies, compileProvidedDependencies,
context.variant.buildType.compileDependencies, context.variant.buildType.compileDependencies,
@ -202,15 +199,20 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
deps.add(testProvidedDependencies) deps.add(testProvidedDependencies)
} }
deps.filter { it.any() }.forEach { deps.filter { it.any() }.forEach {
transitive.addAll(calculateDependencies(project, context, projects, it)) transitive.addAll(calculateDependencies(project, context, it))
} }
} }
// Make sure that classes/ and test-classes/ are always at the top of this classpath, // 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 // so that older versions of that project on the classpath don't shadow them
val result = listOf(FileDependency(KFiles.makeOutputDir(project).absolutePath), val result = arrayListOf<IClasspathDependency>().apply {
FileDependency(KFiles.makeOutputTestDir(project).absolutePath)) + if (isTest) {
reorderDependencies(transitive) add(FileDependency(KFiles.makeOutputDir(project).absolutePath))
add(FileDependency(KFiles.makeOutputTestDir(project).absolutePath))
}
addAll(reorderDependencies(transitive))
}
return result return result
} }

14
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Md5.kt
View file

@ -18,12 +18,18 @@ public class Md5 {
// return DatatypeConverter.printHexBinary(md5.digest()).toLowerCase() // return DatatypeConverter.printHexBinary(md5.digest()).toLowerCase()
// } // }
fun toMd5Directories(directories: List<File>) : String? { /**
val ds = directories.filter { it.exists() } * Calculate a checksum for all the files/directories. The conversion from File to
* bytes can be customized by the @param{toBytes} parameter. The default implementation calculates
* a checksum of the last modified timestamp.
*/
fun toMd5Directories(filesOrDirectories: List<File>,
toBytes: (File) -> ByteArray = { it.lastModified().toString().toByteArray() } ): String? {
val ds = filesOrDirectories.filter { it.exists() }
if (ds.size > 0) { if (ds.size > 0) {
MessageDigest.getInstance("MD5").let { md5 -> MessageDigest.getInstance("MD5").let { md5 ->
var fileCount = 0 var fileCount = 0
directories.filter { it.exists() }.forEach { file -> filesOrDirectories.filter { it.exists() }.forEach { file ->
if (file.isFile) { if (file.isFile) {
val bytes = file.readBytes() val bytes = file.readBytes()
md5.update(bytes, 0, bytes.size) md5.update(bytes, 0, bytes.size)
@ -37,7 +43,7 @@ public class Md5 {
it.isFile it.isFile
}.forEach { }.forEach {
fileCount++ fileCount++
val bytes = it.readBytes() val bytes = toBytes(it)
md5.update(bytes, 0, bytes.size) md5.update(bytes, 0, bytes.size)
} }
} }

24
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Pom.kt
View file

@ -3,11 +3,9 @@ package com.beust.kobalt.maven
import com.beust.kobalt.misc.toString import com.beust.kobalt.misc.toString
import com.beust.kobalt.misc.warn import com.beust.kobalt.misc.warn
import com.google.inject.assistedinject.Assisted import com.google.inject.assistedinject.Assisted
import kotlinx.dom.childElements
import org.w3c.dom.Element import org.w3c.dom.Element
import org.w3c.dom.NodeList import org.w3c.dom.NodeList
import org.xml.sax.InputSource import javax.xml.parsers.DocumentBuilderFactory
import java.io.FileReader
import javax.xml.xpath.XPathConstants import javax.xml.xpath.XPathConstants
class Pom @javax.inject.Inject constructor(@Assisted val id: String, class Pom @javax.inject.Inject constructor(@Assisted val id: String,
@ -66,8 +64,8 @@ class Pom @javax.inject.Inject constructor(@Assisted val id: String,
init { init {
val DEPENDENCIES = XPATH.compile("/project/dependencies/dependency") val DEPENDENCIES = XPATH.compile("/project/dependencies/dependency")
val document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(documentFile)
val document = kotlinx.dom.parseXml(InputSource(FileReader(documentFile)))
groupId = XPATH.compile("/project/groupId").evaluate(document) groupId = XPATH.compile("/project/groupId").evaluate(document)
artifactId = XPATH.compile("/project/artifactId").evaluate(document) artifactId = XPATH.compile("/project/artifactId").evaluate(document)
version = XPATH.compile("/project/version").evaluate(document) version = XPATH.compile("/project/version").evaluate(document)
@ -75,11 +73,12 @@ class Pom @javax.inject.Inject constructor(@Assisted val id: String,
var repositoriesList = XPATH.compile("/project/repositories").evaluate(document, XPathConstants.NODESET) var repositoriesList = XPATH.compile("/project/repositories").evaluate(document, XPathConstants.NODESET)
as NodeList as NodeList
var repoElem = repositoriesList.item(0) as Element? var repoElem = repositoriesList.item(0) as Element?
repositories = repoElem.childElements().map({ it.getElementsByTagName("url").item(0).textContent }) repositories = childElements(repoElem).map({ it.getElementsByTagName("url").item(0)
.textContent })
val propertiesList = XPATH.compile("/project/properties").evaluate(document, XPathConstants.NODESET) as NodeList val propertiesList = XPATH.compile("/project/properties").evaluate(document, XPathConstants.NODESET) as NodeList
var propsElem = propertiesList.item(0) as Element? var propsElem = propertiesList.item(0) as Element?
propsElem.childElements().forEach { childElements(propsElem).forEach {
properties.put(it.nodeName, it.textContent) properties.put(it.nodeName, it.textContent)
} }
@ -111,5 +110,18 @@ class Pom @javax.inject.Inject constructor(@Assisted val id: String,
} }
} }
private fun childElements(repoElem: Element?): List<Element> {
val result = arrayListOf<Element>()
if (repoElem != null) {
for (i in 0..repoElem.childNodes.length - 1) {
val elem = repoElem.childNodes.item(i)
if (elem is Element) {
result.add(elem)
}
}
}
return result
}
override fun toString() = toString("Pom", "id", id) override fun toString() = toString("Pom", "id", id)
} }

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Io.kt
View file

@ -73,7 +73,7 @@ class Io(val dryRun: Boolean = false) {
} }
fun mkdir(dir: File) { fun mkdir(dir: File) {
log("rm -rf $dir") log("mkdir $dir")
if (! dryRun) { if (! dryRun) {
dir.mkdirs() dir.mkdirs()
} }

24
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/JarUtils.kt
View file

@ -9,7 +9,6 @@ import java.util.jar.JarEntry
import java.util.jar.JarFile import java.util.jar.JarFile
import java.util.jar.JarInputStream import java.util.jar.JarInputStream
import java.util.zip.ZipEntry import java.util.zip.ZipEntry
import java.util.zip.ZipException
import java.util.zip.ZipFile import java.util.zip.ZipFile
import java.util.zip.ZipOutputStream import java.util.zip.ZipOutputStream
@ -48,27 +47,14 @@ public class JarUtils {
} }
if (foundFile.isDirectory) { if (foundFile.isDirectory) {
log(2, "Writing contents of directory $foundFile") log(2, " Writing contents of directory $foundFile")
// Directory // Directory
var name = foundFile.name val includedFile = IncludedFile(From(""), To(""), listOf(IFileSpec.GlobSpec("**")))
if (!name.isEmpty()) { addSingleFile(localFile.path, includedFile, outputStream, expandJarFiles)
if (!name.endsWith("/")) name += "/"
val entry = JarEntry(name)
entry.time = foundFile.lastModified()
try {
outputStream.putNextEntry(entry)
} catch(ex: ZipException) {
log(2, "Can't add $name: ${ex.message}")
} finally {
outputStream.closeEntry()
}
}
val includedFile = IncludedFile(From(foundFile.path), To(""), listOf(IFileSpec.GlobSpec("**")))
addSingleFile(".", includedFile, outputStream, expandJarFiles)
} else { } else {
if (file.expandJarFiles && foundFile.name.endsWith(".jar") && ! file.from.contains("resources")) { if (file.expandJarFiles && foundFile.name.endsWith(".jar") && ! file.from.contains("resources")) {
log(2, "Writing contents of jar file $foundFile") log(2, " Writing contents of jar file $foundFile")
val stream = JarInputStream(FileInputStream(localFile)) val stream = JarInputStream(FileInputStream(localFile))
var entry = stream.nextEntry var entry = stream.nextEntry
while (entry != null) { while (entry != null) {
@ -81,7 +67,7 @@ public class JarUtils {
} else { } else {
val entryFileName = file.to(foundFile.path).path.replace("\\", "/") val entryFileName = file.to(foundFile.path).path.replace("\\", "/")
val entry = JarEntry(entryFileName) val entry = JarEntry(entryFileName)
entry.time = foundFile.lastModified() entry.time = localFile.lastModified()
addEntry(FileInputStream(localFile), entry, outputStream, onError) addEntry(FileInputStream(localFile), entry, outputStream, onError)
} }
} }

13
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Topological.kt
View file

@ -10,22 +10,25 @@ import java.util.*
*/ */
class Topological<T> { class Topological<T> {
private val dependingOn = ArrayListMultimap.create<T, T>() private val dependingOn = ArrayListMultimap.create<T, T>()
private val nodes = hashSetOf<T>()
fun addNode(t: T) = nodes.add(t)
fun addEdge(t: T, other: T) { fun addEdge(t: T, other: T) {
addNode(t)
addNode(other)
dependingOn.put(t, other) dependingOn.put(t, other)
} }
fun addEdge(t: T, others: Array<out T>) {
dependingOn.putAll(t, others.toMutableList())
}
/** /**
* @return the Ts sorted topologically. * @return the Ts sorted topologically.
*/ */
fun sort(all: ArrayList<T>) : List<T> { fun sort() : List<T> {
val all = ArrayList<T>(nodes)
val result = arrayListOf<T>() val result = arrayListOf<T>()
var dependMap = HashMultimap.create<T, T>() var dependMap = HashMultimap.create<T, T>()
dependingOn.keySet().forEach { dependMap.putAll(it, dependingOn.get(it))} dependingOn.keySet().forEach { dependMap.putAll(it, dependingOn.get(it))}
nodes.forEach { dependMap.putAll(it, emptyList())}
while (all.size > 0) { while (all.size > 0) {
val freeNodes = all.filter { val freeNodes = all.filter {
dependMap.get(it).isEmpty() dependMap.get(it).isEmpty()

2
src/main/kotlin/com/beust/kobalt/Main.kt
View file

@ -115,7 +115,7 @@ private class Main @Inject constructor(
val seconds = benchmarkSeconds { val seconds = benchmarkSeconds {
try { try {
result = runWithArgs(jc, args, argv, pluginClassLoader) result = runWithArgs(jc, args, argv, pluginClassLoader)
} catch(ex: KobaltException) { } catch(ex: Throwable) {
error("", ex.cause ?: ex) error("", ex.cause ?: ex)
result = 1 result = 1
} }

5
src/main/kotlin/com/beust/kobalt/app/BuildScriptUtil.kt
View file

@ -20,7 +20,6 @@ import java.io.InputStream
import java.lang.reflect.Modifier import java.lang.reflect.Modifier
import java.net.URL import java.net.URL
import java.net.URLClassLoader import java.net.URLClassLoader
import java.util.*
import java.util.jar.JarInputStream import java.util.jar.JarInputStream
class BuildScriptUtil @Inject constructor(val plugins: Plugins, val files: KFiles, class BuildScriptUtil @Inject constructor(val plugins: Plugins, val files: KFiles,
@ -113,14 +112,14 @@ class BuildScriptUtil @Inject constructor(val plugins: Plugins, val files: KFile
context.pluginInfo.projectContributors.forEach { contributor -> context.pluginInfo.projectContributors.forEach { contributor ->
val descriptions = contributor.projects() val descriptions = contributor.projects()
descriptions.forEach { pd -> descriptions.forEach { pd ->
all.add(pd.project) topologicalProjects.addNode(pd.project)
pd.dependsOn.forEach { dependsOn -> pd.dependsOn.forEach { dependsOn ->
topologicalProjects.addEdge(pd.project, dependsOn) topologicalProjects.addEdge(pd.project, dependsOn)
all.add(dependsOn) all.add(dependsOn)
} }
} }
} }
val result = topologicalProjects.sort(ArrayList(all)) val result = topologicalProjects.sort()
return result return result
} }

3
src/main/kotlin/com/beust/kobalt/app/LanguageTemplateGenerator.kt
View file

@ -3,7 +3,6 @@ package com.beust.kobalt.app
import com.beust.kobalt.Args import com.beust.kobalt.Args
import com.beust.kobalt.api.ITemplate import com.beust.kobalt.api.ITemplate
import com.beust.kobalt.api.ITemplateContributor import com.beust.kobalt.api.ITemplateContributor
import com.beust.kobalt.app.Mustache
import com.beust.kobalt.maven.Pom import com.beust.kobalt.maven.Pom
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
@ -85,7 +84,7 @@ abstract class LanguageTemplateGenerator : ITemplate {
private fun importPom(pomFile: File, mainDeps: ArrayList<Pom.Dependency>, testDeps: ArrayList<Pom.Dependency>, private fun importPom(pomFile: File, mainDeps: ArrayList<Pom.Dependency>, testDeps: ArrayList<Pom.Dependency>,
map: HashMap<String, Any?>) { map: HashMap<String, Any?>) {
var pom = Pom("imported", pomFile.absoluteFile) val pom = Pom("imported", pomFile.absoluteFile)
with(map) { with(map) {
put("group", pom.groupId ?: PACKAGE_NAME) put("group", pom.groupId ?: PACKAGE_NAME)
put("artifactId", pom.artifactId ?: PACKAGE_NAME) put("artifactId", pom.artifactId ?: PACKAGE_NAME)

17
src/main/kotlin/com/beust/kobalt/app/remote/DependencyData.kt
View file

@ -36,6 +36,8 @@ class DependencyData @Inject constructor(val executors: KobaltExecutors, val dep
val pluginDependencies = projectResult.pluginUrls.map { File(it.toURI()) }.map { val pluginDependencies = projectResult.pluginUrls.map { File(it.toURI()) }.map {
FileDependency(it.absolutePath) FileDependency(it.absolutePath)
} }
val allTasks = hashSetOf<TaskData>()
projectResult.projects.forEach { project -> projectResult.projects.forEach { project ->
val compileDependencies = pluginDependencies.map { toDependencyData(it, "compile") } + val compileDependencies = pluginDependencies.map { toDependencyData(it, "compile") } +
allDeps(project.compileDependencies).map { toDependencyData(it, "compile") } + allDeps(project.compileDependencies).map { toDependencyData(it, "compile") } +
@ -55,15 +57,16 @@ class DependencyData @Inject constructor(val executors: KobaltExecutors, val dep
// Separate resource from source directories // Separate resource from source directories
val sources = project.sourceDirectories.partition { KFiles.isResource(it) } val sources = project.sourceDirectories.partition { KFiles.isResource(it) }
val tests = project.sourceDirectoriesTest.partition { KFiles.isResource(it) } val tests = project.sourceDirectoriesTest.partition { KFiles.isResource(it) }
val allTasks = taskManager.tasksByNames(project).values().map { val projectTasks = taskManager.tasksByNames(project).values().map {
TaskData(it.name, it.doc, it.group) TaskData(it.name, it.doc, it.group)
} }
allTasks.addAll(projectTasks)
projectDatas.add(ProjectData(project.name, project.directory, dependentProjects, projectDatas.add(ProjectData(project.name, project.directory, dependentProjects,
compileDependencies, testDependencies, compileDependencies, testDependencies,
sources.second.toSet(), tests.second.toSet(), sources.first.toSet(), tests.first.toSet(), sources.second.toSet(), tests.second.toSet(), sources.first.toSet(), tests.first.toSet(),
allTasks)) projectTasks))
} }
return GetDependenciesData(projectDatas, projectResult.taskResult.errorMessage) return GetDependenciesData(projectDatas, allTasks, projectResult.taskResult.errorMessage)
} }
///// /////
@ -72,7 +75,9 @@ class DependencyData @Inject constructor(val executors: KobaltExecutors, val dep
// //
class DependencyData(val id: String, val scope: String, val path: String) class DependencyData(val id: String, val scope: String, val path: String)
class TaskData(val name: String, val description: String, val group: String) data class TaskData(val name: String, val description: String, val group: String) {
override fun toString() = name
}
class ProjectData(val name: String, val directory: String, class ProjectData(val name: String, val directory: String,
val dependentProjects: List<String>, val dependentProjects: List<String>,
@ -81,5 +86,7 @@ class DependencyData @Inject constructor(val executors: KobaltExecutors, val dep
val sourceResourceDirs: Set<String>, val testResourceDirs: Set<String>, val sourceResourceDirs: Set<String>, val testResourceDirs: Set<String>,
val tasks: Collection<TaskData>) val tasks: Collection<TaskData>)
class GetDependenciesData(val projects: List<ProjectData>, val errorMessage: String?) class GetDependenciesData(val projects: List<ProjectData> = emptyList(),
val allTasks: Collection<TaskData> = emptySet(),
val errorMessage: String?)
} }

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

@ -17,6 +17,7 @@ import okhttp3.OkHttpClient
import retrofit2.Call import retrofit2.Call
import retrofit2.Retrofit import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory import retrofit2.converter.gson.GsonConverterFactory
import retrofit2.http.GET
import retrofit2.http.POST import retrofit2.http.POST
import retrofit2.http.Query import retrofit2.http.Query
import java.io.* import java.io.*
@ -31,7 +32,10 @@ fun main(argv: Array<String>) {
} }
interface Api { interface Api {
@POST("/getDependencies") @GET("/ping")
fun ping() : Call<String>
@POST("/v0/getDependencies")
fun getDependencies(@Query("buildFile") buildFile: String) : Call<List<DependencyData.GetDependenciesData>> fun getDependencies(@Query("buildFile") buildFile: String) : Call<List<DependencyData.GetDependenciesData>>
} }
@ -40,16 +44,25 @@ class KobaltClient : Runnable {
private val service = Retrofit.Builder() private val service = Retrofit.Builder()
.client(OkHttpClient.Builder().build()) .client(OkHttpClient.Builder().build())
.baseUrl("http://localhost:1252") .baseUrl("http://localhost:1238")
.addConverterFactory(GsonConverterFactory.create()) .addConverterFactory(GsonConverterFactory.create())
.build() .build()
.create(Api::class.java) .create(Api::class.java)
override fun run() { override fun run() {
// val pong = service.ping().execute()
// println("Result from ping: " + pong)
val buildFile = Paths.get(SystemProperties.homeDir, "kotlin/klaxon/kobalt/src/Build.kt").toString() val buildFile = Paths.get(SystemProperties.homeDir, "kotlin/klaxon/kobalt/src/Build.kt").toString()
val dependencies = service.getDependencies(buildFile) val dependencies = service.getDependencies(buildFile)
val results = dependencies.execute() val response = dependencies.execute()
println("Dependencies: $results") if (response.isSuccessful) {
println("Dependencies: $response")
} else {
println("Error calling getDependencies: " + response.errorBody().string())
}
println("")
} }
} }

8
src/main/kotlin/com/beust/kobalt/app/remote/SparkServer.kt
View file

@ -36,7 +36,7 @@ class SparkServer(val initCallback: (String) -> List<Project>, val cleanUpCallba
override fun run(port: Int) { override fun run(port: Int) {
Spark.port(port) Spark.port(port)
Spark.get("/ping", { req, res -> KobaltServer.OK }) Spark.get("/ping", { req, res -> """ { "result" : "ok" } """ })
Spark.get("/quit", { req, res -> Spark.get("/quit", { req, res ->
Executors.newFixedThreadPool(1).let { executor -> Executors.newFixedThreadPool(1).let { executor ->
executor.submit { executor.submit {
@ -58,13 +58,13 @@ class SparkServer(val initCallback: (String) -> List<Project>, val cleanUpCallba
dependencyData.dependenciesDataFor(buildFile, args) dependencyData.dependenciesDataFor(buildFile, args)
} catch(ex: Exception) { } catch(ex: Exception) {
DependencyData.GetDependenciesData(emptyList<DependencyData.ProjectData>(), ex.message) DependencyData.GetDependenciesData(errorMessage = ex.message)
} finally { } finally {
cleanUpCallback() cleanUpCallback()
} }
} else { } else {
DependencyData.GetDependenciesData(emptyList<DependencyData.ProjectData>(), DependencyData.GetDependenciesData(
"buildFile wasn't passed in the query parameter") errorMessage = "buildFile wasn't passed in the query parameter")
} }
cleanUpCallback() cleanUpCallback()
result result

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

@ -7,12 +7,11 @@ import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.archive.Archives import com.beust.kobalt.archive.Archives
import com.beust.kobalt.archive.Jar import com.beust.kobalt.archive.Jar
import com.beust.kobalt.internal.ActorUtils import com.beust.kobalt.internal.ActorUtils
import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.RunCommand import com.beust.kobalt.misc.RunCommand
import com.beust.kobalt.misc.warn import com.beust.kobalt.misc.log
import com.beust.kobalt.plugin.packaging.PackageConfig import com.beust.kobalt.plugin.packaging.PackageConfig
import com.beust.kobalt.plugin.packaging.PackagingPlugin import com.beust.kobalt.plugin.packaging.PackagingPlugin
import com.google.inject.Inject import com.google.inject.Inject
@ -60,7 +59,7 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
if (runContributor != null && runContributor.affinity(project, context) > 0) { if (runContributor != null && runContributor.affinity(project, context) > 0) {
return runContributor.run(project, context, dependencyManager.dependencies(project, context)) return runContributor.run(project, context, dependencyManager.dependencies(project, context))
} else { } else {
warn("Couldn't find a runner for project ${project.name}. Please make sure your build file contains " + log(2, "Couldn't find a runner for project ${project.name}. Please make sure your build file contains " +
"an application{} directive with a mainClass=... in it") "an application{} directive with a mainClass=... in it")
return TaskResult() return TaskResult()
} }
@ -106,12 +105,10 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
val java = JavaInfo.create(File(SystemProperties.javaBase)).javaExecutable!! val java = JavaInfo.create(File(SystemProperties.javaBase)).javaExecutable!!
if (! isFatJar(packages, jarName)) { if (! isFatJar(packages, jarName)) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val projDeps = project.projectProperties.get(JvmCompilerPlugin.DEPENDENT_PROJECTS)
as List<ProjectDescription>
// If the jar file is not fat, we need to add the transitive closure of all dependencies // If the jar file is not fat, we need to add the transitive closure of all dependencies
// on the classpath // on the classpath
val allTheDependencies = val allTheDependencies =
dependencyManager.calculateDependencies(project, context, projDeps, dependencyManager.calculateDependencies(project, context,
allDependencies = project.compileDependencies).map { it.jarFile.get().path } allDependencies = project.compileDependencies).map { it.jarFile.get().path }
allDeps.addAll(allTheDependencies) allDeps.addAll(allTheDependencies)
} }
@ -130,6 +127,6 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
} }
//ITaskContributor //ITaskContributor
override fun tasksFor(context: KobaltContext): List<DynamicTask> = taskContributor.dynamicTasks override fun tasksFor(project: Project, context: KobaltContext): List<DynamicTask> = taskContributor.dynamicTasks
} }

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

@ -2,12 +2,16 @@ package com.beust.kobalt.plugin.apt
import com.beust.kobalt.api.* import com.beust.kobalt.api.*
import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.internal.ActorUtils
import com.beust.kobalt.internal.CompilerUtils
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.google.common.collect.ArrayListMultimap import com.google.common.collect.ArrayListMultimap
import com.google.inject.Inject import com.google.inject.Inject
import java.io.File import java.io.File
import java.nio.file.Files
import java.util.*
import javax.inject.Singleton import javax.inject.Singleton
/** /**
@ -18,19 +22,25 @@ import javax.inject.Singleton
* (outputDir, etc...). * (outputDir, etc...).
*/ */
@Singleton @Singleton
class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, val configActor: ConfigActor<AptConfig>) class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, val compilerUtils: CompilerUtils)
: BasePlugin(), ICompilerFlagContributor, ISourceDirectoryContributor, IConfigActor<AptConfig> by configActor { : BasePlugin(), ICompilerFlagContributor, ISourceDirectoryContributor, ITaskContributor {
// ISourceDirectoryContributor // ISourceDirectoryContributor
override fun sourceDirectoriesFor(project: Project, context: KobaltContext): List<File> { override fun sourceDirectoriesFor(project: Project, context: KobaltContext): List<File> {
val config = configurationFor(project) val result = arrayListOf<File>()
val result = aptConfigs[project.name]?.let { config ->
if (config != null) { result.add(File(
listOf(File( KFiles.joinDir(project.directory,
KFiles.joinDir(KFiles.KOBALT_BUILD_DIR, config.outputDir, context.variant.toIntermediateDir()))) KFiles.KOBALT_BUILD_DIR,
} else { config.outputDir)))
emptyList() }
kaptConfigs[project.name]?.let { config ->
result.add(File(
KFiles.joinDir(project.directory,
KFiles.KOBALT_BUILD_DIR,
config.outputDir)))
} }
return result return result
@ -38,10 +48,56 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
companion object { companion object {
const val PLUGIN_NAME = "Apt" const val PLUGIN_NAME = "Apt"
const val KAPT_CONFIG = "kaptConfig"
const val APT_CONFIG = "aptConfig"
} }
override val name = PLUGIN_NAME override val name = PLUGIN_NAME
override fun apply(project: Project, context: KobaltContext) {
}
// ITaskContributor
override fun tasksFor(project: Project, context: KobaltContext) : List<DynamicTask> {
// val kapt = kaptConfigs[project.name]
// if (kapt != null) {
// return listOf(DynamicTask(this, "kapt", "Run kapt", project = project,
// reverseDependsOn = listOf(JvmCompilerPlugin.TASK_COMPILE),
// group = AnnotationDefault.GROUP,
// closure = { project ->
// runApt(project, context)
// TaskResult()
// }))
// } else {
return emptyList()
// }
//
}
private fun runApt(project: Project, context: KobaltContext) {
val kapt = kaptConfigs[project.name]
if (kapt != null) {
val sourceDir = Files.createTempDirectory("kobalt").toFile()
val javaFile = File(sourceDir, "A.java").apply {
appendText("class A {}")
}
val compilerContributors = context.pluginInfo.compilerContributors
ActorUtils.selectAffinityActors(project, context,
context.pluginInfo.compilerContributors)
val allCompilers = compilerContributors.flatMap { it.compilersFor(project, context) }.sorted()
val javaCompiler = allCompilers.filter { it.sourceSuffixes.contains("java") }[0]
val dependencies = dependencyManager.calculateDependencies(project, context)
val info = CompilerActionInfo(sourceDir.absolutePath, dependencies,
listOf(javaFile.absolutePath), listOf("java"), File(sourceDir, "generated"),
listOf())
val results = compilerUtils.invokeCompiler(project, context, javaCompiler, info)
}
}
private fun generated(project: Project, context: KobaltContext, outputDir: String) = private fun generated(project: Project, context: KobaltContext, outputDir: String) =
KFiles.joinAndMakeDir(project.directory, project.buildDirectory, outputDir, KFiles.joinAndMakeDir(project.directory, project.buildDirectory, outputDir,
context.variant.toIntermediateDir()) context.variant.toIntermediateDir())
@ -52,20 +108,23 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
if (!suffixesBeingCompiled.contains("java")) return emptyList() if (!suffixesBeingCompiled.contains("java")) return emptyList()
val result = arrayListOf<String>() val result = arrayListOf<String>()
configurationFor(project)?.let { config ->
fun addFlags(outputDir: String) {
aptDependencies[project.name]?.let { aptDependencies -> aptDependencies[project.name]?.let { aptDependencies ->
val deps = aptDependencies.map { dependencyManager.create(it) }
val dependencies = context.dependencyManager.calculateDependencies(null, context, emptyList(), deps)
.map { it.jarFile.get().path }
result.add("-processorpath")
result.add((dependencies).joinToString(":"))
result.add("-s") result.add("-s")
result.add(generated(project, context, config.outputDir)) result.add(generated(project, context, outputDir))
} }
}
aptConfigs[project.name]?.let { config ->
addFlags(config.outputDir)
}
kaptConfigs[project.name]?.let { config ->
addFlags(config.outputDir)
}
log(2, "New flags from apt: " + result.joinToString(" ")) log(2, "New flags from apt: " + result.joinToString(" "))
}
return result return result
} }
@ -74,15 +133,28 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
fun addAptDependency(dependencies: Dependencies, it: String) { fun addAptDependency(dependencies: Dependencies, it: String) {
aptDependencies.put(dependencies.project.name, it) aptDependencies.put(dependencies.project.name, it)
} }
private val aptConfigs: HashMap<String, AptConfig> = hashMapOf()
private val kaptConfigs: HashMap<String, KaptConfig> = hashMapOf()
fun addAptConfig(project: Project, kapt: AptConfig) {
project.projectProperties.put(APT_CONFIG, kapt)
aptConfigs.put(project.name, kapt)
}
fun addKaptConfig(project: Project, kapt: KaptConfig) {
project.projectProperties.put(KAPT_CONFIG, kapt)
kaptConfigs.put(project.name, kapt)
}
} }
class AptConfig(var outputDir: String = "generated/source/apt") class AptConfig(var outputDir: String = "generated/source/apt")
@Directive @Directive
public fun Project.apt(init: AptConfig.() -> Unit) { fun Project.apt(init: AptConfig.() -> Unit) {
AptConfig().let { AptConfig().let {
it.init() it.init()
(Kobalt.findPlugin(AptPlugin.PLUGIN_NAME) as AptPlugin).addConfiguration(this, it) (Kobalt.findPlugin(AptPlugin.PLUGIN_NAME) as AptPlugin).addAptConfig(this, it)
} }
} }
@ -92,3 +164,13 @@ fun Dependencies.apt(vararg dep: String) {
(Kobalt.findPlugin(AptPlugin.PLUGIN_NAME) as AptPlugin).addAptDependency(this, it) (Kobalt.findPlugin(AptPlugin.PLUGIN_NAME) as AptPlugin).addAptDependency(this, it)
} }
} }
class KaptConfig(var outputDir: String = "generated/source/apt")
@Directive
fun Project.kapt(init: KaptConfig.() -> Unit) {
KaptConfig().let {
it.init()
(Kobalt.findPlugin(AptPlugin.PLUGIN_NAME) as AptPlugin).addKaptConfig(this, it)
}
}

25
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
View file

@ -5,6 +5,7 @@ import com.beust.kobalt.api.*
import com.beust.kobalt.internal.ICompilerAction import com.beust.kobalt.internal.ICompilerAction
import com.beust.kobalt.internal.JvmCompiler import com.beust.kobalt.internal.JvmCompiler
import com.beust.kobalt.internal.KobaltSettings import com.beust.kobalt.internal.KobaltSettings
import com.beust.kobalt.internal.KotlinJarFiles
import com.beust.kobalt.kotlin.ParentLastClassLoader import com.beust.kobalt.kotlin.ParentLastClassLoader
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.maven.dependency.FileDependency
@ -34,7 +35,8 @@ class KotlinCompiler @Inject constructor(
val dependencyManager: DependencyManager, val dependencyManager: DependencyManager,
val executors: KobaltExecutors, val executors: KobaltExecutors,
val settings: KobaltSettings, val settings: KobaltSettings,
val jvmCompiler: JvmCompiler) { val jvmCompiler: JvmCompiler,
val kotlinJarFiles: KotlinJarFiles) {
val compilerAction = object: ICompilerAction { val compilerAction = object: ICompilerAction {
override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult { override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult {
@ -88,19 +90,18 @@ class KotlinCompiler @Inject constructor(
log(2, "Calling kotlinc " + allArgs.joinToString(" ")) log(2, "Calling kotlinc " + allArgs.joinToString(" "))
val result : TaskResult = val result : TaskResult =
if (true) { if (true) {
val classLoader = ParentLastClassLoader(cp.map { it.toURI().toURL() })
val compiler = classLoader.loadClass("org.jetbrains.kotlin.cli.common.CLICompiler")
val compilerMain = compiler.declaredMethods.filter {
it.name == "doMainNoExit" && it.parameterTypes.size == 2
}[0]
val kCompiler = classLoader.loadClass("org.jetbrains.kotlin.cli.jvm.K2JVMCompiler")
// //
// In order to capture the error stream, I need to invoke CLICompiler.exec(), which // In order to capture the error stream, I need to invoke CLICompiler.exec(), which
// is the first method that accepts a PrintStream for the errors in parameter // is the first method that accepts a PrintStream for the errors in parameter
// //
val baos = ByteArrayOutputStream() ByteArrayOutputStream().use { baos ->
val ps = PrintStream(baos) val compilerJar = listOf(kotlinJarFiles.compiler.toURI().toURL())
val classLoader = ParentLastClassLoader(compilerJar)
val compiler = classLoader.loadClass("org.jetbrains.kotlin.cli.common.CLICompiler")
val kCompiler = classLoader.loadClass("org.jetbrains.kotlin.cli.jvm.K2JVMCompiler")
PrintStream(baos).use { ps ->
val execMethod = compiler.declaredMethods.filter { val execMethod = compiler.declaredMethods.filter {
it.name == "exec" && it.parameterTypes.size == 2 it.name == "exec" && it.parameterTypes.size == 2
}[0] }[0]
@ -111,6 +112,8 @@ class KotlinCompiler @Inject constructor(
val nameMethod = exitCode.javaClass.getMethod("name") val nameMethod = exitCode.javaClass.getMethod("name")
val success = "OK" == nameMethod.invoke(exitCode).toString() val success = "OK" == nameMethod.invoke(exitCode).toString()
TaskResult(success, errorString) TaskResult(success, errorString)
}
}
} else { } else {
val exitCode = CLICompiler.doMainNoExit(K2JVMCompiler(), allArgs.toTypedArray()) val exitCode = CLICompiler.doMainNoExit(K2JVMCompiler(), allArgs.toTypedArray())
TaskResult(exitCode == ExitCode.OK) TaskResult(exitCode == ExitCode.OK)
@ -161,7 +164,7 @@ class KotlinCompiler @Inject constructor(
} }
class KConfiguration @Inject constructor(val compiler: KotlinCompiler){ class KConfiguration @Inject constructor(val compiler: KotlinCompiler){
val classpath = arrayListOf<String>() private val classpath = arrayListOf<String>()
val dependencies = arrayListOf<IClasspathDependency>() val dependencies = arrayListOf<IClasspathDependency>()
var source = arrayListOf<String>() var source = arrayListOf<String>()
var output: File by Delegates.notNull() var output: File by Delegates.notNull()

8
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
View file

@ -7,6 +7,7 @@ import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.internal.BaseJvmPlugin import com.beust.kobalt.internal.BaseJvmPlugin
import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.internal.KobaltSettings import com.beust.kobalt.internal.KobaltSettings
import com.beust.kobalt.internal.KotlinJarFiles
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.maven.dependency.FileDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
@ -19,7 +20,8 @@ import javax.inject.Singleton
@Singleton @Singleton
class KotlinPlugin @Inject constructor(val executors: KobaltExecutors, val dependencyManager: DependencyManager, class KotlinPlugin @Inject constructor(val executors: KobaltExecutors, val dependencyManager: DependencyManager,
val settings: KobaltSettings, override val configActor: ConfigActor<KotlinConfig>) val settings: KobaltSettings, override val configActor: ConfigActor<KotlinConfig>,
val kotlinJarFiles: KotlinJarFiles)
: BaseJvmPlugin<KotlinConfig>(configActor), IDocContributor, IClasspathContributor, ICompilerContributor, IBuildConfigContributor { : BaseJvmPlugin<KotlinConfig>(configActor), IDocContributor, IClasspathContributor, ICompilerContributor, IBuildConfigContributor {
companion object { companion object {
@ -105,8 +107,8 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors, val depen
override fun classpathEntriesFor(project: Project?, context: KobaltContext): List<IClasspathDependency> = override fun classpathEntriesFor(project: Project?, context: KobaltContext): List<IClasspathDependency> =
if (project == null || accept(project)) { if (project == null || accept(project)) {
// All Kotlin projects automatically get the Kotlin runtime added to their class path // All Kotlin projects automatically get the Kotlin runtime added to their class path
listOf(getKotlinCompilerJar("kotlin-stdlib"), getKotlinCompilerJar("kotlin-runtime")) listOf(kotlinJarFiles.stdlib, kotlinJarFiles.runtime)
.map { FileDependency(it) } .map { FileDependency(it.absolutePath) }
} else { } else {
emptyList() emptyList()
} }

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

@ -67,13 +67,16 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
* skipped. * skipped.
*/ */
override fun assemble(project: Project, context: KobaltContext) : IncrementalTaskInfo { override fun assemble(project: Project, context: KobaltContext) : IncrementalTaskInfo {
return IncrementalTaskInfo({ null }, { null }, { project -> return IncrementalTaskInfo(
{ null },
{ null },
{ project ->
try { try {
packages.filter { it.project.name == project.name }.forEach { pkg -> packages.filter { it.project.name == project.name }.forEach { packageConfig ->
pkg.jars.forEach { jarGenerator.generateJar(pkg.project, context, it) } packageConfig.jars.forEach { jarGenerator.generateJar(packageConfig.project, context, it) }
pkg.wars.forEach { warGenerator.generateWar(pkg.project, context, it) } packageConfig.wars.forEach { warGenerator.generateWar(packageConfig.project, context, it) }
pkg.zips.forEach { zipGenerator.generateZip(pkg.project, context, it) } packageConfig.zips.forEach { zipGenerator.generateZip(packageConfig.project, context, it) }
if (pkg.generatePom) { if (packageConfig.generatePom) {
pomFactory.create(project).generate() pomFactory.create(project).generate()
} }
} }
@ -118,8 +121,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
val analyzer = Analyzer().apply { val analyzer = Analyzer().apply {
jar = aQute.bnd.osgi.Jar(project.projectProperties.get(Archives.JAR_NAME) as String) jar = aQute.bnd.osgi.Jar(project.projectProperties.get(Archives.JAR_NAME) as String)
val dependencies = project.compileDependencies + project.compileRuntimeDependencies val dependencies = project.compileDependencies + project.compileRuntimeDependencies
val dependentProjects = project.dependentProjects dependencyManager.calculateDependencies(project, context, dependencies).forEach {
dependencyManager.calculateDependencies(project, context, dependentProjects, dependencies).forEach {
addClasspath(it.jarFile.get()) addClasspath(it.jarFile.get())
} }
setProperty(Analyzer.BUNDLE_VERSION, project.version) setProperty(Analyzer.BUNDLE_VERSION, project.version)
@ -152,7 +154,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
} }
//ITaskContributor //ITaskContributor
override fun tasksFor(context: KobaltContext): List<DynamicTask> = taskContributor.dynamicTasks override fun tasksFor(project: Project, context: KobaltContext): List<DynamicTask> = taskContributor.dynamicTasks
} }
@Directive @Directive

9
src/main/kotlin/com/beust/kobalt/plugin/packaging/WarGenerator.kt
View file

@ -1,13 +1,12 @@
package com.beust.kobalt.plugin.packaging package com.beust.kobalt.plugin.packaging
import com.beust.kobalt.archive.Archives
import com.beust.kobalt.IFileSpec import com.beust.kobalt.IFileSpec
import com.beust.kobalt.JarGenerator import com.beust.kobalt.JarGenerator
import com.beust.kobalt.archive.War
import com.beust.kobalt.api.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.api.ProjectDescription import com.beust.kobalt.archive.Archives
import com.beust.kobalt.archive.War
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.misc.From import com.beust.kobalt.misc.From
import com.beust.kobalt.misc.IncludedFile import com.beust.kobalt.misc.IncludedFile
@ -40,9 +39,7 @@ class WarGenerator @Inject constructor(val dependencyManager: DependencyManager)
// The transitive closure of libraries goes into WEB-INF/libs. // The transitive closure of libraries goes into WEB-INF/libs.
// Copy them all in kobaltBuild/war/WEB-INF/libs and create one IncludedFile out of that directory // Copy them all in kobaltBuild/war/WEB-INF/libs and create one IncludedFile out of that directory
// //
val dependentProjects = listOf(ProjectDescription(project, project.projectExtra.dependsOn)) val allDependencies = dependencyManager.calculateDependencies(project, context, project.compileDependencies)
val allDependencies = dependencyManager.calculateDependencies(project, context, dependentProjects,
project.compileDependencies)
val outDir = project.buildDirectory + "/war" val outDir = project.buildDirectory + "/war"
val fullDir = outDir + "/" + LIB val fullDir = outDir + "/" + LIB

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

@ -6,26 +6,35 @@ import com.beust.kobalt.api.Project
import com.beust.kobalt.maven.Gpg import com.beust.kobalt.maven.Gpg
import com.beust.kobalt.maven.Http import com.beust.kobalt.maven.Http
import com.beust.kobalt.maven.Md5 import com.beust.kobalt.maven.Md5
import com.beust.kobalt.misc.CountingFileRequestBody
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.error import com.beust.kobalt.misc.error
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.beust.kobalt.misc.warn import com.beust.kobalt.misc.warn
import com.google.gson.Gson
import com.google.gson.JsonArray import com.google.gson.JsonArray
import com.google.gson.JsonObject import com.google.gson.JsonObject
import com.google.gson.JsonParser import com.google.gson.TypeAdapter
import com.google.gson.reflect.TypeToken
import com.google.inject.assistedinject.Assisted import com.google.inject.assistedinject.Assisted
import okhttp3.* import okhttp3.Credentials
import okhttp3.Interceptor
import okhttp3.OkHttpClient
import okhttp3.RequestBody
import okhttp3.ResponseBody
import retrofit2.Call import retrofit2.Call
import retrofit2.Converter
import retrofit2.Retrofit import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory import retrofit2.http.Body
import retrofit2.http.* import retrofit2.http.GET
import retrofit2.http.Headers import retrofit2.http.POST
import retrofit2.http.PUT
import retrofit2.http.Path
import java.io.File import java.io.File
import java.lang.reflect.Type
import javax.annotation.Nullable import javax.annotation.Nullable
import javax.inject.Inject import javax.inject.Inject
class BintrayResponse()
class BintrayApi @Inject constructor(val http: Http, class BintrayApi @Inject constructor(val http: Http,
@Nullable @Assisted("username") val username: String?, @Nullable @Assisted("username") val username: String?,
@Nullable @Assisted("password") val password: String?, @Nullable @Assisted("password") val password: String?,
@ -34,7 +43,6 @@ class BintrayApi @Inject constructor(val http: Http,
companion object { companion object {
const val BINTRAY_URL_API = "https://api.bintray.com" const val BINTRAY_URL_API = "https://api.bintray.com"
const val BINTRAY_URL_API_CONTENT = BINTRAY_URL_API + "/content"
} }
interface IFactory { interface IFactory {
@ -52,28 +60,15 @@ class BintrayApi @Inject constructor(val http: Http,
fun createPackage(@Path("owner") owner: String, fun createPackage(@Path("owner") owner: String,
@Body content: JsonObject): Call<BintrayResponse> @Body content: JsonObject): Call<BintrayResponse>
@Multipart @PUT("/content/{owner}/maven/{repo}/{version}/{group}/{artifact}/{version}/{name};publish={publish}")
@Headers("Content-Type: application/xml")
@PUT("/content/{owner}/maven/{repo}/{version}/{group}/{artifact}/{version}/{name}")
fun uploadPom(@Path("owner") owner: String,
@Path("repo") repo: String,
@Path("group", encoded = true) group: String,
@Path("artifact") artifact: String,
@Path("version") version: String,
@Path("name") name: String,
@Part file: MultipartBody.Part): Call<BintrayResponse>
@Multipart
@PUT("/content/{owner}/maven/{repo}/{version}/{group}/{artifact}/{version}/{name}")
fun uploadArtifact(@Path("owner") owner: String, fun uploadArtifact(@Path("owner") owner: String,
@Path("repo") repo: String, @Path("repo") repo: String,
@Path("group", encoded = true) group: String, @Path("group", encoded = true) group: String,
@Path("artifact") artifact: String, @Path("artifact") artifact: String,
@Path("version") version: String, @Path("version") version: String,
@Path("name") name: String, @Path("name") name: String,
@Part file: MultipartBody.Part): Call<BintrayResponse> @Path("publish") publish: Int,
@Body file: File): Call<BintrayResponse>
} }
private val service: Api private val service: Api
@ -84,7 +79,7 @@ class BintrayApi @Inject constructor(val http: Http,
// level = HttpLoggingInterceptor.Level.BASIC // level = HttpLoggingInterceptor.Level.BASIC
// }) // })
builder.interceptors().add(Interceptor { chain -> builder.interceptors().add(Interceptor { chain ->
var original = chain.request(); val original = chain.request();
chain.proceed(original.newBuilder() chain.proceed(original.newBuilder()
.header("Authorization", Credentials.basic(username, password)) .header("Authorization", Credentials.basic(username, password))
@ -96,7 +91,7 @@ class BintrayApi @Inject constructor(val http: Http,
service = Retrofit.Builder() service = Retrofit.Builder()
.client(okHttpClient) .client(okHttpClient)
.baseUrl(BintrayApi.BINTRAY_URL_API) .baseUrl(BintrayApi.BINTRAY_URL_API)
.addConverterFactory(GsonConverterFactory.create()) .addConverterFactory(ConverterFactory())
.build() .build()
.create(Api::class.java) .create(Api::class.java)
} }
@ -128,18 +123,18 @@ class BintrayApi @Inject constructor(val http: Http,
return jsonObject return jsonObject
} }
fun uploadMaven(project: Project, files: List<File>, config: BintrayConfig?): TaskResult { fun uploadMaven(project: Project, files: List<File>, config: BintrayConfig): TaskResult {
validatePackage(project) validatePackage(project)
return upload(project, files, config, generateMd5 = true) return upload(project, files, config, generateMd5 = true)
} }
fun uploadFile(project: Project, file: File, config: BintrayConfig?, generateMd5: Boolean = false) = fun uploadFile(project: Project, file: File, config: BintrayConfig, generateMd5: Boolean = false) =
upload(project, arrayListOf(file), config, generateMd5) upload(project, arrayListOf(file), config, generateMd5)
private fun upload(project: Project, files: List<File>, config: BintrayConfig?, generateMd5: Boolean = false): TaskResult { private fun upload(project: Project, files: List<File>, config: BintrayConfig, generateMd5: Boolean): TaskResult {
val filesToUpload = arrayListOf<File>() val filesToUpload = arrayListOf<File>()
if (config != null && config.sign) { if (config.sign) {
// Create the .asc files // Create the .asc files
filesToUpload.addAll(gpg.runGpg(files)) filesToUpload.addAll(gpg.runGpg(files))
} }
@ -156,17 +151,6 @@ class BintrayApi @Inject constructor(val http: Http,
} }
} }
//
// If any configuration was given, apply them so the URL reflects them, e.g. ?publish=1
//
val options = arrayListOf<String>()
if (config?.publish == true) options.add("publish=1")
val optionPath = StringBuffer()
if (options.size > 0) {
optionPath.append("?" + options.joinToString("&"))
}
val fileCount = filesToUpload.size val fileCount = filesToUpload.size
if (fileCount > 0) { if (fileCount > 0) {
log(1, " Found $fileCount artifacts to upload") log(1, " Found $fileCount artifacts to upload")
@ -180,14 +164,15 @@ class BintrayApi @Inject constructor(val http: Http,
val results = arrayListOf<Boolean>() val results = arrayListOf<Boolean>()
filesToUpload.forEachIndexed { i, file -> filesToUpload.forEachIndexed { i, file ->
val type = MediaType.parse("multipart/form-data") val owner = org ?: username!!
val repo = project.name
val group = project.group!!.replace('.', '/')
val artifact = project.artifactId!!
val version = project.version!!
val body = MultipartBody.Part.createFormData("artifact", file.name, RequestBody.create(type, file)); val result = service.uploadArtifact(owner, repo, group, artifact, version, file.name,
if (config.publish) 1 else 0, file)
if (file.extension != "pom") { .execute()
val upload = service.uploadArtifact(org ?: username!!, project.name,
project.group!!.replace('.', '/'), project.artifactId!!, project.version!!, file.name, body)
val result = upload.execute()
val error = result.errorBody()?.string() val error = result.errorBody()?.string()
if (result.errorBody() != null) { if (result.errorBody() != null) {
errorMessages.add(error!!) errorMessages.add(error!!)
@ -195,19 +180,6 @@ class BintrayApi @Inject constructor(val http: Http,
} else { } else {
results.add(true) results.add(true)
} }
} else {
http.uploadFile(username, password, fileToPath(project, file) + optionPath,
Http.TypedFile(com.google.common.net.MediaType.ANY_APPLICATION_TYPE.toString(), file),
post = false, // Bintray requires PUT
success = { r: Response -> results.add(true) },
error = { r: Response ->
results.add(false)
val jcResponse = parseResponse(r)
errorMessages.add(jcResponse.errorMessage!!)
})
// service.uploadPom(org ?: username!!, project.name, project.group!!.replace('.', '/'),
// project.artifactId!!, project.version!!, file.name, body)
}
log(1, " Uploading ${i + 1} / $fileCount " + dots(fileCount, results, file), false) log(1, " Uploading ${i + 1} / $fileCount " + dots(fileCount, results, file), false)
} }
@ -228,37 +200,8 @@ class BintrayApi @Inject constructor(val http: Http,
} }
} }
fun fileToPath(project: Project, f: File) : String {
return listOf(
BINTRAY_URL_API_CONTENT,
org ?: username!!,
"maven",
project.name,
project.version!!,
project.group!!.replace(".", "/"),
project.artifactId!!,
project.version!!,
f.name)
.joinToString("/")
}
class BintrayResponse(val jo: JsonObject?, val errorMessage: String?) class BintrayResponse(val jo: JsonObject?, val errorMessage: String?)
fun parseResponse(r: Response): BintrayResponse {
val networkResponse = r.networkResponse()
if (networkResponse.code() != 200) {
val message = networkResponse.message()
try {
val errorObject = JsonParser().parse(r.body().string()).asJsonObject
return BintrayResponse(null, message + ": " + errorObject.get("message").asString)
} catch(ex: Exception) {
return BintrayResponse(null, message)
}
} else {
return BintrayResponse(JsonParser().parse(r.body().string()).asJsonObject, null)
}
}
fun JsonObject.addNonNull(name: String, value: String?) { fun JsonObject.addNonNull(name: String, value: String?) {
if (value != null) { if (value != null) {
addProperty(name, value); addProperty(name, value);
@ -266,3 +209,31 @@ class BintrayApi @Inject constructor(val http: Http,
} }
} }
class ConverterFactory : Converter.Factory() {
override fun responseBodyConverter(type: Type, annotations: Array<out Annotation>, retrofit: Retrofit): Converter<ResponseBody, *>? {
return GsonResponseBodyConverter(Gson(), Gson().getAdapter(TypeToken.get(type)))
}
override fun requestBodyConverter(type: Type, parameterAnnotations: Array<out Annotation>, methodAnnotations: Array<out Annotation>,
retrofit: Retrofit?): Converter<*, RequestBody>? {
return RequestBodyConverter()
}
}
class GsonResponseBodyConverter(private val gson: Gson, private val adapter: TypeAdapter<out Any>) : Converter<ResponseBody, Any> {
override fun convert(value: ResponseBody): Any {
val jsonReader = gson.newJsonReader(value.charStream())
try {
return adapter.read(jsonReader)
} finally {
value.close()
}
}
}
class RequestBodyConverter : Converter<File, RequestBody> {
override fun convert(value: File): RequestBody {
return CountingFileRequestBody(value, "application/*", { })
}
}

2
src/main/resources/kobalt.properties
View file

@ -1 +1 @@
kobalt.version=0.789 kobalt.version=0.814

104
src/test/kotlin/com/beust/kobalt/internal/BuildOrderTest.kt Normal file
View file

@ -0,0 +1,104 @@
package com.beust.kobalt.internal
import com.beust.kobalt.TestModule
import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.project
import org.assertj.core.api.Assertions.assertThat
import org.testng.annotations.BeforeClass
import org.testng.annotations.DataProvider
import org.testng.annotations.Guice
import org.testng.annotations.Test
import javax.inject.Inject
@Guice(modules = arrayOf(TestModule::class))
class BuildOrderTest @Inject constructor(val taskManager: TaskManager) {
@BeforeClass
fun beforeClass() {
Kobalt.init(TestModule())
}
private fun toExpectedList(vararg projectNames: Int) = projectNames.map { "p$it:assemble"}.toList()
@DataProvider
fun tasks() = arrayOf(
arrayOf(listOf("assemble"), toExpectedList(1, 2, 3)),
arrayOf(listOf("p1:assemble"), toExpectedList(1)),
arrayOf(listOf("p2:assemble"), toExpectedList(1, 2)),
arrayOf(listOf("p3:assemble"), toExpectedList(1, 2, 3)))
@Test(dataProvider = "tasks")
fun shouldBuildInRightOrder(tasks: List<String>, expectedTasks: List<String>) {
val p1 = project { name = "p1" }
val p2 = project(p1) { name = "p2" }
val p3 = project(p2) { name = "p3" }
val allProjects = listOf(p1, p2, p3)
with(taskManager) {
val taskInfos = calculateDependentTaskNames(tasks, allProjects)
assertThat(taskInfos.map { it.id }).isEqualTo(expectedTasks)
}
}
@DataProvider
fun tasks2(): Array<Array<out Any>> {
return arrayOf(
arrayOf(listOf("p14:assemble"), toExpectedList(1, 2, 3, 4, 5, 8, 11, 6, 7, 9, 10, 12, 13, 14))
)
}
@Test(dataProvider = "tasks2")
fun shouldBuildInRightOrder2(tasks: List<String>, expectedTasks: List<String>) {
val p1 = project { name ="p1" }
val p2 = project { name ="p2" }
val p3 = project { name ="p3" }
val p4 = project { name ="p4" }
val p5 = project { name ="p5" }
val p6 = project(p5) { name ="p6" }
val p7 = project(p5) { name ="p7" }
val p8 = project { name ="p8" }
val p9 = project(p6, p5, p2, p3) { name ="p9" }
val p10 = project(p9) { name ="p10" }
val p11 = project { name ="p11" }
val p12 = project(p1, p7, p9, p10, p11) { name ="p12" }
val p13 = project(p4, p8, p9, p12) { name ="p13" }
val p14 = project(p12, p13) { name ="p14" }
fun Collection<TaskManager.TaskInfo>.appearsBefore(first: String, second: String) {
var sawFirst = false
var sawSecond = false
forEach { ti ->
if (ti.project == first) {
sawFirst = true
}
if (ti.project == second) {
assertThat(sawFirst)
.`as`("Expected to see $first before $second in ${map {it.project}}")
.isTrue()
sawSecond = true
}
}
assertThat(sawFirst).`as`("Didn't see $first").isTrue()
assertThat(sawSecond).`as`("Didn't see $second").isTrue()
}
fun Collection<TaskManager.TaskInfo>.appearsBefore(firsts: List<String>, second: String) {
firsts.forEach { first ->
appearsBefore(first, second)
}
}
val allProjects = listOf(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14)
with(taskManager) {
with(calculateDependentTaskNames(tasks, allProjects)) {
assertThat(size).isEqualTo(expectedTasks.size)
appearsBefore("p5", "p6")
appearsBefore("p5", "p7")
appearsBefore("p9", "p10")
appearsBefore(listOf("p1", "p7", "p9", "p10", "p11"), "p12")
appearsBefore(listOf("p4", "p8", "p9", "p12"), "p13")
appearsBefore(listOf("p12", "p13"), "p14")
}
}
}
}

5
src/test/kotlin/com/beust/kobalt/internal/GenericRunnerTest.kt → src/test/kotlin/com/beust/kobalt/internal/DependencyTest.kt
View file

@ -16,8 +16,9 @@ import javax.inject.Inject
* Test ITestJvmFlagContributor and ITestJvmFlagInterceptor. * Test ITestJvmFlagContributor and ITestJvmFlagInterceptor.
*/ */
class DependencyTest @Inject constructor() { class DependencyTest @Inject constructor() {
private val A_JAR = "/tmp/a.jar" private fun isWindows() = System.getProperty("os.name").toLowerCase().contains("ndows")
private val B_JAR = "/tmp/b.jar" private val A_JAR = if (isWindows()) "c:\\tmp\\a.jar" else "/tmp/a.jar"
private val B_JAR = if (isWindows()) "c:\\tmp\\b.jar" else "/tmp/b.jar"
private val project : Project get() = project { name = "dummy" } private val project : Project get() = project { name = "dummy" }
private val classpath = listOf(FileDependency(A_JAR)) private val classpath = listOf(FileDependency(A_JAR))

6
src/test/kotlin/com/beust/kobalt/internal/DynamicGraphTest.kt
View file

@ -125,8 +125,10 @@ class DynamicGraphTest {
addEdge("b2", "a2") addEdge("b2", "a2")
addEdge("c1", "b1") addEdge("c1", "b1")
addEdge("c1", "b2") addEdge("c1", "b2")
val sorted = sort(arrayListOf("a1", "a2", "b1", "b2", "c1", "x", "y")) addNode("x")
Assert.assertEquals(sorted, arrayListOf("a1", "a2", "x", "y", "b1", "b2", "c1")) addNode("y")
val sorted = sort()
Assert.assertEquals(sorted, arrayListOf("a1", "a2", "x", "y", "b2", "b1", "c1"))
} }
} }

2
src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt
View file

@ -80,7 +80,7 @@ class TaskManagerTest @Inject constructor(val taskManager: TaskManager) {
} }
} }
val graph = taskManager.createGraph2("", tasks, dependencies, val graph = taskManager.createGraph2("", tasks.map { TaskManager.TaskInfo(it) }, dependencies,
dependsOn, reverseDependsOn, runBefore, runAfter, alwaysRunAfter, dependsOn, reverseDependsOn, runBefore, runAfter, alwaysRunAfter,
{ it }, { t -> true }) { it }, { t -> true })
val result = DryRunGraphExecutor(graph).run() val result = DryRunGraphExecutor(graph).run()

60
src/test/kotlin/com/beust/kobalt/maven/PomTest.kt
View file

@ -10,42 +10,60 @@ import com.google.inject.Inject
import org.testng.Assert import org.testng.Assert
import org.testng.annotations.Test import org.testng.annotations.Test
import java.io.File import java.io.File
import java.io.FileOutputStream
import java.nio.file.Files
class PomTest @Inject constructor() : KobaltTest() { /**
* If a user calls --init on a project with a pom.xml in it, make sure that pom.xml is correctly reflected in the
* generated Build.kt.
*/
class PomImportTest @Inject constructor() : KobaltTest() {
@Test @Test
fun importPom() { fun importPom() {
val pomSrc = File("src/test/resources/pom.xml") resourceToFile("PomTest/pom.xml").let { pomSrc ->
val pom = Pom("testing", pomSrc); with(Pom("testing", pomSrc)) {
Assert.assertEquals(groupId, "com.foo.bob")
Assert.assertEquals(artifactId, "rawr")
Assert.assertEquals(name, "rawr")
Assert.assertEquals(version, "1.2.3")
Assert.assertEquals(properties["commons.version"], "2.1.1")
Assert.assertEquals(properties["guice.version"], "4.0")
Assert.assertEquals(pom.groupId, "com.foo.bob") validateGeneratedFile(this, pomSrc)
Assert.assertEquals(pom.artifactId, "rawr") }
Assert.assertEquals(pom.name, "rawr") }
Assert.assertEquals(pom.version, "1.2.3")
Assert.assertEquals(pom.properties.get("commons.version"), "2.1.1")
Assert.assertEquals(pom.properties.get("guice.version"), "4.0")
validateGeneratedFile(pom, pomSrc)
} }
@Test @Test
fun importBasicPom() { fun importBasicPom() {
val pomSrc = File("src/test/resources/pom-norepositories-properties.xml") resourceToFile("PomTest/pom-norepositories-properties.xml").let { pomSrc ->
val pom = Pom("testing", pomSrc); with(Pom("testing", pomSrc)) {
Assert.assertEquals(groupId, "com.foo.bob")
Assert.assertEquals(artifactId, "rawr")
Assert.assertEquals(name, "rawr")
Assert.assertEquals(version, "1.2.3")
Assert.assertTrue(properties.isEmpty())
Assert.assertTrue(repositories.isEmpty())
Assert.assertEquals(pom.groupId, "com.foo.bob") validateGeneratedFile(this, pomSrc)
Assert.assertEquals(pom.artifactId, "rawr") }
Assert.assertEquals(pom.name, "rawr") }
Assert.assertEquals(pom.version, "1.2.3") }
Assert.assertTrue(pom.properties.isEmpty())
Assert.assertTrue(pom.repositories.isEmpty())
validateGeneratedFile(pom, pomSrc) private fun resourceToFile(fileName: String) : File {
val ins = javaClass.classLoader.getResourceAsStream(fileName)
val result = Files.createTempFile("kobaltTest", "").toFile()
FileOutputStream(result).use {
ins.copyTo(it)
}
return result
} }
private fun validateGeneratedFile(pom: Pom, pomSrc: File) { private fun validateGeneratedFile(pom: Pom, pomSrc: File) {
val temp = File(System.getProperty("java.io.tmpdir")) val temp = File(System.getProperty("java.io.tmpdir"))
val original = System.getProperty("user.dir") val original = System.getProperty("user.dir")
System.setProperty("user.dir", temp.absolutePath) System.setProperty("user.dir", temp.absolutePath)
val pomFile = File(temp, "pom.xml") val pomFile = File(temp, "pom.xml")
pomFile.deleteOnExit() pomFile.deleteOnExit()
pomSrc.copyTo(pomFile, true) pomSrc.copyTo(pomFile, true)
@ -60,7 +78,7 @@ class PomTest @Inject constructor() : KobaltTest() {
ProjectGenerator(Kobalt.INJECTOR.getInstance(PluginInfo::class.java)).run(args, javaClass.classLoader) ProjectGenerator(Kobalt.INJECTOR.getInstance(PluginInfo::class.java)).run(args, javaClass.classLoader)
var contents = file.readText() val contents = file.readText()
Assert.assertTrue(contents.contains("group = \"${pom.groupId}\""), "Should find the group defined") Assert.assertTrue(contents.contains("group = \"${pom.groupId}\""), "Should find the group defined")
Assert.assertTrue(contents.contains("name = \"${pom.name}\""), "Should find the name defined") Assert.assertTrue(contents.contains("name = \"${pom.name}\""), "Should find the name defined")
Assert.assertTrue(contents.contains("version = \"${pom.version}\""), "Should find the version defined") Assert.assertTrue(contents.contains("version = \"${pom.version}\""), "Should find the version defined")

0
src/test/resources/pom-norepositories-properties.xml → src/test/resources/PomTest/pom-norepositories-properties.xml
View file

0
src/test/resources/pom.xml → src/test/resources/PomTest/pom.xml
View file