From 3e0436c9d2d62b9d2641a904e8c871d560c0bc0e Mon Sep 17 00:00:00 2001 From: plokhotnyuk Date: Wed, 20 Dec 2023 15:50:18 +0100 Subject: [PATCH] Update Scala 3.x to 3.3.2-RC1 --- build.sbt | 10 +++++----- jsoniter-scala-benchmark/js/scala-3-fullopt.html | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 6eab17afd..0eb1fcbb4 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ lazy val commonSettings = Seq( url = url("https://twitter.com/aplokhotnyuk") ) ), - scalaVersion := "3.3.1", + scalaVersion := "3.3.2-RC1", scalacOptions ++= Seq( "-deprecation", "-encoding", "UTF-8", @@ -145,7 +145,7 @@ lazy val `jsoniter-scala-core` = crossProject(JVMPlatform, JSPlatform, NativePla .settings(commonSettings) .settings(publishSettings) .settings( - crossScalaVersions := Seq("3.3.1", "2.13.12", "2.12.18"), + crossScalaVersions := Seq("3.3.2-RC1", "2.13.12", "2.12.18"), libraryDependencies ++= Seq( "org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0" % Test, "org.scalatestplus" %%% "scalacheck-1-17" % "3.2.17.0" % Test, @@ -172,7 +172,7 @@ lazy val `jsoniter-scala-macros` = crossProject(JVMPlatform, JSPlatform, NativeP .settings(commonSettings) .settings(publishSettings) .settings( - crossScalaVersions := Seq("3.3.1", "2.13.12", "2.12.18"), + crossScalaVersions := Seq("3.3.2-RC1", "2.13.12", "2.12.18"), libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, _)) => Seq( "org.scala-lang" % "scala-reflect" % scalaVersion.value @@ -214,7 +214,7 @@ lazy val `jsoniter-scala-circe` = crossProject(JVMPlatform, JSPlatform, NativePl .settings(commonSettings) .settings(publishSettings) .settings( - crossScalaVersions := Seq("3.3.1", "2.13.12", "2.12.18"), + crossScalaVersions := Seq("3.3.2-RC1", "2.13.12", "2.12.18"), libraryDependencies ++= Seq( "io.circe" %%% "circe-core" % "0.14.6", "io.circe" %%% "circe-parser" % "0.14.6" % Test, @@ -237,7 +237,7 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform) .settings(commonSettings) .settings(noPublishSettings) .settings( - crossScalaVersions := Seq("3.3.1", "2.13.12"), + crossScalaVersions := Seq("3.3.2-RC1", "2.13.12"), scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq("-Yretain-trees", "-Xmax-inlines:100") case _ => Seq() diff --git a/jsoniter-scala-benchmark/js/scala-3-fullopt.html b/jsoniter-scala-benchmark/js/scala-3-fullopt.html index 68b7d5906..a8ad34883 100644 --- a/jsoniter-scala-benchmark/js/scala-3-fullopt.html +++ b/jsoniter-scala-benchmark/js/scala-3-fullopt.html @@ -6,7 +6,7 @@
Loading...
- - + + \ No newline at end of file