Skip to content

Commit

Permalink
Merge branch 'series/0.17.x' into series/next
Browse files Browse the repository at this point in the history
# Conflicts:
#	website/scala-version.js
  • Loading branch information
yurique committed Jun 14, 2024
2 parents a91cc77 + 0551baf commit aa4d25b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# laminext

![Maven Central](https://img.shields.io/maven-central/v/io.laminext/core_sjs1_2.13.svg?versionPrefix=0.16)
![Maven Central](https://img.shields.io/maven-central/v/io.laminext/core_sjs1_2.13.svg?versionPrefix=0.17)

`laminext` is a set of libraries that provide extensions, utilities and components
for [Laminar](https://github.com/raquo/Laminar) and [Airstream](https://github.com/raquo/Airstream).
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,9 @@ lazy val laminextSiteVersion: String = IO.read(file("website/.laminext-version")
lazy val thisVersionSitePrefix = s"/v/$laminextSiteVersion/"

lazy val vars = Seq(
"laminextVersion" -> "0.17.0-M2",
"laminarVersion" -> "17.0.0-M2",
"scalajsVersion" -> "1.14.0",
"laminextVersion" -> "0.17.0",
"laminarVersion" -> "17.0.0",
"scalajsVersion" -> "1.16.0",
"scala3version" -> "3.3.1",
)

Expand Down
6 changes: 3 additions & 3 deletions project/DependencyVersions.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
object DependencyVersions {

val jsdom = "16.4.0"
val laminar = "17.0.0-M8"
val laminar = "17.0.0"
val `scala-test` = "3.2.9"
val stringdiff = "0.3.4"
val domtestutils = "18.0.1"
Expand All @@ -11,8 +11,8 @@ object DependencyVersions {

// -- website

val sourcecode = "0.3.1"
val frontroute = "0.19.0-M2"
val sourcecode = "0.4.1"
val frontroute = "0.19.0"
val `embedded-files-macro` = "0.2.4"
val `scala-java-time` = "2.5.0"
val `scala-js-macrotask-executor` = "1.1.1"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.15.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

Expand Down
2 changes: 1 addition & 1 deletion website/scala-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const build = fs.readFileSync('../build.sbt', 'utf8')
const isScala3 = /^\s*scalaVersion\s*:=\s*ScalaVersions.v3,\s*$/m

const scala2 = '2.13'
const scala3 = '3.2.0'
const scala3 = '3.3.1'

// const scalaVersion = isScala3.test(build) ? scala3 : scala2;
const scalaVersion = scala2
Expand Down
3 changes: 2 additions & 1 deletion website/src/main/resources/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
laminext is a set of libraries that provide extensions, utilities and components
for [Laminar](https://github.com/raquo/Laminar) and [Airstream](https://github.com/raquo/Airstream).

#### laminext `0.16.x` is for Laminar `16.x`.
#### laminext `0.17.x` is for Laminar `17.x`.

* [core](/core) – core extensions and utilities
* [fetch](/fetch) – an Airstream wrapper for [Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API)
Expand All @@ -14,5 +14,6 @@ for [Laminar](https://github.com/raquo/Laminar) and [Airstream](https://github.c

#### Older versions

* For Laminar `16.x` check out [laminext 0.16.x](https://laminext.dev/v/0.16.x/)
* For Laminar `15.x` check out [laminext 0.15.x](https://laminext.dev/v/0.15.x/)
* For Laminar `0.14.x` check out [laminext 0.14.x](https://laminext.dev/v/0.14.x/)

0 comments on commit aa4d25b

Please sign in to comment.