From 9b9e34cc3c61265c9a8a2a16d638c92135139460 Mon Sep 17 00:00:00 2001 From: adamw Date: Thu, 17 Feb 2022 15:34:58 +0100 Subject: [PATCH 1/3] Closes #1874, enable scala3 for asyncapi docs --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0f1f931dbf..842407103f 100644 --- a/build.sbt +++ b/build.sbt @@ -753,7 +753,7 @@ lazy val asyncapiDocs: ProjectMatrix = (projectMatrix in file("docs/asyncapi-doc "com.softwaremill.sttp.shared" %% "akka" % Versions.sttpShared % Test ) ) - .jvmPlatform(scalaVersions = scala2Versions) + .jvmPlatform(scalaVersions = scala2And3Versions) .dependsOn(asyncapiModel, core, apispecDocs, tests % Test, asyncapiCirceYaml % Test) lazy val swaggerUi: ProjectMatrix = (projectMatrix in file("docs/swagger-ui")) From a805df695b6e7953aae1d0a1cc170f8cdac7cf0c Mon Sep 17 00:00:00 2001 From: adamw Date: Thu, 17 Feb 2022 15:42:36 +0100 Subject: [PATCH 2/3] Enable more modules for scala3 --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 842407103f..116b639831 100644 --- a/build.sbt +++ b/build.sbt @@ -500,7 +500,7 @@ lazy val json4s: ProjectMatrix = (projectMatrix in file("json/json4s")) scalaTest.value % Test ) ) - .jvmPlatform(scalaVersions = scala2Versions) + .jvmPlatform(scalaVersions = scala2And3Versions) .dependsOn(core) lazy val playJson: ProjectMatrix = (projectMatrix in file("json/playjson")) @@ -544,9 +544,9 @@ lazy val uPickleJson: ProjectMatrix = (projectMatrix in file("json/upickle")) scalaTest.value % Test ) ) - .jvmPlatform(scalaVersions = scala2Versions) + .jvmPlatform(scalaVersions = scala2And3Versions) .jsPlatform( - scalaVersions = scala2Versions, + scalaVersions = scala2And3Versions, settings = commonJsSettings ++ Seq( libraryDependencies ++= Seq( "io.github.cquiroz" %%% "scala-java-time" % Versions.jsScalaJavaTime % Test @@ -613,7 +613,7 @@ lazy val zioJson: ProjectMatrix = (projectMatrix in file("json/zio")) ) .jvmPlatform(scalaVersions = scala2And3Versions) .jsPlatform( - scalaVersions = scala2Versions, + scalaVersions = scala2And3Versions, settings = commonJsSettings ) .dependsOn(core) From 9a41dc119537cbaf850bd196ec05a7a4de6f2506 Mon Sep 17 00:00:00 2001 From: Adam Warski Date: Thu, 17 Feb 2022 17:21:11 +0100 Subject: [PATCH 3/3] Disable scala3 for json4s --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 116b639831..84fd50e4ba 100644 --- a/build.sbt +++ b/build.sbt @@ -500,7 +500,7 @@ lazy val json4s: ProjectMatrix = (projectMatrix in file("json/json4s")) scalaTest.value % Test ) ) - .jvmPlatform(scalaVersions = scala2And3Versions) + .jvmPlatform(scalaVersions = scala2Versions) .dependsOn(core) lazy val playJson: ProjectMatrix = (projectMatrix in file("json/playjson"))