Merge branch 'pr89'

Author: holgerbrandl

.gitignore

@@ -3,16 +3,9 @@ build/
 target/
 out/
 
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
 # Cache of project
 .gradletasknamecache
 
-.*jar
 *.iml
 .idea
 

.travis.yml

@@ -45,16 +45,14 @@ install:
   - sdk install kotlin
   - sdk install gradle
 
-  ## install assert.h
-  - wget https://raw.github.com/lehmannro/assert.sh/v1.1/assert.sh && chmod +x assert.sh
-
   - export KSCRIPT_HOME="/home/travis/build/holgerbrandl/kscript"
-  - pwd
-  - export PATH=$KSCRIPT_HOME::$PATH
+  - export PATH=${KSCRIPT_HOME}/build/libs:$PATH
 
   # build it
-  - cd $KSCRIPT_HOME && ./gradlew shadowJar
+  - cd $KSCRIPT_HOME && ./gradlew assemble
 
+  ## install assert.h
+  - wget https://raw.github.com/lehmannro/assert.sh/v1.1/assert.sh && chmod +x assert.sh
 
   - which kscript
   - which assert.sh
@@ -67,6 +65,7 @@ install:
   - kscript ${KSCRIPT_HOME}/test/resources/multi_line_deps.kts
 #  - resdeps.kts org.org.docopt:org.docopt:0.6.0-SNAPSHOT log4j:log4j:1.2.14
 #  - kscript ${KSCRIPT_HOME}/test/resources/multi_line_deps.kts
+  - cd $KSCRIPT_HOME
 
 script: ./test/test_suite.sh
 

README.md

@@ -81,10 +81,10 @@ brew install holgerbrandl/tap/kscript
 
 To build `kscript` yourself, simply clone the repo and do
 ```bash
-./gradlew shadowJar
+./gradlew assemble
 
-## Don't forget to prefix with `./` when running the freshly compiled version 
-./kscript
+## Run kscript from output dir
+./build/libs/kscript
 ```
 
 ## Script Input Modes

build.gradle

@@ -0,0 +1,41 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    kotlin("jvm") version "1.2.30"
+    id("com.github.johnrengelman.plugin-shadow") version "2.0.2"
+}
+
+group = "com.github.holgerbrandl.kscript.launcher"
+
+dependencies {
+    compileOnly("org.jetbrains.kotlin:kotlin-stdlib")
+
+    compile("com.offbytwo:docopt:0.6.0.20150202")
+
+    testCompile("junit:junit:4.12")
+    testCompile( "io.kotlintest:kotlintest:2.0.7")
+}
+
+repositories {
+    jcenter()
+}
+
+val shadowJar by tasks.getting(ShadowJar::class) {
+    // set empty string to classifier and version to get predictable jar file name: build/libs/kscript.jar
+    archiveName = "kscript.jar"
+    doLast {
+        copy {
+            from(File(projectDir, "src/kscript"))
+            into(archivePath.parentFile)
+        }
+    }
+}
+
+// Disable standard jar task to avoid building non-shadow jars
+val jar by tasks.getting {
+    enabled = false
+}
+// Build shadowJar when
+val assemble by tasks.getting {
+    dependsOn(shadowJar)
+}

build.gradle.kts

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

gradle/wrapper/gradle-wrapper.jar

@@ -20,7 +20,7 @@ misc/benchmarking/benchmark_kscript.kts scriptlet_runtimes_$(git rev-parse --abb
 
 ## roll back to master and redo the benchmarking
 git checkout master
-./gradlew clean shadowJar
+./gradlew clean assemble
 
 misc/benchmarking/benchmark_kscript.kts scriptlet_runtimes_$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD).txt
 

gradle/wrapper/gradle-wrapper.properties

@@ -34,7 +34,7 @@ docker attach `docker ps -q -l` # reattach the terminal & stdin
 cd kscript
 export KSCRIPT_HOME=$(pwd)
 
-./gradlew shadowJar
+./gradlew assemble
 
 wget https://raw.githubusercontent.com/lehmannro/assert.sh/master/assert.sh
 chmod u+x assert.sh

misc/benchmarking/benchmarking.md

@@ -24,12 +24,12 @@ echo "new version is $kscript_version"
 
 cd $KSCRIPT_HOME
 
-./gradlew clean shadowJar
+./gradlew clean assemble
 
 ## compile binary distribution (including jar and wrapper-script)
 mkdir -p $KSCRIPT_ARCHIVE/kscript-${kscript_version}/bin
 cp ${KSCRIPT_HOME}/kscript ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}/bin
-cp ${KSCRIPT_HOME}/kscript.jar ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}/bin/kscript.jar
+cp ${KSCRIPT_HOME}/build/libs/kscript.jar ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}/bin/kscript.jar
 
 cd ${KSCRIPT_ARCHIVE}
 rm ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}.zip
@@ -42,7 +42,8 @@ open ${KSCRIPT_ARCHIVE}
 #Java SE 6.0 = 50 (0x32 hex) (from https://en.wikipedia.org/wiki/Java_class_file)
 #Default is 50, see https://kotlinlang.org/docs/reference/using-gradle.html#attributes-common-for-jvm-and-js
 ## to insepct do
-#./gradlew clean shadowJar && cp build/libs/kscript-0.1-SNAPSHOT-all.jar kscript.jar
+#./gradlew clean assemble
+#cd ${KSCRIPT_BUILD_LIBS}
 #rm -rf kscript_target_test
 #cp -f kscript.jar kscript_target_test.zip
 #unzip kscript_target_test.zip -d kscript_target_test