Skip to content

Commit

Permalink
Merge pull request #1796 from kyri-petrou/jsoniter-scala-native
Browse files Browse the repository at this point in the history
Add Scala Native build for jsoniter
  • Loading branch information
adamw authored Apr 11, 2023
2 parents 349031d + 59c07e2 commit 890a1e7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ val circeVersion: Option[(Long, Long)] => String = {
case _ => "0.14.1"
}

val jsoniterVersion = "2.13.3"
val jsoniterVersion = "2.22.1"

val playJsonVersion: Option[(Long, Long)] => String = {
case Some((2, 11)) => "2.7.4"
Expand Down Expand Up @@ -175,7 +175,7 @@ def dependenciesFor(version: String)(deps: (Option[(Long, Long)] => ModuleID)*):
deps.map(_.apply(CrossVersion.partialVersion(version)))

lazy val projectsWithOptionalNative: Seq[ProjectReference] = {
val base = core.projectRefs ++ jsonCommon.projectRefs ++ upickle.projectRefs
val base = core.projectRefs ++ jsonCommon.projectRefs ++ upickle.projectRefs ++ jsoniter.projectRefs
if (sys.env.isDefinedAt("STTP_NATIVE")) {
println("[info] STTP_NATIVE defined, including sttp-native in the aggregate projects")
base
Expand Down Expand Up @@ -815,10 +815,11 @@ lazy val jsoniter = (projectMatrix in file("json/jsoniter"))
scalaTest
)
.jvmPlatform(
scalaVersions = scala2 ++ scala3,
scalaVersions = scala2alive ++ scala3,
settings = commonJvmSettings
)
.jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings)
.nativePlatform(scalaVersions = scala2alive ++ scala3, settings = commonNativeSettings)
.dependsOn(core, jsonCommon)

lazy val zioJson = (projectMatrix in file("json/zio-json"))
Expand Down

0 comments on commit 890a1e7

Please sign in to comment.