From 106553c11c8481a24004112164e307cc24d89f93 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Sun, 24 Mar 2024 17:41:16 +0000 Subject: [PATCH] Upgrade Scala to 3.3.3 --- build.sbt | 8 ++++---- examples/build.sbt | 2 +- examples/mill/build.sc | 2 +- examples/server-examples/build.sbt | 2 +- .../src/main/scala/com/example/example/Routes.scala | 2 +- website/build.sbt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index a0f7dffb..11697b90 100644 --- a/build.sbt +++ b/build.sbt @@ -15,10 +15,10 @@ ThisBuild / versionScheme := Some("early-semver") ThisBuild / scalaVersion := scala3Version lazy val tyrianVersion = TyrianVersion.getVersion -lazy val scala3Version = "3.3.1" +lazy val scala3Version = "3.3.3" lazy val tyrianDocsVersion = "0.10.0" lazy val scalaJsDocsVersion = "1.15.0" -lazy val scalaDocsVersion = "3.3.1" +lazy val scalaDocsVersion = "3.3.3" lazy val indigoDocsVersion = "0.16.0" lazy val commonSettings: Seq[sbt.Def.Setting[_]] = Seq( @@ -283,8 +283,8 @@ lazy val docs = .enablePlugins(MdocPlugin) .settings( neverPublish, - organization := "io.indigoengine", - mdocJS := Some(jsdocs), + organization := "io.indigoengine", + mdocJS := Some(jsdocs), mdocVariables := Map( "VERSION" -> tyrianDocsVersion, "SCALAJS_VERSION" -> scalaJsDocsVersion, diff --git a/examples/build.sbt b/examples/build.sbt index f5675a3c..240a39ae 100644 --- a/examples/build.sbt +++ b/examples/build.sbt @@ -6,7 +6,7 @@ import sbtwelcome._ Global / onChangedBuildSource := ReloadOnSourceChanges lazy val tyrianVersion = TyrianVersion.getVersion -lazy val scala3Version = "3.3.1" +lazy val scala3Version = "3.3.3" lazy val commonSettings: Seq[sbt.Def.Setting[_]] = Seq( version := tyrianVersion, diff --git a/examples/mill/build.sc b/examples/mill/build.sc index 8f2b465e..1212c65e 100644 --- a/examples/mill/build.sc +++ b/examples/mill/build.sc @@ -8,7 +8,7 @@ import $ivy.`io.github.davidgregory084::mill-tpolecat::0.3.5` import io.github.davidgregory084.TpolecatModule object counter extends ScalaJSModule with TpolecatModule { - def scalaVersion = "3.3.1" + def scalaVersion = "3.3.3" def scalaJSVersion = "1.15.0" def buildSite() = diff --git a/examples/server-examples/build.sbt b/examples/server-examples/build.sbt index 5e43dcb4..7bab6c69 100644 --- a/examples/server-examples/build.sbt +++ b/examples/server-examples/build.sbt @@ -8,7 +8,7 @@ val LogbackVersion = "1.2.6" val MunitCatsEffectVersion = "1.0.6" lazy val tyrianVersion = TyrianVersion.getVersion -lazy val scala3Version = "3.3.1" +lazy val scala3Version = "3.3.3" Global / onChangedBuildSource := ReloadOnSourceChanges diff --git a/examples/server-examples/server/src/main/scala/com/example/example/Routes.scala b/examples/server-examples/server/src/main/scala/com/example/example/Routes.scala index fabb1f12..16eff4d3 100644 --- a/examples/server-examples/server/src/main/scala/com/example/example/Routes.scala +++ b/examples/server-examples/server/src/main/scala/com/example/example/Routes.scala @@ -25,7 +25,7 @@ object Routes: case request @ GET -> Root / "spa.js" => val spa = fs2.io.file.Path( "." - ) / "spa" / "target" / "scala-3.3.1" / "spa-opt" / "main.js" + ) / "spa" / "target" / "scala-3.3.3" / "spa-opt" / "main.js" StaticFile.fromPath(spa.absolute, Some(request)).getOrElseF(NotFound(spa.absolute.toString)) case GET -> Root / "ssr" / in => diff --git a/website/build.sbt b/website/build.sbt index f772e6e0..56511fa3 100644 --- a/website/build.sbt +++ b/website/build.sbt @@ -15,7 +15,7 @@ import scala.concurrent.duration.DurationInt import laika.sbt.LaikaPreviewConfig import java.time.OffsetDateTime -ThisBuild / scalaVersion := "3.3.1" +ThisBuild / scalaVersion := "3.3.3" enablePlugins(LaikaPlugin, GhpagesPlugin)