Merge pull request #12 from randm-ch/master

Upgrade Laminar to 17.0.0

build.sbt

@@ -1,6 +1,4 @@
-lazy val Scala213               = "2.13.8"
-lazy val Scala212               = "2.12.15"
-lazy val Scala3                 = "3.0.0"
+lazy val Scala213               = "2.13.14"
 lazy val supportedScalaVersions = List(Scala213)
 
 ThisBuild / scalaVersion := Scala213
@@ -54,7 +52,7 @@ lazy val core = project
     name := "formula",
     scalacOptions ++= Seq("-Ymacro-annotations"),
     libraryDependencies ++= Seq(
-      "com.raquo"                    %%% "laminar"       % "15.0.0",
+      "com.raquo"                    %%% "laminar"       % "17.0.0",
       "com.softwaremill.magnolia1_2" %%% "magnolia"      % "1.1.2",
       "org.scala-lang"                 % "scala-reflect" % scalaVersion.value % Provided
     ),
@@ -69,9 +67,9 @@ lazy val examples = project
   .settings(
     name := "formula-examples",
     libraryDependencies ++= Seq(
-      "com.raquo"         %%% "laminar"              % "15.0.0",
-      "io.github.cquiroz" %%% "scala-java-time"      % "2.4.0",
-      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.4.0"
+      "com.raquo"         %%% "laminar"              % "17.0.0",
+      "io.github.cquiroz" %%% "scala-java-time"      % "2.6.0",
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.6.0"
     ),
     scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.ESModule) },
     scalaJSLinkerConfig ~= { _.withSourceMap(false) },

core/src/main/scala/formula/Form.scala

@@ -153,7 +153,7 @@ object Form {
         }
 
         override def signal: L.Signal[Validation[String, List[A]]] =
-          variables.signal.flatMap {
+          variables.signal.flatMapSwitch {
             _.foldLeft[L.Signal[Validation[String, List[A]]]](Val(Validation(List.empty[A]))) { (acc, v) =>
               acc.combineWithFn(v.signal) { case (l, r) =>
                 l.zip(r).map { case (as, a) => as.appended(a) }
@@ -221,7 +221,7 @@ object Form {
           varA.get zip bFormVar.now().variable.get
 
         override def signal: Signal[Validation[String, (Any, Any)]] =
-          bFormVar.signal.flatMap { bForm =>
+          bFormVar.signal.flatMapSwitch { bForm =>
             varA.signal.combineWithFn(bForm.variable.signal)(_ zip _)
           }
       }
@@ -273,7 +273,7 @@ object Form {
           formVar.now().variable.get
 
         override def signal: Signal[Validation[String, A]] =
-          formVar.signal.flatMap(_.variable.signal)
+          formVar.signal.flatMapSwitch(_.variable.signal)
       }
 
       val node =

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.8.2
+sbt.version = 1.10.1

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-js"     % "sbt-scalajs"    % "1.13.1")
+addSbtPlugin("org.scala-js"     % "sbt-scalajs"    % "1.16.0")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates"    % "0.6.3")
 addSbtPlugin("com.geirsson"     % "sbt-ci-release" % "1.5.7")
 addSbtPlugin("ch.epfl.scala"    % "sbt-scalafix"   % "0.10.1")