Merge branch 'master' into update/sbt-scalajs-1.14.0

paulbutcher · Oct 17, 2023 · 72cf465 · 72cf465
2 parents 578cc42 + 69a21ce
commit 72cf465
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -33,7 +33,7 @@ jobs:
         java-version: 11
         distribution: 'adopt'
     - name: Run tests
-      run: sbt ++2.12.17 test
+      run: sbt ++2.12.18 test
 
   scala_2_13:
 
@@ -47,4 +47,4 @@ jobs:
         java-version: 11
         distribution: 'adopt'
     - name: Run tests
-      run: sbt ++2.13.8 test
+      run: sbt ++2.13.12 test
diff --git a/build.sbt b/build.sbt
@@ -1,10 +1,10 @@
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
 ThisBuild / scalaVersion := "2.11.12"
-ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.17", "2.13.8")
+ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.18", "2.13.12")
 //ThisBuild / scalaJSUseRhino := true
 
-lazy val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.2.16")
+lazy val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.2.17")
 lazy val specs2 = Def.setting("org.specs2" %%% "specs2-core" % "4.10.6")
 
 val commonSettings = Defaults.coreDefaultSettings ++ Seq(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.6
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,4 +4,4 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
 addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")