continued build action

improved build action

use dedicated task for apt-get

removed  python-software-properties from build action

fixed syntax errror in build action

skip apt-get and fixed sdkman initialization in github build action

Use kotlin v1.4.32 in build action

source sdk init more often in github build action

fixed working directory in github build action

Use bundled gradle in build action

added ore debug statements to github action

declare default shell in github action

use bash shell in github action

fixed syntax in github action

fixed syntax in github action (cont)

fixed syntax in github action (cont)

fixed syntax in github action (cont)

fixed syntax in github action (cont)

fixed syntax in github action (cont)

fixed syntax in github action (cont)

fixed syntax in github action (cont)

fixed syntax in github action (cont)

fixed syntax in github action (cont)

fixed syntax in github action (cont)

Fixed version check and support api locator id

Added test debugging bits in github action

disabled packaging-test in github action

github action debugging

Fixed klaxon dependency in tests

continued github action debugging

fixed syntax error in action definition

fixed syntax error in action definition

fixed library versions in tests

reenabled debug step in github action

Added mock idea to PATH in github action

Cleaned up github action

Author: holgerbrandl

.github/workflows/build.yml

@@ -12,35 +12,77 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+#    defaults:
+#      run:
+#        shell: bash
+#        working-directory: $GITHUB_WORKSPACE
 
     steps:
       - uses: actions/checkout@v2
-#      https://stackoverflow.com/questions/56726429/how-to-run-multiple-commands-in-one-github-actions-docker
+      #      https://stackoverflow.com/questions/56726429/how-to-run-multiple-commands-in-one-github-actions-docker
+
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
           java-version: 11
-      - run: |
-          apt-get update
-          apt-get install -y python-software-properties
-          apt-get install -y curl unzip zip wget
+
+#      - name: Update system dependencies
+#        run: |
+#          sudo apt-get update
+#          sudo apt-get install -y curl unzip zip wget
+
+      - name: Install sdkman
+        run: |
           bash -c "curl -s "https://get.sdkman.io" | bash"
-          source "/home/travis/.sdkman/bin/sdkman-init.sh"
-      - run: sdk install kotlin
-      - run: sdk install gradle
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+          source "/home/runner/.sdkman/bin/sdkman-init.sh"
+
+      - name: Install kotlin
+        run: |
+          source "/home/runner/.sdkman/bin/sdkman-init.sh"
+          sdk install kotlin 1.4.31
+
+      - name: Install gradle
+        run: |
+          source "/home/runner/.sdkman/bin/sdkman-init.sh"
+          sdk install gradle 6.7
+
+
+      # https://stackoverflow.com/questions/50104666/gradle-difference-between-test-and-check
       - name: Build and test with Gradle
-        # https://stackoverflow.com/questions/50104666/gradle-difference-between-test-and-check
-        # https://stackoverflow.com/questions/50104666/gradle-difference-between-test-and-check
-        run: ./gradlew clean check --stacktrace --info
-      - env:
-#        https://docs.github.com/en/actions/reference/environment-variables
-          KSCRIPT_HOME: $GITHUB_WORKSPACE
-      - run:  cd $KSCRIPT_HOME && ./gradlew assemble
-      # install assert.h
-      - run: get https://raw.github.com/lehmannro/assert.sh/v1.1/assert.sh && chmod +x assert.sh
+#        working-directory: $GITHUB_WORKSPACE
+        run: |
+          echo  $GITHUB_WORKSPACE
+          chmod +x gradlew
+          ./gradlew clean check --stacktrace --info
+
+
+      - name: Build kscript
+        run: ./gradlew assemble
+
+      - name: Install assert.sh
+        run: |
+          wget https://raw.github.com/lehmannro/assert.sh/v1.1/assert.sh
+          chmod +x assert.sh
+
+      # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#adding-a-system-path
+      - name: Update PATH to include kscrript
+        run: echo "${GITHUB_WORKSPACE}/build/libs" >> $GITHUB_PATH
+
       - run: which kscript
-      - run: kscript --version
-      - run: touch idea && chmod +x idea
-      - run: cd $KSCRIPT_HOME && ./test/test_suite.sh
+
+      - name: Print --version
+        run: |
+          source "/home/runner/.sdkman/bin/sdkman-init.sh"
+          kscript --version
+
+      - name: Create mock idea executable
+        run: |
+          touch idea
+          chmod +x idea
+          echo "${PWD}" >> $GITHUB_PATH
+
+      - name: Run tests
+        run: |
+          source "/home/runner/.sdkman/bin/sdkman-init.sh"
+          export KSCRIPT_HOME="$GITHUB_WORKSPACE"
+          ./test/test_suite.sh

README.md

@@ -334,7 +334,7 @@ Using annotations instead of comment directives to configure scripts is cleaner
 
 // Declare dependencies
 @file:DependsOn("com.github.holgerbrandl:kutils:0.12")
-@file:DependsOn("com.beust:klaxon:0.24", "com.github.kittinunf.fuel:fuel:1.3.1")
+@file:DependsOn("com.beust:klaxon:0.24", "com.github.kittinunf.fuel:fuel:2.3.1")
 
 
 // To use a custom maven repository you can declare it with

src/main/kotlin/kscript/app/Kscript.kt

@@ -7,9 +7,11 @@ import java.io.BufferedReader
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStreamReader
+import java.lang.IllegalArgumentException
 import java.net.URI
 import java.net.URL
 import java.net.UnknownHostException
+import java.util.*
 import kotlin.system.exitProcess
 
 
@@ -304,7 +306,15 @@ private fun versionCheck() {
         return // skip version check here, since the use has no connection to the internet at the moment
     }
 
-    fun padVersion(version: String) = java.lang.String.format("%03d%03d%03d", *version.split(".").map { Integer.valueOf(it) }.toTypedArray())
+    fun padVersion(version: String) = try{
+        var versionNumbers = version.split(".").map { Integer.valueOf(it) }
+        // adjust versions without a patch-release
+        while(versionNumbers.size!=3){ versionNumbers = versionNumbers + 0 }
+
+        java.lang.String.format("%03d%03d%03d", *versionNumbers.toTypedArray())
+    }catch(e: MissingFormatArgumentException){
+        throw IllegalArgumentException("Could not pad version $version", e)
+    }
 
     if (padVersion(latestVersion) > padVersion(KSCRIPT_VERSION)) {
         info("""A new version (v${latestVersion}) of kscript is available.""")
@@ -392,7 +402,7 @@ private fun resolvePreambles(rawScript: File, enableSupportApi: Boolean): File {
     // prefix with text-processing preamble if kscript-support api is enabled
     if (enableSupportApi) {
         val textProcPreamble = """
-            //DEPS com.github.holgerbrandl:kscript-support:1.2.5
+            //DEPS com.github.holgerbrandl:kscript-support-api:1.2.5
 
             import kscript.text.*
             val lines = resolveArgFile(args)

test/resources/custom_dsl/mydsl_test_with_deps.kts

@@ -1,6 +1,6 @@
 #!/usr/bin/env mydsl
 
-@file:DependsOn("com.beust:klaxon:0.24")
+@file:DependsOn("com.beust:klaxon:5.5")
 
 
 // instantiate something from extra dep

test/resources/script_with_compile_flags.kts

@@ -1,7 +1,7 @@
 #!/usr/bin/env kscript
 
 @file:DependsOn("org.jetbrains.kotlin:kotlin-reflect:1.1.60")
-@file:DependsOn("com.github.kittinunf.fuel:fuel-jackson:1.12.0")
+@file:DependsOn("com.github.kittinunf.fuel:fuel-jackson:2.3.1")
 
 @file:CompilerOpts("-jvm-target 1.8")