Skip to content

Commit

Permalink
fix multibuild and use version supported by native and js
Browse files Browse the repository at this point in the history
  • Loading branch information
esarbe committed Jan 19, 2024
1 parent e94f028 commit 4dae2ef
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 @@ -28,7 +28,7 @@ lazy val commonSettings = Seq(
homepage := Some(url("https://github.com/gnieh/diffson"))
)

lazy val diffson = tlCrossRootProject.aggregate(core, sprayJson, circe, playJson, testkit)
lazy val diffson = tlCrossRootProject.aggregate(core, sprayJson, circe, playJson, ujson, testkit)

lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.crossType(CrossType.Pure)
Expand Down Expand Up @@ -92,15 +92,16 @@ lazy val circe = crossProject(JSPlatform, JVMPlatform, NativePlatform)
)
.dependsOn(core, testkit % Test)

val ujsonVersion = "3.1.3"
lazy val ujson = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.crossType(CrossType.Full)
.in(file("ujson"))
.settings(commonSettings: _*)
.settings(
name := "diffson-ujson",
libraryDependencies ++= Seq(
"com.lihaoyi" %% "ujson" % "3.1.4",
"com.lihaoyi" %% "upickle" % "3.1.4"
"com.lihaoyi" %%% "ujson" % ujsonVersion,
"com.lihaoyi" %%% "upickle" % ujsonVersion,
)
)
.dependsOn(core, testkit % Test)
Expand Down

0 comments on commit 4dae2ef

Please sign in to comment.