Skip to content

Commit

Permalink
Merge pull request #149 from http4s/update/scala-library-2.13.13
Browse files Browse the repository at this point in the history
Update scala-library to 2.13.13
  • Loading branch information
ybasket authored Mar 10, 2024
2 parents 434b5cc + 1ce096d commit 29aed7f
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ThisBuild / developers := List(
tlGitHubDev("ybasket", "Yannick Heiber"),
)

val Scala213 = "2.13.12"
val Scala213 = "2.13.13"
ThisBuild / crossScalaVersions := Seq("2.12.19", Scala213, "3.3.3")
ThisBuild / scalaVersion := Scala213

Expand Down
2 changes: 1 addition & 1 deletion csv/src/test/scala/org/http4s/fs2data/csv/CsvSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class CsvSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
csvEncoderForPipe(encodeUsingFirstHeaders())
implicit val decoder: EntityDecoder[IO, Stream[IO, Data]] =
csvDecoderForPipe(decodeUsingHeaders[Data]())
val in = List(Data("a", 2, true), Data("b", 3, false))
val in = List(Data("a", 2, third = true), Data("b", 3, third = false))
Stream
.force(Request[IO]().withEntity(Stream.emits(in).covary[IO]).as[Stream[IO, Data]])
.compile
Expand Down
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class Csv2CborHttpEndpoint[F[_]](implicit F: Async[F]) extends Http4sDsl[F] {
}

private def toCbor(row: Row): CborValue =
CborValue.Array(row.values.toList.map(CborValue.TextString(_)), false)
CborValue.Array(row.values.toList.map(CborValue.TextString(_)), indefinite = false)
}
```

Expand Down Expand Up @@ -207,4 +207,4 @@ curl -s -X "POST" "http://localhost:8080/prettyJson" \
},
"d": 1
}
```
```
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class JsonEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
.withEntity(in)
.as[Stream[IO, Token]]
.map(Request[IO]().withEntity(_))
.flatMap(EntityDecoder.text[IO].decode(_, false).value)
.flatMap(EntityDecoder.text[IO].decode(_, strict = false).value)
.assertEquals(Right(in))
}

Expand All @@ -65,7 +65,7 @@ class JsonEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
.withEntity(in)
.as[Stream[IO, Token]]
.map(Request[IO]().withEntity(_)(jsonTokensEncoder[IO](prettyPrint = true)))
.flatMap(EntityDecoder.text[IO].decode(_, false).value)
.flatMap(EntityDecoder.text[IO].decode(_, strict = false).value)
.assertEquals(Right(in))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,6 @@ object generators {
label <- genNcName
attributes <- genAttributes
children <- genContent
elem = Elem(prefix, label, attributes, TopScope, true, children: _*)
elem = Elem(prefix, label, attributes, TopScope, minimizeEmpty = true, child = children: _*)
} yield Utility.trim(elem).asInstanceOf[Elem]
}
4 changes: 2 additions & 2 deletions xml/src/test/scala/org/http4s/fs2data/xml/XmlEventSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class XmlEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
.withEntity(in)
.as[Stream[IO, XmlEvent]]
.map(Request[IO]().withEntity(_))
.flatMap(EntityDecoder.text[IO].decode(_, false).value)
.flatMap(EntityDecoder.text[IO].decode(_, strict = false).value)
.assertEquals(Right(in))
}

Expand All @@ -64,7 +64,7 @@ class XmlEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
.force(
Request[IO]()
.withEntity(in.lift[IO])
.as[Stream[IO, XmlEvent]](implicitly, xmlEventsDecoder(false))
.as[Stream[IO, XmlEvent]](implicitly, xmlEventsDecoder(includeComments = false))
)
.compile
.toList
Expand Down

0 comments on commit 29aed7f

Please sign in to comment.