From 947bd82bfa895f48ae281daae1fb644e191d8587 Mon Sep 17 00:00:00 2001 From: Iurii Malchenko Date: Thu, 29 Feb 2024 16:48:20 +0100 Subject: [PATCH] Laminar 17.0.0-M8 --- .../base/src/main/scala/io/laminext/base/ComponentBase.scala | 5 ++--- project/DependencyVersions.scala | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/base/src/main/scala/io/laminext/base/ComponentBase.scala b/modules/base/src/main/scala/io/laminext/base/ComponentBase.scala index 80d93cf..428eaa3 100644 --- a/modules/base/src/main/scala/io/laminext/base/ComponentBase.scala +++ b/modules/base/src/main/scala/io/laminext/base/ComponentBase.scala @@ -1,5 +1,6 @@ package io.laminext.base +import com.raquo.laminar import com.raquo.laminar.modifiers.RenderableNode import com.raquo.laminar.nodes.ChildNode.Base import com.raquo.laminar.nodes.ReactiveHtmlElement @@ -18,9 +19,7 @@ object ComponentBase { override def asNode(value: ComponentBase[R]): Base = value.el - override def asNodeSeq(values: Seq[ComponentBase[R]]): Seq[Base] = values.map(_.el) - - override def asNodeIterable(values: Iterable[ComponentBase[R]]): Iterable[Base] = values.map(_.el) + override def asNodeSeq(values: laminar.Seq[ComponentBase[R]]): laminar.Seq[Base] = values.map(_.el) override def asNodeOption(value: Option[ComponentBase[R]]): Option[Base] = value.map(_.el) diff --git a/project/DependencyVersions.scala b/project/DependencyVersions.scala index b6809f8..0d11174 100644 --- a/project/DependencyVersions.scala +++ b/project/DependencyVersions.scala @@ -1,12 +1,12 @@ object DependencyVersions { val jsdom = "16.4.0" - val laminar = "17.0.0-M6" + val laminar = "17.0.0-M8" val `scala-test` = "3.2.9" val stringdiff = "0.3.4" val domtestutils = "18.0.1" val cats = "2.10.0" - val upickle = "3.1.4" + val upickle = "3.2.0" val circe = "0.14.6" // -- website diff --git a/project/build.properties b/project/build.properties index abbbce5..04267b1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index 5cc8fda..f609ea1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.4.0" libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1" libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0" -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")