Skip to content

Commit

Permalink
Build: Bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
raquo committed Jul 9, 2023
1 parent 9c8ff7d commit 54ebd82
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Waypoint can be used with other Scala.js libraries too, not just Laminar. More o

Waypoint docs are not as exhaustive as Laminar's, but we have examples, and Waypoint is very, very small, so this shouldn't be a big deal. Just make sure you understand how the browser's History API works.

"com.raquo" %%% "waypoint" % "6.0.0" // Depends on Airstream 15.0.0 & URL DSL 0.6.0
"com.raquo" %%% "waypoint" % "7.0.0" // Depends on Airstream 16.0.0 & URL DSL 0.6.0



Expand Down Expand Up @@ -425,7 +425,7 @@ If a Waypoint error message pointed you to this section of the docs, that means
To work around this, you should use something like this:

```scala
def canonicalOrigin = if (dom.document.location.protocol == "file:") "file://" else dom.document.location.origin.get
def canonicalOrigin = if (dom.document.location.protocol == "file:") "file://" else dom.document.location.origin
```

or just use `router.origin` which is derived from `dom.document.location` in the same manner (unless you overrode the Router's `origin` constructor param).
Expand Down
2 changes: 1 addition & 1 deletion js/src/main/scala/com/raquo/waypoint/Router.scala
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,6 @@ object Router {
* This helper fixes this discrepancy.
*/
private val canonicalDocumentOrigin: String = {
if (dom.document.location.protocol == "file:") "file://" else dom.document.location.origin.get
if (dom.document.location.protocol == "file:") "file://" else dom.document.location.origin
}
}
8 changes: 4 additions & 4 deletions project/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ object Versions {

val Scala_2_13 = "2.13.10"

val Scala_3 = "3.2.0"
val Scala_3 = "3.3.0"

// -- Dependencies --

val Airstream = "15.0.0"
val Airstream = "16.0.0"

val UrlDsl = "0.6.0"

val ScalaJsDom = "2.3.0"
val ScalaJsDom = "2.6.0"

// -- Test --

val Laminar = "15.0.0-M7"
val Laminar = "16.0.0"

val Upickle = "2.0.0"

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
logLevel := Level.Warn

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")

addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")

Expand Down

0 comments on commit 54ebd82

Please sign in to comment.