Skip to content

Commit 6ac5b12

Browse files
notxcainnotxcain
committed
Merge remote-tracking branch 'upstream/main' into fix-3235
2 parents 7a2e227 + 668eb91 commit 6ac5b12

File tree

55 files changed

+1766
-886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1766
-886
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 82 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: [ubuntu-latest]
29-
scala: [2.12.19, 2.13.14, 3.3.3]
29+
scala: [2.12.20, 2.13.16, 3.3.4]
3030
java:
3131
- graal_graalvm@17
3232
- graal_graalvm@21
@@ -82,8 +82,8 @@ jobs:
8282
apps: sbt
8383

8484
- name: Check formatting
85-
if: matrix.scala == '2.13.14'
86-
run: sbt ++2.13.14 fmtCheck
85+
if: matrix.scala == '2.13.16'
86+
run: sbt ++2.13.16 fmtCheck
8787

8888
- name: Check that workflows are up to date
8989
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
@@ -97,10 +97,10 @@ jobs:
9797

9898
- name: Check doc generation
9999
if: ${{ github.event_name == 'pull_request' }}
100-
run: sbt ++2.13.14 doc
100+
run: sbt ++2.13.16 doc
101101

102102
- name: zio-http-shaded Tests
103-
if: matrix.scala == '2.13.14'
103+
if: matrix.scala == '2.13.16'
104104
env:
105105
PUBLISH_SHADED: true
106106
run: sbt '++ ${{ matrix.scala }}' zioHttpShadedTests/test
@@ -121,7 +121,7 @@ jobs:
121121
strategy:
122122
matrix:
123123
os: [ubuntu-latest]
124-
scala: [2.13.14]
124+
scala: [2.13.16]
125125
java: [graal_graalvm@17]
126126
runs-on: ${{ matrix.os }}
127127
steps:
@@ -166,32 +166,32 @@ jobs:
166166
java-version: 21
167167
cache: sbt
168168

169-
- name: Download target directories (2.12.19)
169+
- name: Download target directories (2.12.20)
170170
uses: actions/download-artifact@v4
171171
with:
172-
name: target-${{ matrix.os }}-2.12.19-${{ matrix.java }}
172+
name: target-${{ matrix.os }}-2.12.20-${{ matrix.java }}
173173

174-
- name: Inflate target directories (2.12.19)
174+
- name: Inflate target directories (2.12.20)
175175
run: |
176176
tar xf targets.tar
177177
rm targets.tar
178178
179-
- name: Download target directories (2.13.14)
179+
- name: Download target directories (2.13.16)
180180
uses: actions/download-artifact@v4
181181
with:
182-
name: target-${{ matrix.os }}-2.13.14-${{ matrix.java }}
182+
name: target-${{ matrix.os }}-2.13.16-${{ matrix.java }}
183183

184-
- name: Inflate target directories (2.13.14)
184+
- name: Inflate target directories (2.13.16)
185185
run: |
186186
tar xf targets.tar
187187
rm targets.tar
188188
189-
- name: Download target directories (3.3.3)
189+
- name: Download target directories (3.3.4)
190190
uses: actions/download-artifact@v4
191191
with:
192-
name: target-${{ matrix.os }}-3.3.3-${{ matrix.java }}
192+
name: target-${{ matrix.os }}-3.3.4-${{ matrix.java }}
193193

194-
- name: Inflate target directories (3.3.3)
194+
- name: Inflate target directories (3.3.4)
195195
run: |
196196
tar xf targets.tar
197197
rm targets.tar
@@ -200,6 +200,10 @@ jobs:
200200
with:
201201
apps: sbt
202202

203+
- uses: coursier/setup-action@v1
204+
with:
205+
apps: sbt
206+
203207
- name: Release
204208
env:
205209
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
@@ -264,7 +268,7 @@ jobs:
264268
strategy:
265269
matrix:
266270
os: [ubuntu-latest]
267-
scala: [2.13.14]
271+
scala: [2.13.16]
268272
java: [temurin@8]
269273
runs-on: ${{ matrix.os }}
270274
steps:
@@ -278,7 +282,7 @@ jobs:
278282

279283
- name: Add Scoverage
280284
id: add_plugin
281-
run: sed -i -e '$aaddSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")' project/plugins.sbt
285+
run: sed -i -e '$aaddSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")' project/plugins.sbt
282286

283287
- name: Update Build Definition
284288
id: update_build_definition
@@ -300,7 +304,7 @@ jobs:
300304
strategy:
301305
matrix:
302306
os: [ubuntu-latest]
303-
scala: [2.13.14]
307+
scala: [2.13.16]
304308
java: [temurin@8]
305309
runs-on: ${{ matrix.os }}
306310
steps:
@@ -338,7 +342,7 @@ jobs:
338342
strategy:
339343
matrix:
340344
os: [ubuntu-latest]
341-
scala: [2.13.14]
345+
scala: [2.13.16]
342346
java: [temurin@8]
343347
runs-on: ${{ matrix.os }}
344348
steps:
@@ -376,7 +380,7 @@ jobs:
376380
strategy:
377381
matrix:
378382
os: [ubuntu-latest]
379-
scala: [2.13.14]
383+
scala: [2.13.16]
380384
java: [temurin@8]
381385
runs-on: ${{ matrix.os }}
382386
steps:
@@ -414,7 +418,7 @@ jobs:
414418
strategy:
415419
matrix:
416420
os: [ubuntu-latest]
417-
scala: [2.13.14]
421+
scala: [2.13.16]
418422
java: [temurin@8]
419423
runs-on: ${{ matrix.os }}
420424
steps:
@@ -452,7 +456,7 @@ jobs:
452456
strategy:
453457
matrix:
454458
os: [ubuntu-latest]
455-
scala: [2.13.14]
459+
scala: [2.13.16]
456460
java: [temurin@8]
457461
runs-on: ${{ matrix.os }}
458462
steps:
@@ -490,7 +494,7 @@ jobs:
490494
strategy:
491495
matrix:
492496
os: [ubuntu-latest]
493-
scala: [2.13.14]
497+
scala: [2.13.16]
494498
java: [temurin@8]
495499
runs-on: ${{ matrix.os }}
496500
steps:
@@ -528,7 +532,7 @@ jobs:
528532
strategy:
529533
matrix:
530534
os: [ubuntu-latest]
531-
scala: [2.13.14]
535+
scala: [2.13.16]
532536
java: [temurin@8]
533537
runs-on: ${{ matrix.os }}
534538
steps:
@@ -566,7 +570,7 @@ jobs:
566570
strategy:
567571
matrix:
568572
os: [ubuntu-latest]
569-
scala: [2.13.14]
573+
scala: [2.13.16]
570574
java: [temurin@8]
571575
runs-on: ${{ matrix.os }}
572576
steps:
@@ -604,7 +608,7 @@ jobs:
604608
strategy:
605609
matrix:
606610
os: [ubuntu-latest]
607-
scala: [2.13.14]
611+
scala: [2.13.16]
608612
java: [temurin@8]
609613
runs-on: ${{ matrix.os }}
610614
steps:
@@ -636,13 +640,51 @@ jobs:
636640
name: Jmh_Main_ProbeContentTypeBenchmark
637641
path: Main_ProbeContentTypeBenchmark.txt
638642

643+
Jmh_RoundtripBenchmark:
644+
name: Jmh RoundtripBenchmark
645+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
646+
strategy:
647+
matrix:
648+
os: [ubuntu-latest]
649+
scala: [2.13.16]
650+
java: [temurin@8]
651+
runs-on: ${{ matrix.os }}
652+
steps:
653+
- uses: coursier/setup-action@v1
654+
with:
655+
apps: sbt
656+
657+
- uses: actions/checkout@v4
658+
with:
659+
path: zio-http
660+
661+
- uses: actions/setup-java@v4
662+
with:
663+
distribution: temurin
664+
java-version: 11
665+
666+
- name: Benchmark_Main
667+
id: Benchmark_Main
668+
env:
669+
GITHUB_TOKEN: ${{secrets.ACTIONS_PAT}}
670+
run: |
671+
cd zio-http
672+
sed -i -e '$aaddSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")' project/plugins.sbt
673+
cat > Main_RoundtripBenchmark.txt
674+
sbt -no-colors -v "zioHttpBenchmarks/jmh:run -i 3 -wi 3 -f1 -t1 RoundtripBenchmark" | grep -e "thrpt" -e "avgt" >> ../Main_RoundtripBenchmark.txt
675+
676+
- uses: actions/upload-artifact@v4
677+
with:
678+
name: Jmh_Main_RoundtripBenchmark
679+
path: Main_RoundtripBenchmark.txt
680+
639681
Jmh_RoutesBenchmark:
640682
name: Jmh RoutesBenchmark
641683
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
642684
strategy:
643685
matrix:
644686
os: [ubuntu-latest]
645-
scala: [2.13.14]
687+
scala: [2.13.16]
646688
java: [temurin@8]
647689
runs-on: ${{ matrix.os }}
648690
steps:
@@ -680,7 +722,7 @@ jobs:
680722
strategy:
681723
matrix:
682724
os: [ubuntu-latest]
683-
scala: [2.13.14]
725+
scala: [2.13.16]
684726
java: [temurin@8]
685727
runs-on: ${{ matrix.os }}
686728
steps:
@@ -718,7 +760,7 @@ jobs:
718760
strategy:
719761
matrix:
720762
os: [ubuntu-latest]
721-
scala: [2.13.14]
763+
scala: [2.13.16]
722764
java: [temurin@8]
723765
runs-on: ${{ matrix.os }}
724766
steps:
@@ -756,7 +798,7 @@ jobs:
756798
strategy:
757799
matrix:
758800
os: [ubuntu-latest]
759-
scala: [2.13.14]
801+
scala: [2.13.16]
760802
java: [temurin@8]
761803
runs-on: ${{ matrix.os }}
762804
steps:
@@ -790,7 +832,7 @@ jobs:
790832

791833
Jmh_cache:
792834
name: Cache Jmh benchmarks
793-
needs: [Jmh_CachedDateHeaderBenchmark, Jmh_ClientBenchmark, Jmh_CookieDecodeBenchmark, Jmh_EndpointBenchmark, Jmh_HttpCollectEval, Jmh_HttpCombineEval, Jmh_HttpNestedFlatMapEval, Jmh_HttpRouteTextPerf, Jmh_ProbeContentTypeBenchmark, Jmh_RoutesBenchmark, Jmh_SchemeDecodeBenchmark, Jmh_ServerInboundHandlerBenchmark, Jmh_UtilBenchmark]
835+
needs: [Jmh_CachedDateHeaderBenchmark, Jmh_ClientBenchmark, Jmh_CookieDecodeBenchmark, Jmh_EndpointBenchmark, Jmh_HttpCollectEval, Jmh_HttpCombineEval, Jmh_HttpNestedFlatMapEval, Jmh_HttpRouteTextPerf, Jmh_ProbeContentTypeBenchmark, Jmh_RoundtripBenchmark, Jmh_RoutesBenchmark, Jmh_SchemeDecodeBenchmark, Jmh_ServerInboundHandlerBenchmark, Jmh_UtilBenchmark]
794836
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
795837
strategy:
796838
matrix:
@@ -862,6 +904,13 @@ jobs:
862904
- name: Format_Main_ProbeContentTypeBenchmark
863905
run: cat Main_ProbeContentTypeBenchmark.txt >> Main_benchmarks.txt
864906

907+
- uses: actions/download-artifact@v4
908+
with:
909+
name: Jmh_Main_RoundtripBenchmark
910+
911+
- name: Format_Main_RoundtripBenchmark
912+
run: cat Main_RoundtripBenchmark.txt >> Main_benchmarks.txt
913+
865914
- uses: actions/download-artifact@v4
866915
with:
867916
name: Jmh_Main_RoutesBenchmark
@@ -915,7 +964,7 @@ jobs:
915964
strategy:
916965
matrix:
917966
os: [ubuntu-latest]
918-
scala: [2.13.14]
967+
scala: [2.13.16]
919968
java: [temurin@8]
920969
runs-on: ${{ matrix.os }}
921970
steps:
@@ -994,7 +1043,7 @@ jobs:
9941043
strategy:
9951044
matrix:
9961045
os: [ubuntu-latest]
997-
scala: [2.13.14]
1046+
scala: [2.13.16]
9981047
java: [temurin@8]
9991048
runs-on: ${{ matrix.os }}
10001049
steps:

‎.scalafmt.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.8.1
1+
version = 3.8.6
22
maxColumn = 120
33

44
align.preset = more

‎build.sbt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ ThisBuild / githubWorkflowPublishTargetBranches += RefPredicate.StartsWith(Ref.T
5959
ThisBuild / githubWorkflowPublishPreamble := Seq(coursierSetup)
6060
ThisBuild / githubWorkflowPublish :=
6161
Seq(
62+
WorkflowStep.Use(UseRef.Public("coursier", "setup-action", "v1"), Map("apps" -> "sbt")),
6263
WorkflowStep.Sbt(
6364
List("ci-release"),
6465
name = Some("Release"),

‎project/BuildHelper.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import xerial.sbt.Sonatype.autoImport.*
66
import sbtcrossproject.CrossPlugin.autoImport.crossProjectPlatform
77

88
object BuildHelper extends ScalaSettings {
9-
val Scala212 = "2.12.19"
10-
val Scala213 = "2.13.14"
11-
val Scala3 = "3.3.3"
12-
val ScoverageVersion = "2.0.12"
9+
val Scala212 = "2.12.20"
10+
val Scala213 = "2.13.16"
11+
val Scala3 = "3.3.4"
12+
val ScoverageVersion = "2.3.0"
1313
val JmhVersion = "0.4.7"
1414

1515
private val stdOptions = Seq(

‎project/Dependencies.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ import sbt.*
22

33
object Dependencies {
44
val JwtCoreVersion = "10.0.1"
5-
val NettyVersion = "4.1.116.Final"
5+
val NettyVersion = "4.1.117.Final"
66
val NettyIncubatorVersion = "0.0.25.Final"
77
val ScalaCompactCollectionVersion = "2.12.0"
88
val ZioVersion = "2.1.11"
99
val ZioCliVersion = "0.5.0"
10-
val ZioJsonVersion = "0.7.1"
10+
val ZioJsonVersion = "0.7.12"
1111
val ZioParserVersion = "0.1.10"
12-
val ZioSchemaVersion = "1.5.0"
12+
val ZioSchemaVersion = "1.6.1"
1313
val SttpVersion = "3.3.18"
1414
val ZioConfigVersion = "4.0.2"
1515

1616
val `jwt-core` = "com.github.jwt-scala" %% "jwt-core" % JwtCoreVersion
1717
val `scala-compact-collection` = "org.scala-lang.modules" %% "scala-collection-compat" % ScalaCompactCollectionVersion
1818

19-
val scalafmt = "org.scalameta" %% "scalafmt-dynamic" % "3.8.1"
20-
val scalametaParsers = "org.scalameta" %% "parsers" % "4.9.9"
19+
val scalafmt = "org.scalameta" %% "scalafmt-dynamic" % "3.8.6"
20+
val scalametaParsers = "org.scalameta" %% "parsers" % "4.12.7"
2121

2222
val netty =
2323
Seq(

‎project/MimaSettings.scala‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ object MimaSettings {
1212
mimaBinaryIssueFilters ++= Seq(
1313
exclude[Problem]("zio.http.internal.*"),
1414
exclude[Problem]("zio.http.codec.internal.*"),
15+
exclude[Problem]("zio.http.codec.HttpCodec$Query$QueryType$Record$"),
16+
exclude[Problem]("zio.http.codec.HttpCodec$Query$QueryType$Record"),
17+
exclude[Problem]("zio.http.codec.HttpCodec$Query$QueryType$Primitive$"),
18+
exclude[Problem]("zio.http.codec.HttpCodec$Query$QueryType$Primitive"),
19+
exclude[Problem]("zio.http.codec.HttpCodec$Query$QueryType$Collection$"),
20+
exclude[Problem]("zio.http.codec.HttpCodec$Query$QueryType$Collection"),
21+
exclude[Problem]("zio.http.codec.HttpCodec$Query$QueryType$"),
22+
exclude[Problem]("zio.http.codec.HttpCodec$Query$QueryType"),
23+
exclude[Problem]("zio.http.endpoint.openapi.OpenAPIGen#AtomizedMetaCodecs.apply"),
24+
exclude[Problem]("zio.http.endpoint.openapi.OpenAPIGen#AtomizedMetaCodecs.this"),
25+
exclude[Problem]("zio.http.endpoint.openapi.OpenAPIGen#AtomizedMetaCodecs.copy"),
1526
),
1627
mimaFailOnProblem := failOnProblem
1728
)

0 commit comments

Comments
 (0)