Skip to content

Commit 15da173

Browse files
authored
[WIP]Bumped upickle to 4.4.1 (#5001)
1 parent 3ed2d3f commit 15da173

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ lazy val picklerJson: ProjectMatrix = (projectMatrix in file("json/pickler"))
926926
.settings(
927927
name := "tapir-json-pickler",
928928
libraryDependencies ++= Seq(
929-
"com.lihaoyi" %%% "upickle" % Versions.upickle,
929+
"com.lihaoyi" %%% "upickle" % Versions.upickle3,
930930
scalaTest.value % Test
931931
)
932932
)
@@ -2300,6 +2300,8 @@ lazy val documentation: ProjectMatrix = (projectMatrix in file("generated-doc"))
23002300
mdocExtraArguments := Seq("--clean-target"),
23012301
publishArtifact := false,
23022302
name := "doc",
2303+
// Force upickle3 to match picklerJson's dependency and avoid version conflict
2304+
dependencyOverrides += "com.lihaoyi" %% "upickle" % Versions.upickle3,
23032305
libraryDependencies ++= Seq(
23042306
"org.playframework" %% "play-netty-server" % Versions.playServer,
23052307
"org.http4s" %% "http4s-blaze-server" % Versions.http4sBlazeServer,

json/upickle/src/test/scala/sttp/tapir/json/upickle/TapirJsonuPickleTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import sttp.tapir.DecodeResult.Error.JsonDecodeException
88
import sttp.tapir.DecodeResult._
99
import sttp.tapir._
1010
import sttp.tapir.generic.auto._
11-
import upickle.core.AbortException
11+
import upickle.core.TraceVisitor
1212
import upickle.default._
1313

1414
object TapirJsonuPickleCodec extends TapirJsonuPickle
@@ -65,6 +65,6 @@ class TapirJsonuPickleTests extends AnyFlatSpec with TapirJsonuPickleTestExtensi
6565

6666
val error = failure.error.asInstanceOf[JsonDecodeException]
6767
error.errors shouldEqual List.empty
68-
error.underlying shouldBe an[AbortException]
68+
error.underlying shouldBe an[TraceVisitor.TraceException]
6969
}
7070
}

project/Versions.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ object Versions {
1919
val pekkoHttp = "1.2.0"
2020
val pekkoStreams = "1.2.0"
2121
val swaggerUi = "5.28.0"
22-
val upickle = "3.3.1"
22+
val upickle = "4.4.1"
23+
val upickle3 = "3.3.1"
2324
val playJson = "3.0.1"
2425
val play29Json = "3.0.6"
2526
val finatra = "24.2.0"

0 commit comments

Comments
 (0)