From fd5728a53019ee70f08045cc6ec08ab40fc8683d Mon Sep 17 00:00:00 2001 From: amesgen Date: Sun, 20 Nov 2022 18:46:54 +0100 Subject: [PATCH 01/22] Update changelog for v0.8.0 (#783) --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7116df8b..1b6bb410 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ This file summarizes **notable** changes for each release, but does not describe ---- +## v0.8.0 (2022-11-20) + +### Breaking changes + +* On creation, the `Client` and `WSClient` are no longer wrapped in a `Resource` due to an internal refactoring. + +### Dependency updates + +* cats-effect-3.4.1 +* fs2-3.4.0 + ## v0.7.0 (2022-03-23) This is the spiritual successor to v0.5.0. From c89df00244544542983985d685e48b3c7690a4ce Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 18:30:10 +0100 Subject: [PATCH 02/22] Update sbt-http4s-org to 0.14.9 in series/0.8 (#786) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8149f8bd..cc3f48d7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.8") +addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.9") addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.17") From 32f57c15427d5f052e9c6f565a0b97f21fe8e94f Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 29 Nov 2022 17:16:31 +0000 Subject: [PATCH 03/22] Update cats-effect, cats-effect-kernel, ... to 3.4.2 in series/0.8 (#788) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e9e10bf3..dd557c5a 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ ThisBuild / mergifyRequiredJobs += "site" ThisBuild / mergifyLabelPaths += "docs" -> file("docs") val catsV = "2.9.0" -val catsEffectV = "3.4.1" +val catsEffectV = "3.4.2" val fs2V = "3.4.0" val scodecV = "1.1.34" val http4sV = "0.23.16" From 66bbdea838bad6f0c142932a69bf4022ca07b2c0 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 21:32:33 +0100 Subject: [PATCH 04/22] Update vault to 3.4.0 in series/0.8 (#790) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index dd557c5a..1a7048db 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ val fs2V = "3.4.0" val scodecV = "1.1.34" val http4sV = "0.23.16" val reactiveStreamsV = "1.0.4" -val vaultV = "3.3.0" +val vaultV = "3.4.0" val caseInsensitiveV = "1.3.0" val munitV = "1.0.0-M7" From 3fd7935a705d2493e2ec365769569bb3e69a34ac Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 25 Dec 2022 01:52:05 +0000 Subject: [PATCH 05/22] Update cats-effect, cats-effect-kernel, ... to 3.4.3 in series/0.8 (#792) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1a7048db..5ca0f459 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ ThisBuild / mergifyRequiredJobs += "site" ThisBuild / mergifyLabelPaths += "docs" -> file("docs") val catsV = "2.9.0" -val catsEffectV = "3.4.2" +val catsEffectV = "3.4.3" val fs2V = "3.4.0" val scodecV = "1.1.34" val http4sV = "0.23.16" From d140264c04cde701de4d65232b9aa78a61fc4502 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 30 Dec 2022 20:52:25 +0000 Subject: [PATCH 06/22] Update cats-effect, cats-effect-kernel, ... to 3.4.4 in series/0.8 (#794) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5ca0f459..e352a922 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ ThisBuild / mergifyRequiredJobs += "site" ThisBuild / mergifyLabelPaths += "docs" -> file("docs") val catsV = "2.9.0" -val catsEffectV = "3.4.3" +val catsEffectV = "3.4.4" val fs2V = "3.4.0" val scodecV = "1.1.34" val http4sV = "0.23.16" From 466aa16753ab9b40f95f926a2ddd60c853fdcdb0 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 23:11:17 +0100 Subject: [PATCH 07/22] Update vault to 3.5.0 in series/0.8 (#796) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e352a922..88ae2752 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ val fs2V = "3.4.0" val scodecV = "1.1.34" val http4sV = "0.23.16" val reactiveStreamsV = "1.0.4" -val vaultV = "3.4.0" +val vaultV = "3.5.0" val caseInsensitiveV = "1.3.0" val munitV = "1.0.0-M7" From a55ed7518bfe89a4ea344f1106abe30c6dfd49fa Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 02:09:39 +0000 Subject: [PATCH 08/22] Update sbt to 1.8.1 in series/0.8 (#798) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 8b9a0b0a..c13a9b3a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.8.1 From ea5b4d1d328da6be7d35f59052e7fdd4dfbfe581 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 00:38:32 +0100 Subject: [PATCH 09/22] Update http4s-client, ... to 0.23.17 in series/0.8 (#800) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 88ae2752..8d63d9b2 100644 --- a/build.sbt +++ b/build.sbt @@ -38,7 +38,7 @@ val catsV = "2.9.0" val catsEffectV = "3.4.4" val fs2V = "3.4.0" val scodecV = "1.1.34" -val http4sV = "0.23.16" +val http4sV = "0.23.17" val reactiveStreamsV = "1.0.4" val vaultV = "3.5.0" val caseInsensitiveV = "1.3.0" From 16410db174a930a6eab93a4c4b1364f82d71c2e7 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 08:49:48 +0000 Subject: [PATCH 10/22] Update sbt to 1.8.2 in series/0.8 (#803) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c13a9b3a..46e43a97 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.1 +sbt.version=1.8.2 From 49349aa5088ab5c4eb25dbb648c3a68c72513405 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 02:44:28 +0100 Subject: [PATCH 11/22] Update sbt-typelevel-mergify to 0.4.18 in series/0.8 (#805) * Update sbt-typelevel-mergify to 0.4.18 in series/0.8 * Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 44 ++++++++++++++++++++-------------------- project/plugins.sbt | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61d31bb1..0eb281ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,21 +39,21 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Download Java (temurin@11) id: download-java-temurin-11 if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 11 - name: Setup Java (temurin@11) if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 11 @@ -62,21 +62,21 @@ jobs: - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 17 - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -123,7 +123,7 @@ jobs: - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.8') - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }} path: targets.tar @@ -140,21 +140,21 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Download Java (temurin@11) id: download-java-temurin-11 if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 11 - name: Setup Java (temurin@11) if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 11 @@ -163,21 +163,21 @@ jobs: - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 17 - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -189,7 +189,7 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Download target directories (2.12.17) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17 @@ -199,7 +199,7 @@ jobs: rm targets.tar - name: Download target directories (2.13.10) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10 @@ -209,7 +209,7 @@ jobs: rm targets.tar - name: Download target directories (3.2.1) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1 @@ -242,21 +242,21 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Download Java (temurin@11) id: download-java-temurin-11 if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 11 - name: Setup Java (temurin@11) if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 11 @@ -265,21 +265,21 @@ jobs: - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v1 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 17 - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt diff --git a/project/plugins.sbt b/project/plugins.sbt index cc3f48d7..2c395d35 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.9") -addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.17") +addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.18") From 8697eb77b83d0155029777e139200a593acc8f59 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 15:46:49 +0100 Subject: [PATCH 12/22] Update sbt-http4s-org to 0.14.10 in series/0.8 (#807) * Update sbt-http4s-org to 0.14.10 in series/0.8 * Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 8 ++++---- project/plugins.sbt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0eb281ab..6e33675a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,18 +91,18 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@11' + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: Test run: sbt '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@11' + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@11' + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' doc - name: Check scalafix lints @@ -295,7 +295,7 @@ jobs: - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.8' - uses: peaceiris/actions-gh-pages@v3.8.0 + uses: peaceiris/actions-gh-pages@v3.9.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: site/target/docs/site diff --git a/project/plugins.sbt b/project/plugins.sbt index 2c395d35..3c7aec7e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.9") +addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.10") addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.18") From cc3edab5c0587f17a43539a21fdc87277a2b52aa Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 01:54:02 +0000 Subject: [PATCH 13/22] Update cats-effect, cats-effect-kernel, ... to 3.4.5 in series/0.8 (#809) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8d63d9b2..53aea7d4 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ ThisBuild / mergifyRequiredJobs += "site" ThisBuild / mergifyLabelPaths += "docs" -> file("docs") val catsV = "2.9.0" -val catsEffectV = "3.4.4" +val catsEffectV = "3.4.5" val fs2V = "3.4.0" val scodecV = "1.1.34" val http4sV = "0.23.17" From 7baf8b93ed5f834ce5836c556ac2a9127afdfadf Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 23:13:37 +0100 Subject: [PATCH 14/22] Update fs2-core, fs2-reactive-streams to 3.5.0 in series/0.8 (#811) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 53aea7d4..85800473 100644 --- a/build.sbt +++ b/build.sbt @@ -36,7 +36,7 @@ ThisBuild / mergifyLabelPaths += "docs" -> file("docs") val catsV = "2.9.0" val catsEffectV = "3.4.5" -val fs2V = "3.4.0" +val fs2V = "3.5.0" val scodecV = "1.1.34" val http4sV = "0.23.17" val reactiveStreamsV = "1.0.4" From 6b12b888ab9b29fc0801aa4f3ee7e2db37903995 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 10:16:33 +0100 Subject: [PATCH 15/22] Update scalafmt-core to 3.7.0 in series/0.8 (#815) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 09f62233..0c239c83 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=3.6.1 +version=3.7.0 runner.dialect = scala212 style = default From dd45f3afe0d0c178f3bd6f1d93402e13c5e08f89 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 12:27:49 +0100 Subject: [PATCH 16/22] Update http4s-client, ... to 0.23.18 in series/0.8 (#813) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 85800473..3319c68e 100644 --- a/build.sbt +++ b/build.sbt @@ -38,7 +38,7 @@ val catsV = "2.9.0" val catsEffectV = "3.4.5" val fs2V = "3.5.0" val scodecV = "1.1.34" -val http4sV = "0.23.17" +val http4sV = "0.23.18" val reactiveStreamsV = "1.0.4" val vaultV = "3.5.0" val caseInsensitiveV = "1.3.0" From 59d8a3ac3966a257a269ec0546b81676b98b4626 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 02:07:31 +0000 Subject: [PATCH 17/22] Update scalafmt-core to 3.7.1 in series/0.8 (#817) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 0c239c83..e405a07d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=3.7.0 +version=3.7.1 runner.dialect = scala212 style = default From 5236d5d2650855e6cb1943526fc870cab6843da5 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 21:41:08 +0100 Subject: [PATCH 18/22] Update scala3-library to 3.2.2 in series/0.8 (#820) * Update scala3-library to 3.2.2 in series/0.8 * Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --------- Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 10 +++++----- .mergify.yml | 2 +- build.sbt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e33675a..22cb229c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,12 +29,12 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.17, 2.13.10, 3.2.1] + scala: [2.12.17, 2.13.10, 3.2.2] java: [temurin@11, temurin@17] exclude: - scala: 2.12.17 java: temurin@17 - - scala: 3.2.1 + - scala: 3.2.2 java: temurin@17 runs-on: ${{ matrix.os }} steps: @@ -208,12 +208,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.1) + - name: Download target directories (3.2.2) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1 + name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2 - - name: Inflate target directories (3.2.1) + - name: Inflate target directories (3.2.2) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index dcf0a61d..8597d3c9 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -13,7 +13,7 @@ pull_request_rules: - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11) - status-success=Build and Test (ubuntu-latest, 2.13.10, temurin@11) - status-success=Build and Test (ubuntu-latest, 2.13.10, temurin@17) - - status-success=Build and Test (ubuntu-latest, 3.2.1, temurin@11) + - status-success=Build and Test (ubuntu-latest, 3.2.2, temurin@11) - status-success=Generate Site (ubuntu-latest, 2.13.10, temurin@11) actions: merge: diff --git a/build.sbt b/build.sbt index 3319c68e..b64b91fd 100644 --- a/build.sbt +++ b/build.sbt @@ -71,7 +71,7 @@ val coreDeps = Seq( )).map(_ % Test) val scala213 = "2.13.10" -ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, "3.2.1") +ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, "3.2.2") ThisBuild / scalaVersion := scala213 ThisBuild / tlBaseVersion := "0.8" ThisBuild / startYear := Some(2019) From d2ee38933768cf2c5df6903db537e4be6975d61d Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 4 Feb 2023 08:38:04 +0000 Subject: [PATCH 19/22] Update cats-effect, cats-effect-kernel, ... to 3.4.6 in series/0.8 (#822) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b64b91fd..05cc462c 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ ThisBuild / mergifyRequiredJobs += "site" ThisBuild / mergifyLabelPaths += "docs" -> file("docs") val catsV = "2.9.0" -val catsEffectV = "3.4.5" +val catsEffectV = "3.4.6" val fs2V = "3.5.0" val scodecV = "1.1.34" val http4sV = "0.23.18" From 0d8f0f3d4cc56c76d18629840b76f7cbccec3d4a Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 01:45:33 +0000 Subject: [PATCH 20/22] Update scodec-bits to 1.1.35 in series/0.8 (#824) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 05cc462c..3d5d3aef 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,7 @@ ThisBuild / mergifyLabelPaths += "docs" -> file("docs") val catsV = "2.9.0" val catsEffectV = "3.4.6" val fs2V = "3.5.0" -val scodecV = "1.1.34" +val scodecV = "1.1.35" val http4sV = "0.23.18" val reactiveStreamsV = "1.0.4" val vaultV = "3.5.0" From 542b8a1a326be00dda541f68163ca258cbe1c563 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 8 Feb 2023 10:11:15 -0800 Subject: [PATCH 21/22] Migrate to new FS2 `j.u.c.Flow` interop APIs (#812) * First attempt to use new flow interop * Bump to latest flow interop snapshot * Bump snapshot * Update fs2-core, fs2-reactive-streams to 3.6.0 in series/0.8 * Bump version everywhere * Regenerate workflow --------- Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 10 ++-- build.sbt | 13 ++--- .../http4s/jdkhttpclient/JdkHttpClient.scala | 57 ++++++++----------- docs/index.html | 4 +- 4 files changed, 38 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22cb229c..f275fb7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,15 +114,15 @@ jobs: run: sbt '++ ${{ matrix.scala }}' unusedCompileDependenciesTest - name: Make target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.8') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.9') run: mkdir -p target core/target site/target project/target - name: Compress target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.8') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.9') run: tar cf targets.tar target core/target site/target project/target - name: Upload target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.8') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.9') uses: actions/upload-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }} @@ -131,7 +131,7 @@ jobs: publish: name: Publish Artifacts needs: [build] - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.8') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.9') strategy: matrix: os: [ubuntu-latest] @@ -294,7 +294,7 @@ jobs: run: sbt '++ ${{ matrix.scala }}' docs/tlSite - name: Publish site - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.8' + if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.9' uses: peaceiris/actions-gh-pages@v3.9.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.sbt b/build.sbt index 3d5d3aef..c4aeffc2 100644 --- a/build.sbt +++ b/build.sbt @@ -36,7 +36,7 @@ ThisBuild / mergifyLabelPaths += "docs" -> file("docs") val catsV = "2.9.0" val catsEffectV = "3.4.6" -val fs2V = "3.5.0" +val fs2V = "3.6.0" val scodecV = "1.1.35" val http4sV = "0.23.18" val reactiveStreamsV = "1.0.4" @@ -57,10 +57,8 @@ val coreDeps = Seq( "org.typelevel" %% "cats-effect-kernel" % catsEffectV, "org.typelevel" %% "cats-effect-std" % catsEffectV, "co.fs2" %% "fs2-core" % fs2V, - "co.fs2" %% "fs2-reactive-streams" % fs2V, "org.http4s" %% "http4s-client" % http4sV, "org.http4s" %% "http4s-core" % http4sV, - "org.reactivestreams" % "reactive-streams" % reactiveStreamsV, "org.scodec" %% "scodec-bits" % scodecV, "org.typelevel" %% "vault" % vaultV, "org.typelevel" %% "case-insensitive" % caseInsensitiveV @@ -73,7 +71,7 @@ val coreDeps = Seq( val scala213 = "2.13.10" ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, "3.2.2") ThisBuild / scalaVersion := scala213 -ThisBuild / tlBaseVersion := "0.8" +ThisBuild / tlBaseVersion := "0.9" ThisBuild / startYear := Some(2019) ThisBuild / developers := List( tlGitHubDev("ChristopherDavenport", "Christopher Davenport"), @@ -83,8 +81,8 @@ ThisBuild / developers := List( ThisBuild / tlJdkRelease := Some(11) ThisBuild / githubWorkflowJavaVersions := Seq("11", "17").map(JavaSpec.temurin(_)) -ThisBuild / tlCiReleaseBranches := Seq("series/0.8") -ThisBuild / tlSitePublishBranch := Some("series/0.8") +ThisBuild / tlCiReleaseBranches := Seq("series/0.9") +ThisBuild / tlSitePublishBranch := Some("series/0.9") lazy val docsSettings = Seq( @@ -94,8 +92,9 @@ lazy val docsSettings = import laika.rewrite._ _.site.versions( Versions( - currentVersion = Version("0.8.x", "0.8"), + currentVersion = Version("0.9.x", "0.9"), olderVersions = Seq( + Version("0.8.x", "0.8"), Version("0.7.x", "0.7"), Version("0.6.x", "0.6.0-M7"), Version("0.5.x", "0.5.0"), diff --git a/core/src/main/scala/org/http4s/jdkhttpclient/JdkHttpClient.scala b/core/src/main/scala/org/http4s/jdkhttpclient/JdkHttpClient.scala index b4bd17b5..1ad54ced 100644 --- a/core/src/main/scala/org/http4s/jdkhttpclient/JdkHttpClient.scala +++ b/core/src/main/scala/org/http4s/jdkhttpclient/JdkHttpClient.scala @@ -23,7 +23,7 @@ import cats.implicits._ import fs2.Chunk import fs2.Stream import fs2.concurrent.SignallingRef -import fs2.interop.reactivestreams._ +import fs2.interop.flow import org.http4s.Header import org.http4s.Headers import org.http4s.HttpVersion @@ -32,7 +32,6 @@ import org.http4s.Response import org.http4s.Status import org.http4s.client.Client import org.http4s.internal.CollectionCompat.CollectionConverters._ -import org.reactivestreams.FlowAdapters import org.typelevel.ci.CIString import java.net.URI @@ -61,21 +60,19 @@ object JdkHttpClient { ignoredHeaders: Set[CIString] = restrictedHeaders )(implicit F: Async[F]): Client[F] = { def convertRequest(req: Request[F]): Resource[F, HttpRequest] = - StreamUnicastPublisher(req.body.chunks.map(_.toByteBuffer)).evalMap { publisher => + flow.toPublisher(req.body.chunks.map(_.toByteBuffer)).evalMap { publisher => convertHttpVersionFromHttp4s[F](req.httpVersion).map { version => val rb = HttpRequest.newBuilder .method( - req.method.name, { - val flowPublisher = FlowAdapters.toFlowPublisher(publisher) - if (req.isChunked) - BodyPublishers.fromPublisher(flowPublisher) - else - req.contentLength match { - case Some(length) if length > 0L => - BodyPublishers.fromPublisher(flowPublisher, length) - case _ => BodyPublishers.noBody - } - } + req.method.name, + if (req.isChunked) + BodyPublishers.fromPublisher(publisher) + else + req.contentLength match { + case Some(length) if length > 0L => + BodyPublishers.fromPublisher(publisher, length) + case _ => BodyPublishers.noBody + } ) .uri(URI.create(req.uri.renderString)) .version(version) @@ -193,24 +190,20 @@ object JdkHttpClient { }.uncancelable } .flatMap { case (subscription, res) => - val body: Stream[F, util.List[ByteBuffer]] = - Stream - .eval(StreamSubscriber[F, util.List[ByteBuffer]](1)) - .flatMap(s => - s.sub.stream( - // Complete the TrybleDeferred so that we indicate we have - // subscribed to the Publisher. - // - // This only happens _after_ someone attempts to pull from the - // body and will never happen if the body is never pulled - // from. In that case, the AlwaysCancelingSubscriber handles - // cleanup. - F.uncancelable { _ => - subscription.complete(()) *> - F.delay(FlowAdapters.toPublisher(res.body).subscribe(s)) - } - ) - ) + val body = + flow.fromPublisher[F, util.List[ByteBuffer]](1) { subscriber => + // Complete the TrybleDeferred so that we indicate we have + // subscribed to the Publisher. + // + // This only happens _after_ someone attempts to pull from the + // body and will never happen if the body is never pulled + // from. In that case, the AlwaysCancelingSubscriber handles + // cleanup. + F.uncancelable { _ => + subscription.complete(()) *> + F.delay(res.body.subscribe(subscriber)) + } + } Resource( (F.fromEither(Status.fromInt(res.statusCode)), SignallingRef[F, Boolean](false)).mapN { case (status, signal) => diff --git a/docs/index.html b/docs/index.html index 27e9de85..7138aa18 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,4 +1,4 @@ - - + + From b963d4fdce7146ea1835b0deb2460df3f8a8fd9d Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 8 Feb 2023 10:21:25 -0800 Subject: [PATCH 22/22] Add small delay between ws connections (#827) --- .../test/scala/org/http4s/jdkhttpclient/JdkWSClientSpec.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/test/scala/org/http4s/jdkhttpclient/JdkWSClientSpec.scala b/core/src/test/scala/org/http4s/jdkhttpclient/JdkWSClientSpec.scala index 1ebb3a32..15d8284b 100644 --- a/core/src/test/scala/org/http4s/jdkhttpclient/JdkWSClientSpec.scala +++ b/core/src/test/scala/org/http4s/jdkhttpclient/JdkWSClientSpec.scala @@ -31,6 +31,8 @@ import org.http4s.websocket.WebSocketFrame import org.typelevel.ci._ import scodec.bits.ByteVector +import scala.concurrent.duration._ + class JdkWSClientSpec extends CatsEffectSuite { val webSocket: IOFixture[WSClient[IO]] = @@ -149,6 +151,7 @@ class JdkWSClientSpec extends CatsEffectSuite { .map(s => WSRequest(httpToWsUri(s.baseUri))) _ <- server.use { req => webSocket().connect(req).use(conn => conn.send(WSFrame.Text("hi ember"))) *> + IO.sleep(100.millis) *> // quick sleep to collect the close frame webSocket().connectHighLevel(req).use { conn => conn.send(WSFrame.Text("hey ember")) }