Bump deps, inc Scala 3.6.2 and Scala.js 1.18.1

PurpleKingdomGames · Jan 19, 2025 · 92caf44 · 92caf44
1 parent 65322a5
commit 92caf44
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ import scala.language.postfixOps
 import sbtwelcome._
 import indigoplugin._
 
-val scala3Version              = "3.5.0"
+val scala3Version              = "3.6.2"
 val indigoVersion              = "0.17.1-SNAPSHOT"
 val roguelikeStarterKitVersion = "0.5.1-SNAPSHOT"
 
@@ -16,7 +16,7 @@ lazy val commonSettings: Seq[sbt.Def.Setting[_]] = Seq(
   scalaVersion := scala3Version,
   organization := "io.indigoengine",
   libraryDependencies ++= Seq(
-    "org.scalameta" %%% "munit" % "0.7.29" % Test
+    "org.scalameta" %%% "munit" % "1.0.4" % Test
   ),
   testFrameworks += new TestFramework("munit.Framework"),
   Test / scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) },

diff --git a/demo/src/main/scala/demo/scenes/NoTerminalUI.scala b/demo/src/main/scala/demo/scenes/NoTerminalUI.scala
@@ -38,7 +38,7 @@ object NoTerminalUI extends Scene[Size, Model, ViewModel]:
 
     case e =>
       val ctx =
-        UIContext(context.toFrameContext.forSubSystems.copy(reference = model.num), Size(1), 1)
+        UIContext(context.toContext.forSubSystems.copy(reference = model.num), Size(1), 1)
       summon[Component[ComponentGroup[Int], Int]].updateModel(ctx, model.components)(e).map { cl =>
         model.copy(components = cl)
       }
@@ -56,5 +56,5 @@ object NoTerminalUI extends Scene[Size, Model, ViewModel]:
       viewModel: ViewModel
   ): Outcome[SceneUpdateFragment] =
     model.components
-      .present(UIContext(context.toFrameContext.forSubSystems.copy(reference = 0), Size(1), 1))
+      .present(UIContext(context.toContext.forSubSystems.copy(reference = 0), Size(1), 1))
       .map(l => SceneUpdateFragment(l))
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,9 @@
-addSbtPlugin("org.scala-js"              % "sbt-scalajs"        % "1.17.0")
-addSbtPlugin("io.indigoengine"          %% "sbt-indigo"         % "0.17.1-SNAPSHOT")
-addSbtPlugin("org.typelevel"             % "sbt-tpolecat"       % "0.5.2")
-addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"       % "0.13.0")
-addSbtPlugin("org.scalameta"             % "sbt-scalafmt"       % "2.5.2")
-addSbtPlugin("org.xerial.sbt"           %% "sbt-sonatype"       % "3.9.7")
-addSbtPlugin("com.jsuereth"             %% "sbt-pgp"            % "2.0.1")
-addSbtPlugin("com.github.reibitto"       % "sbt-welcome"        % "0.4.0")
-addSbtPlugin("org.scala-js"              % "sbt-jsdependencies" % "1.0.2")
+addSbtPlugin("org.scala-js"        % "sbt-scalajs"        % "1.18.1")
+addSbtPlugin("io.indigoengine"    %% "sbt-indigo"         % "0.17.1-SNAPSHOT")
+addSbtPlugin("org.typelevel"       % "sbt-tpolecat"       % "0.5.2")
+addSbtPlugin("ch.epfl.scala"       % "sbt-scalafix"       % "0.14.0")
+addSbtPlugin("org.scalameta"       % "sbt-scalafmt"       % "2.5.2")
+addSbtPlugin("org.xerial.sbt"     %% "sbt-sonatype"       % "3.12.2")
+addSbtPlugin("com.github.sbt"     %% "sbt-pgp"            % "2.3.1")
+addSbtPlugin("com.github.reibitto" % "sbt-welcome"        % "0.5.0")
+addSbtPlugin("org.scala-js"        % "sbt-jsdependencies" % "1.0.2")