Merge branch 'main' into update/sbt-scalajs-1.16.0

hnaderi · Apr 21, 2024 · a268e7b · a268e7b
2 parents e426d62 + f880961
commit a268e7b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           - macos-11
           - macos-12
           - windows-2022
-        scala: [2.13.10, 3.2.1]
+        scala: [2.13.10, 3.2.2]
         java: [temurin@8]
         project: [rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
@@ -189,22 +189,22 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.1, rootJVM)
+      - name: Download target directories (3.2.2, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM
 
-      - name: Inflate target directories (3.2.1, rootJVM)
+      - name: Inflate target directories (3.2.2, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.1, rootNative)
+      - name: Download target directories (3.2.2, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative
 
-      - name: Inflate target directories (3.2.1, rootNative)
+      - name: Inflate target directories (3.2.2, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,2 +1,2 @@
-version = 3.4.3
+version = 3.8.1
 runner.dialect = scala213
diff --git a/build.sbt b/build.sbt
@@ -10,7 +10,7 @@ ThisBuild / developers := List(
 ThisBuild / tlSonatypeUseLegacyHost := false
 
 val Scala213 = "2.13.10"
-ThisBuild / crossScalaVersions := Seq(Scala213, "3.2.1")
+ThisBuild / crossScalaVersions := Seq(Scala213, "3.2.2")
 ThisBuild / scalaVersion := Scala213
 ThisBuild / githubWorkflowOSes :=
   Seq("ubuntu-20.04", "ubuntu-22.04", "macos-11", "macos-12", "windows-2022")

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.8.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.18")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.18")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")