From bc06ffd6fd95d3ec3fcb8013280219ec58b8b31a Mon Sep 17 00:00:00 2001 From: Pask Date: Thu, 13 Jan 2022 20:57:32 +0100 Subject: [PATCH 1/2] Attempt to add support scala 3 in scalanative for core and ws --- build.sbt | 4 ++-- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 9c743ed..31a46e2 100644 --- a/build.sbt +++ b/build.sbt @@ -109,7 +109,7 @@ lazy val core = (projectMatrix in file("core")) settings = commonJsSettings ++ browserChromeTestSettings ) .nativePlatform( - scalaVersions = scala2, + scalaVersions = scala2 ++ scala3, settings = commonNativeSettings ) @@ -127,7 +127,7 @@ lazy val ws = (projectMatrix in file("ws")) settings = commonJsSettings ++ browserChromeTestSettings ) .nativePlatform( - scalaVersions = scala2, + scalaVersions = scala2 ++ scala3, settings = commonNativeSettings ) .dependsOn(core) diff --git a/project/plugins.sbt b/project/plugins.sbt index efd4e0e..82a9ab1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1" addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3-RC1") addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0") val sbtSoftwareMillVersion = "2.0.9" From 634e09cd2c235ce48a9a216f243cb3bcaf32aad8 Mon Sep 17 00:00:00 2001 From: Pask Date: Thu, 28 Apr 2022 14:17:21 +0200 Subject: [PATCH 2/2] Updated sttp-model to 1.4.26 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 34c39da..d5c9c67 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ val scala2_13 = "2.13.8" val scala2 = List(scala2_11, scala2_12, scala2_13) val scala3 = List("3.1.2") -val sttpModelVersion = "1.4.25" +val sttpModelVersion = "1.4.26" val scalaTestVersion = "3.2.12" val zio1Version = "1.0.14"