Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ZIO to 2.1.11 #3190

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Update ZIO to 2.1.11 #3190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dce6f94
Update ZIO to 2.1.11
kyri-petrou Oct 11, 2024
2893b2b
Merge branch 'main' into update/zio
987Nabil Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ object Dependencies {
val NettyVersion = "4.1.112.Final"
val NettyIncubatorVersion = "0.0.25.Final"
val ScalaCompactCollectionVersion = "2.12.0"
val ZioVersion = "2.1.9"
val ZioVersion = "2.1.11"
val ZioCliVersion = "0.5.0"
val ZioJsonVersion = "0.7.1"
val ZioParserVersion = "0.1.10"
Expand Down
5 changes: 3 additions & 2 deletions zio-http/jvm/src/test/scala/zio/http/security/SizeLimitsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ object SizeLimitsSpec extends ZIOHttpSpec {
val DEFAULT_URL_SIZE = 4096
val DEFAULT_HEADER_SIZE = 8192
val DEFAULT_CONTENT_SIZE = 1024 * 100
val ERROR_MARGIN = 3

/*
Checks that for `A` with size until `maxSize`, server responds with `Status.Ok` and `badStatus` after it.
Expand Down Expand Up @@ -63,7 +64,7 @@ object SizeLimitsSpec extends ZIOHttpSpec {
}
info <-
if (expected == status) loop(size + 1, lstTestSize, inc(size)(content), f, expected)
else if (size >= lstTestSize - 2) // adding margin for differences in scala 2 and scala 3
else if (size >= lstTestSize - ERROR_MARGIN) // adding margin for differences in scala 2 and scala 3
ZIO.succeed(((size, expected), Some(content)))
else ZIO.succeed(((size, status), None))
} yield info
Expand All @@ -81,7 +82,7 @@ object SizeLimitsSpec extends ZIOHttpSpec {
(lstWorkingSize1, lstStatus1) = info1
(lstWorkingSize2, lstStatus2) = info2
} yield assertTrue(
maxSize - lstWorkingSize1 <= 2,
maxSize - lstWorkingSize1 <= ERROR_MARGIN,
maxSize - lstWorkingSize1 >= 0,
lstStatus1 == Status.Ok,
lstWorkingSize2 == lstTestSize,
Expand Down
Loading