Infrastructure: Updates for GraalVM version 21

- Switch to using sdkman for managing JDKs
- Update `sbt.sh` script to run the command automatically
- Minor updates to tests and GHA

Author: LaCuneta

.github/workflows/main.yml

@@ -22,13 +22,8 @@ jobs:
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.2.0'
-          java-version: '17'
-
-      - name: Install Graal.js
-        run: |
-          gu install js
-          echo "GRAAL_HOME=$GRAALVM_HOME" >> $GITHUB_ENV
+          java-version: '21'
+          distribution: 'graalvm'
 
       - uses: sbt/setup-sbt@v1
 
@@ -53,8 +48,6 @@ jobs:
           node --version
           echo "** JAVA_HOME"
           echo $JAVA_HOME
-          echo "** GRAAL_HOME"
-          echo $GRAAL_HOME
           echo "** java path and version"
           readlink -f `which java`
           java -version
@@ -86,13 +79,8 @@ jobs:
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.2.0'
-          java-version: '17'
-
-      - name: Install Graal.js
-        run: |
-          gu install js
-          echo "GRAAL_HOME=$GRAALVM_HOME" >> $GITHUB_ENV
+          java-version: '21'
+          distribution: 'graalvm'
 
       - uses: sbt/setup-sbt@v1
 
@@ -122,13 +110,8 @@ jobs:
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.2.0'
-          java-version: '17'
-
-      - name: Install Graal.js
-        run: |
-          gu install js
-          echo "GRAAL_HOME=$GRAALVM_HOME" >> $GITHUB_ENV
+          java-version: '21'
+          distribution: 'graalvm'
 
       - uses: sbt/setup-sbt@v1
 
@@ -159,16 +142,11 @@ jobs:
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.2.0'
-          java-version: '17'
+          java-version: '21'
+          distribution: 'graalvm'
 
       - uses: sbt/setup-sbt@v1
 
-      - name: Install Graal.js
-        run: |
-          gu install js
-          echo "GRAAL_HOME=$GRAALVM_HOME" >> $GITHUB_ENV
-
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
@@ -193,13 +171,8 @@ jobs:
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.2.0'
-          java-version: '17'
-
-      - name: Install Graal.js
-        run: |
-          gu install js
-          echo "GRAAL_HOME=$GRAALVM_HOME" >> $GITHUB_ENV
+          java-version: '21'
+          distribution: 'graalvm'
 
       - uses: sbt/setup-sbt@v1
 
@@ -225,13 +198,8 @@ jobs:
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.2.0'
-          java-version: '17'
-
-      - name: Install Graal.js
-        run: |
-          gu install js
-          echo "GRAAL_HOME=$GRAALVM_HOME" >> $GITHUB_ENV
+          java-version: '21'
+          distribution: 'graalvm'
 
       - uses: sbt/setup-sbt@v1
 
@@ -262,13 +230,8 @@ jobs:
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.2.0'
-          java-version: '17'
-
-      - name: Install Graal.js
-        run: |
-          gu install js
-          echo "GRAAL_HOME=$GRAALVM_HOME" >> $GITHUB_ENV
+          java-version: '21'
+          distribution: 'graalvm'
 
       - uses: sbt/setup-sbt@v1
 

build.sbt

@@ -24,6 +24,8 @@ val commonSettings =
     resolvers     += "netlogoheadless" at "https://dl.cloudsmith.io/public/netlogo/netlogo/maven/",
     libraryDependencies ++= Seq(
       "org.nlogo"         %  "netlogoheadless" % nlDependencyVersion,
+      "org.graalvm.polyglot" % "polyglot" % "23.1.10",
+      "org.graalvm.polyglot" % "js" % "23.1.10" pomOnly(),
       "org.scalaz"        %% "scalaz-core"     % scalazVersion,
       "com.typesafe.play" %% "play-json"       % playJsonVersion,
       "com.lihaoyi"       %% "scalatags"       % "0.12.0"   % "test",

netlogo-web/src/test/scala/TestEngineType.scala

@@ -8,7 +8,7 @@ import org.scalatest.funsuite.AnyFunSuite
 class TestEngineType extends AnyFunSuite {
 
   test("engine name") {
-    assert((new GraalJS).jsRuntime.getEngine.getImplementationName.startsWith("Graal"))
+    assert((new GraalJS).jsRuntime.getEngine.getImplementationName.contains("Graal"))
   }
 
 }

sbt.sh

@@ -1,6 +1,13 @@
 #!/bin/bash
 
-export JAVA_HOME=$GRAAL_HOME
+SDKMAN_DIR="${SDKMAN_DIR:-$HOME/.sdkman}"
+GRAAL_VERSION="21.0.10-graal"
+
+if [ -f "$SDKMAN_DIR/bin/sdkman-init.sh" ]; then
+  source "$SDKMAN_DIR/bin/sdkman-init.sh"
+  sdk use java "$GRAAL_VERSION"
+fi
+# else: leave JAVA_HOME as-is (e.g. set by CI via graalvm/setup-graalvm)
 
 # GraalVM includes binaries for node and npm that would supercede
 # any installed on the system, which we do not want. -Jeremy B 2/2019