Merge pull request #16 from forsyde/develop

Still has errors, but that is because I can't seen to make the githuv work properly for newer JVM hosts for Scala.

.github/workflows/publish-release.yml

@@ -20,13 +20,14 @@ jobs:
         # this should be corrected later when misterious external errors stop happening
         wget -c https://github.com/Jabba-Team/jabba/releases/download/0.13.0/jabba-0.13.0-linux-amd64 -O ./jabba-linux-amd64
         chmod +x jabba-linux-amd64
-        ./jabba-linux-amd64 install ${{ matrix.jdk }} -o /opt/jdk
+        ./jabba-linux-amd64 install [email protected] -o /opt/jdk
         export JAVA_HOME=/opt/jdk
         export PATH=$PATH:$JAVA_HOME/bin
         dos2unix ./gradlew # make sure that gradlew is not with CRLF
         curl -fL "https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linux-static.gz" | gzip -d > cs
         chmod +x ./cs
         ./cs setup --yes
+        cs java --jvm 17 --setup
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y 
         rustup target add x86_64-unknown-linux-gnu
         cargo build --release --target x86_64-unknown-linux-gnu
@@ -70,16 +71,16 @@ jobs:
       run: |
         [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
         Invoke-Expression (Invoke-WebRequest https://github.com/Jabba-Team/jabba/raw/main/install.ps1 -UseBasicParsing).Content
+        jabba install amazon-corretto@17
+        jabba alias default amazon-corretto@17
         Invoke-WebRequest -Uri "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" -OutFile "rustup-init.exe"
         .\rustup-init.exe -y
         Invoke-WebRequest -Uri "https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-win32.zip" -OutFile "cs-x86_64-pc-win32.zip"
         Expand-Archive -Path "cs-x86_64-pc-win32.zip"
         Rename-Item -Path "cs-x86_64-pc-win32.exe" -NewName "cs.exe"
         Remove-Item -Path "cs-x86_64-pc-win32.zip"
-        .\cs setup --yes
+        .\cs setup --jvm 17 --yes
         cd ${{ github.workspace }}
-        jabba install amazon-corretto@17
-        jabba alias default amazon-corretto@17
         cargo build --release --target x86_64-pc-windows-msvc
         .\scripts\make-all-windows.ps1
     # - name: Upload windows binaries to release

.github/workflows/test-build.yml

@@ -17,7 +17,7 @@ jobs:
   test-scala-build-on-linux:
     strategy:
       matrix:
-        jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
+        jdk: [17, 19]
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
@@ -27,7 +27,7 @@ jobs:
         cd ${{ github.workspace }}
         curl -fL "https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linux-static.gz" | gzip -d > cs
         chmod +x ./cs
-        ./cs setup --yes
+        ./cs setup --jvm ${{ matrix.jdk }} --yes
         sbt publishModules
   test-java-build-on-linux:
     strategy:
@@ -86,7 +86,7 @@ jobs:
         Expand-Archive -Path "cs-x86_64-pc-win32.zip"
         Rename-Item -Path "cs-x86_64-pc-win32.exe" -NewName "cs.exe"
         Remove-Item -Path "cs-x86_64-pc-win32.zip"
-        .\cs setup --yes
+        .\cs setup --jvm 17 --yes
         sbt publishModules
   test-java-build-on-windows:
     strategy:

.github/workflows/test-case-studies.yml

@@ -35,7 +35,7 @@ jobs:
           ./gradlew publishModules
           curl -fL "https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linux-static.gz" | gzip -d > cs
           chmod +x ./cs
-          ./cs setup --yes
+          ./cs setup --jvm "adoptium:1.17" --yes
           sbt publishModules
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y 
           source "$HOME/.cargo/env"