From a3a11f7c136a1c30559c02372acac974da7c448e Mon Sep 17 00:00:00 2001
From: Eric K Richardson <ekrichardson@gmail.com>
Date: Sat, 11 Jan 2025 16:32:03 -0800
Subject: [PATCH] Update Scala.js to 1.18.1 to support Java 21 (#415)

---
 .github/workflows/ci.yml | 5 +++--
 project/plugins.sbt      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index faa2c929..67d6d44e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,10 +5,10 @@ on:
   pull_request:
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        java: [ '11', '17' ]
+        java: [ '17', '21' ]
     env:
       JAVA_OPTS: -Xms2G -Xmx4G -Xss6M -XX:+UseG1GC -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     name: Test using Java ${{ matrix.java }}
@@ -20,4 +20,5 @@ jobs:
         distribution: 'adopt'
         java-version: ${{ matrix.java }}
         cache: 'sbt'
+    - uses: sbt/setup-sbt@v1
     - run: sbt +test
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 93111244..be4b93ee 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -3,7 +3,7 @@ resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 // versions
 val crossVer = "1.3.2"
-val scalaJSVersion = "1.17.0"
+val scalaJSVersion = "1.18.1"
 val scalaNativeVersion = "0.5.6"
 val scalafix = "0.13.0"