Skip to content

Commit 29aed7f

Browse files
authored
Merge pull request #149 from http4s/update/scala-library-2.13.13
Update scala-library to 2.13.13
2 parents 434b5cc + 1ce096d commit 29aed7f

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ThisBuild / developers := List(
77
tlGitHubDev("ybasket", "Yannick Heiber"),
88
)
99

10-
val Scala213 = "2.13.12"
10+
val Scala213 = "2.13.13"
1111
ThisBuild / crossScalaVersions := Seq("2.12.19", Scala213, "3.3.3")
1212
ThisBuild / scalaVersion := Scala213
1313

csv/src/test/scala/org/http4s/fs2data/csv/CsvSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class CsvSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
7474
csvEncoderForPipe(encodeUsingFirstHeaders())
7575
implicit val decoder: EntityDecoder[IO, Stream[IO, Data]] =
7676
csvDecoderForPipe(decodeUsingHeaders[Data]())
77-
val in = List(Data("a", 2, true), Data("b", 3, false))
77+
val in = List(Data("a", 2, third = true), Data("b", 3, third = false))
7878
Stream
7979
.force(Request[IO]().withEntity(Stream.emits(in).covary[IO]).as[Stream[IO, Data]])
8080
.compile

docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class Csv2CborHttpEndpoint[F[_]](implicit F: Async[F]) extends Http4sDsl[F] {
138138
}
139139

140140
private def toCbor(row: Row): CborValue =
141-
CborValue.Array(row.values.toList.map(CborValue.TextString(_)), false)
141+
CborValue.Array(row.values.toList.map(CborValue.TextString(_)), indefinite = false)
142142
}
143143
```
144144

@@ -207,4 +207,4 @@ curl -s -X "POST" "http://localhost:8080/prettyJson" \
207207
},
208208
"d": 1
209209
}
210-
```
210+
```

json/src/test/scala/org/http4s/fs2data/json/JsonEventSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class JsonEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
4343
.withEntity(in)
4444
.as[Stream[IO, Token]]
4545
.map(Request[IO]().withEntity(_))
46-
.flatMap(EntityDecoder.text[IO].decode(_, false).value)
46+
.flatMap(EntityDecoder.text[IO].decode(_, strict = false).value)
4747
.assertEquals(Right(in))
4848
}
4949

@@ -65,7 +65,7 @@ class JsonEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
6565
.withEntity(in)
6666
.as[Stream[IO, Token]]
6767
.map(Request[IO]().withEntity(_)(jsonTokensEncoder[IO](prettyPrint = true)))
68-
.flatMap(EntityDecoder.text[IO].decode(_, false).value)
68+
.flatMap(EntityDecoder.text[IO].decode(_, strict = false).value)
6969
.assertEquals(Right(in))
7070
}
7171
}

xml-scala/src/test/scala/org/http4s/fs2data/xml/scalaxml/generators.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,6 @@ object generators {
474474
label <- genNcName
475475
attributes <- genAttributes
476476
children <- genContent
477-
elem = Elem(prefix, label, attributes, TopScope, true, children: _*)
477+
elem = Elem(prefix, label, attributes, TopScope, minimizeEmpty = true, child = children: _*)
478478
} yield Utility.trim(elem).asInstanceOf[Elem]
479479
}

xml/src/test/scala/org/http4s/fs2data/xml/XmlEventSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class XmlEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
4444
.withEntity(in)
4545
.as[Stream[IO, XmlEvent]]
4646
.map(Request[IO]().withEntity(_))
47-
.flatMap(EntityDecoder.text[IO].decode(_, false).value)
47+
.flatMap(EntityDecoder.text[IO].decode(_, strict = false).value)
4848
.assertEquals(Right(in))
4949
}
5050

@@ -64,7 +64,7 @@ class XmlEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
6464
.force(
6565
Request[IO]()
6666
.withEntity(in.lift[IO])
67-
.as[Stream[IO, XmlEvent]](implicitly, xmlEventsDecoder(false))
67+
.as[Stream[IO, XmlEvent]](implicitly, xmlEventsDecoder(includeComments = false))
6868
)
6969
.compile
7070
.toList

0 commit comments

Comments
 (0)