Kscript 4.2

.gitattributes

@@ -1,14 +1,7 @@
-# https://techblog.dorogin.com/case-of-windows-line-ending-in-bash-script-7236f056abe
-* text=auto
-*.sh text eol=lf
-*.bat text eol=crlf
-
-
-# Use linux file endings for kts scripts because some of them contain shebangs and are thus partially interpreted by bash
-*.kts text eol=lf
+* text eol=lf
 
+*.bat text eol=crlf
 
-# also use linux style file endings for bash scripts without sh extension
-kscript text eol=lf
-gradlew text eol=lf
-mydsl text eol=lf
+*.png binary
+*.jpg binary
+*.jar binary

.github/workflows/build.yml

@@ -24,11 +24,11 @@ jobs:
           - os: windows-2022
             variant: cmd
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
+    timeout-minutes: 30
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Java
         uses: actions/setup-java@v3
@@ -39,7 +39,7 @@ jobs:
       - name: Setup Kotlin
         uses: fwilhe2/setup-kotlin@main
         with:
-          version: 1.6.21
+          version: 1.7.21
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
@@ -68,19 +68,19 @@ jobs:
 
           if [[ "$OSTYPE" == "linux"* ]]; then
             echo "Linux test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix | linux' integration
+            gradle -DosType=$OSTYPE -DincludeTags='posix | linux' integrationTest
           elif [[ "$OSTYPE" == "darwin"* ]]; then
             echo "MacOs test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix | macos' integration
+            gradle -DosType=$OSTYPE -DincludeTags='posix | macos' integrationTest
           elif [[ "$OSTYPE" == "cygwin" ]]; then
             echo "Cygwin test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix | cygwin' integration
+            gradle -DosType=$OSTYPE -DincludeTags='posix | cygwin' integrationTest
           elif [[ "$OSTYPE" == "msys" ]]; then
             echo "MSys test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix | msys' integration
+            gradle -DosType=$OSTYPE -DincludeTags='posix | msys' integrationTest
           elif [[ "$OSTYPE" == "freebsd"* ]]; then
             echo "FreeBsd test..."
-            gradle -DosType=$OSTYPE -DincludeTags='posix' integration      
+            gradle -DosType=$OSTYPE -DincludeTags='posix' integrationTest
           else
             echo "Unknown OS"
             exit 1
@@ -93,7 +93,7 @@ jobs:
           echo "Windows test..."
           gradle clean assemble test
           if %errorlevel% neq 0 exit /b %errorlevel%
-          gradle -DosType=windows -DincludeTags="windows" integration
+          gradle -DosType=windows -DincludeTags="windows" integrationTest
 
       - name: Install Cygwin (only Windows)
         if: matrix.variant == 'cygwin'
@@ -108,4 +108,4 @@ jobs:
           echo "Changing directory to $GITHUB_WORKSPACE ..."
           cd $GITHUB_WORKSPACE
           gradle clean assemble test || { echo 'Compilation or Unit tests failed' ; exit 1; }
-          gradle -DosType=$OSTYPE -DincludeTags='posix | cygwin' integration
+          gradle -DosType=$OSTYPE -DincludeTags='posix | cygwin' integrationTest

.github/workflows/installer.yml

@@ -6,7 +6,7 @@ on:
       kscript_version:
         description: 'KScript version to test'
         required: true
-        default: '4.0.2'
+        default: '4.1.1'
 
 jobs:
   build:
@@ -15,22 +15,31 @@ jobs:
       matrix:
         os:
           - ubuntu-20.04
-          - macos-10.15
+          - macos-12
           - windows-2022
+        variant:
+          - sdkman
+        include:
+          - os: macos-12
+            variant: brew
+#          - os: windows-2022
+#            variant: sdkman-cygwin, scoop-windows
+
+
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
+    timeout-minutes: 60
+
     env:
       KSCRIPT_VERSION: ${{ github.event.inputs.kscript_version }}
 
     steps:
-      - uses: actions/checkout@v2
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '11'
       - uses: fwilhe2/setup-kotlin@main
         with:
-          version: 1.6.21
+          version: 1.7.21
 
       - name: Prerequisites for ${{ runner.os }}
         shell: bash
@@ -41,36 +50,26 @@ jobs:
             cp /c/msys64/usr/bin/bash.exe /c/Windows/System32/bash.exe
           fi
 
-      - name: Install sdkman
+      # for Windows by default it runs MSYS
+      - name: Check SdkMan for ${{ runner.os }}
+        if: matrix.variant == 'sdkman'
         shell: bash
         run: |
           bash -c "curl -s "https://get.sdkman.io" | bash"
           source "$HOME/.sdkman/bin/sdkman-init.sh"
-
-      - name: Test installers for ${{ runner.os }}
-        shell: bash
-        run: |
-          echo "Bash path: $(which bash)"
 
-          # sdkman
-          source "$HOME/.sdkman/bin/sdkman-init.sh"
           sdk install kscript ${{ env.KSCRIPT_VERSION }}
           kscript --help
           kscript -d "println(1+1)"
           sdk uninstall kscript ${{ env.KSCRIPT_VERSION }}
-
-          if [ "$RUNNER_OS" == "Windows" ]; then
-            true  
-          elif [ "$RUNNER_OS" == "Linux" ]; then
-            true
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            # brew
-            /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-            brew install holgerbrandl/tap/kscript
-            kscript --help
-            kscript -d "println(1+1)"
-            brew uninstall holgerbrandl/tap/kscript
-          else
-            echo "Unknown OS"
-            exit 1
-          fi
+
+      - name: Check brew for ${{ runner.os }}
+        if: matrix.variant == 'brew'
+        shell: bash
+        run: |
+          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+          export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+          brew install kscripting/tap/kscript
+          kscript --help
+          kscript -d "println(1+1)"
+          brew uninstall kscripting/tap/kscript

.gitignore

@@ -3,10 +3,7 @@ build/
 target/
 out/
 
-# Cache of project
-.gradletasknamecache
-
 *.iml
 .idea
 
-kscript.jar
+kscript.jar

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Holger Brandl
+Copyright (c) 2022 Holger Brandl, Marcin Kuszczak
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal