Update dependencies

zio · Aug 14, 2024 · fbe4fc6 · fbe4fc6
1 parent b36a0af
commit fbe4fc6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,8 +1,7 @@
 name: CI
 
 env:
-  JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -Xmx6G -Xss4M -XX:+UseG1GC # JDK_JAVA_OPTIONS is _the_ env. variable to use for modern Java
-  JVM_OPTS: -XX:+PrintCommandLineFlags -Xmx6G -Xss4M -XX:+UseG1GC # for Java 8 only (sadly, it is not modern enough for JDK_JAVA_OPTIONS)
+  JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -Xmx6G -Xss4M -XX:+UseG1GC
   NODE_OPTIONS: --max_old_space_size=6144
 
 on:
@@ -38,16 +37,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ['adopt@1.11', 'openjdk@1.17']
+        java: ['temurin:17', 'temurin:21']
         scala: ['2.12.18', '2.13.12', '3.3.1']
         platform: ['JVM', 'Native', 'JS']
     steps:
     - uses: actions/checkout@v3.0.0
       with:
         fetch-depth: 0
-    - uses: olafurpg/setup-scala@v13
+    - uses: coursier/setup-action@v1
       with:
-        java-version: ${{ matrix.java }}
+        jvm: ${{ matrix.java }}
     - name: Cache scala dependencies
       uses: coursier/cache-action@v6
     - name: Install libuv

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -1,12 +1,13 @@
-import sbt._
-import Keys._
-
-import sbtcrossproject.CrossPlugin.autoImport._
-import sbtbuildinfo._
-import BuildInfoKeys._
-import scalafix.sbt.ScalafixPlugin.autoImport._
+import sbt.*
+import Keys.*
+import sbtcrossproject.CrossPlugin.autoImport.*
+import sbtbuildinfo.*
+import BuildInfoKeys.*
+import scalafix.sbt.ScalafixPlugin.autoImport.*
 import scalanativecrossproject.NativePlatform
 
+import scala.scalanative.sbtplugin.ScalaNativePlugin.autoImport.nativeConfig
+
 object BuildHelper {
 
   private val versions: Map[String, String] = {
@@ -186,7 +187,8 @@ object BuildHelper {
         "test",
         baseDirectory.value
       )
-    }
+    },
+    nativeConfig ~= { _.withMultithreading(false) }
   )
 
   def buildInfoSettings(packageName: String) = Seq(