Skip to content

Commit

Permalink
Upgrade to Scala 3.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
davesmith00000 committed Dec 26, 2024
1 parent fe21de8 commit d604a3e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ ThisBuild / versionScheme := Some("early-semver")

ThisBuild / scalaVersion := scala3Version

lazy val tyrianVersion = TyrianVersion.getVersion
lazy val scala3Version = "3.5.0"
lazy val tyrianVersion = TyrianVersion.getVersion
lazy val scala3Version = "3.6.2"

lazy val commonSettings: Seq[sbt.Def.Setting[_]] = Seq(
lazy val commonSettings: Seq[sbt.Def.Setting[?]] = Seq(
version := tyrianVersion,
organization := "io.indigoengine",
libraryDependencies ++= Seq(
Expand Down Expand Up @@ -45,12 +45,12 @@ lazy val commonScalacOptions = Def.setting {
}
}

lazy val commonJsSettings: Seq[sbt.Def.Setting[_]] = Seq(
lazy val commonJsSettings: Seq[sbt.Def.Setting[?]] = Seq(
Test / scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) },
scalacOptions ++= commonScalacOptions.value
)

lazy val commonBrowserTestJsSettings: Seq[sbt.Def.Setting[_]] = Seq(
lazy val commonBrowserTestJsSettings: Seq[sbt.Def.Setting[?]] = Seq(
scalacOptions ++= commonScalacOptions.value,
libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % Dependencies.scalajsDomVersion,
Expand All @@ -60,15 +60,15 @@ lazy val commonBrowserTestJsSettings: Seq[sbt.Def.Setting[_]] = Seq(
)
)

lazy val firefoxJsSettings: Seq[sbt.Def.Setting[_]] = Seq(
lazy val firefoxJsSettings: Seq[sbt.Def.Setting[?]] = Seq(
jsEnv := {
val options = new FirefoxOptions()
options.setHeadless(true)
new SeleniumJSEnv(options)
}
)

lazy val chromeJsSettings: Seq[sbt.Def.Setting[_]] = Seq(
lazy val chromeJsSettings: Seq[sbt.Def.Setting[?]] = Seq(
jsEnv := {
val options = new ChromeOptions()
options.setHeadless(true)
Expand Down Expand Up @@ -106,7 +106,7 @@ lazy val tyrianProject =
.settings(
neverPublish,
commonSettings,
name := "Tyrian",
name := "Tyrian",
usefulTasks := customTasksAliases,
logoSettings(version)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package example

import cats.Applicative
import cats.implicits.*
import tyrian.Attribute
import tyrian.Html
import tyrian.Html.*
import tyrian.htmx.Html.*
Expand Down
2 changes: 1 addition & 1 deletion sandbox-zio/tyrianapp.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { TyrianApp } from "./.js/target/scala-3.5.0/sandbox-zio-fastopt/main.js";
import { TyrianApp } from "./.js/target/scala-3.6.2/sandbox-zio-fastopt/main.js";

TyrianApp.launch("myapp");
2 changes: 1 addition & 1 deletion sandbox/tyrianapp.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TyrianApp } from "./.js/target/scala-3.5.0/sandbox-fastopt/main.js";
import { TyrianApp } from "./.js/target/scala-3.6.2/sandbox-fastopt/main.js";

TyrianApp.launch(document.getElementById("myapp"), {
message: "Hello, Tyrian!",
Expand Down
9 changes: 5 additions & 4 deletions tyrian/src/main/scala/tyrian/runtime/Renderer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object Renderer:
r.runningAt(time.toMillis) ->
F.delay(
dom.window.requestAnimationFrame(_ =>
render(dispatcher, renderer, model, view, onMsg, router)(time.toMillis)
render(dispatcher, renderer, model, view, onMsg, router, clock)(time.toMillis)
)
).void

Expand All @@ -57,8 +57,9 @@ object Renderer:
model: Ref[F, Model],
view: Model => Html[Msg],
onMsg: Msg => Unit,
router: Location => Msg
)(t: Long)(using F: Async[F], clock: Clock[F]): Unit =
router: Location => Msg,
clock: Clock[F]
)(t: Long)(using F: Async[F]): Unit =
dispatcher.unsafeRunAndForget {
for {
time <- clock.realTime.map(_.toMillis)
Expand All @@ -81,7 +82,7 @@ object Renderer:
F.delay(
// Loop
dom.window.requestAnimationFrame(_ =>
render(dispatcher, renderer, model, view, onMsg, router)(time)
render(dispatcher, renderer, model, view, onMsg, router, clock)(time)
)
).void
}.flatten
Expand Down
2 changes: 1 addition & 1 deletion tyrian/src/main/scala/tyrian/runtime/TyrianRuntime.scala
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ object TyrianRuntime:
}

_ <- runCmd(cmdsAndSubs._1) *> runSub(cmdsAndSubs._2)
_ <- Renderer.redraw(dispatcher, renderer, model, view, onMsg, router)
_ <- Renderer.redraw(dispatcher, renderer, model, view, onMsg, router)(using F, clock)
} yield ()
}.foreverM

Expand Down

0 comments on commit d604a3e

Please sign in to comment.