Skip to content

Commit

Permalink
Merge pull request #1876 from softwaremill/asyncapi-docs-scala3
Browse files Browse the repository at this point in the history
Enable asyncapi-docs, uPickle, zioJson for Scala3
  • Loading branch information
adamw authored Feb 17, 2022
2 parents 8928cb0 + 9a41dc1 commit aba16e1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"))
Expand Down

0 comments on commit aba16e1

Please sign in to comment.