From 4dae2ef9dafccfd5af393f4f2f6afcd858a4f60b Mon Sep 17 00:00:00 2001 From: Raphael Bosshard Date: Fri, 19 Jan 2024 13:40:49 +0100 Subject: [PATCH] fix multibuild and use version supported by native and js --- build.sbt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index fd06996..74ad349 100644 --- a/build.sbt +++ b/build.sbt @@ -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) @@ -92,6 +92,7 @@ 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")) @@ -99,8 +100,8 @@ lazy val ujson = crossProject(JSPlatform, JVMPlatform, NativePlatform) .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)