fix multibuild and use version supported by native and js

esarbe · esarbe · commit 1bc2149a06ce · 2024-01-22T14:04:42.000+01:00
diff --git 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,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)

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ lazy val commonSettings = Seq(`
`28`	`28`	`homepage := Some(url("https://github.com/gnieh/diffson"))`
`29`	`29`	`)`
`30`	`30`
`31`		`-lazy val diffson = tlCrossRootProject.aggregate(core, sprayJson, circe, playJson, testkit)`
	`31`	`+lazy val diffson = tlCrossRootProject.aggregate(core, sprayJson, circe, playJson, ujson, testkit)`
`32`	`32`
`33`	`33`	`lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)`
`34`	`34`	`.crossType(CrossType.Pure)`
`@@ -92,15 +92,16 @@ lazy val circe = crossProject(JSPlatform, JVMPlatform, NativePlatform)`
`92`	`92`	`)`
`93`	`93`	`.dependsOn(core, testkit % Test)`
`94`	`94`
	`95`	`+val ujsonVersion = "3.1.3"`
`95`	`96`	`lazy val ujson = crossProject(JSPlatform, JVMPlatform, NativePlatform)`
`96`	`97`	`.crossType(CrossType.Full)`
`97`	`98`	`.in(file("ujson"))`
`98`	`99`	`.settings(commonSettings: _*)`
`99`	`100`	`.settings(`
`100`	`101`	`name := "diffson-ujson",`
`101`	`102`	`libraryDependencies ++= Seq(`
`102`		`- "com.lihaoyi" %% "ujson" % "3.1.4",`
`103`		`- "com.lihaoyi" %% "upickle" % "3.1.4"`
	`103`	`+ "com.lihaoyi" %%% "ujson" % ujsonVersion,`
	`104`	`+ "com.lihaoyi" %%% "upickle" % ujsonVersion,`
`104`	`105`	`)`
`105`	`106`	`)`
`106`	`107`	`.dependsOn(core, testkit % Test)`