Merge to main #1134

hamnis · 2024-11-07T17:50:39Z

This is now the correct merge branch.

I apologize for my mistake.

I merged #1132 to the wrong branch, and now we have lots of wrong commits in series/0.9

I reverted the merge in a follow-up PR, but not sure how or if we should resolve this.

The fix can be to rebase series/0.9 to 2b71c70 or do nothing since the change was reverted.

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Flake lock file updates: • Updated input 'typelevel-nix': 'github:typelevel/typelevel-nix/2bbdddbc81a9da0052a22d7d8ebd17b88cd55a8f' (2024-01-29) → 'github:typelevel/typelevel-nix/518374c569c63fdcae8eede4b41dfdc63da80ee3' (2024-02-05) • Updated input 'typelevel-nix/nixpkgs': 'github:nixos/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb' (2024-01-27) → 'github:nixos/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814' (2024-02-03) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Flake lock file updates: • Updated input 'typelevel-nix': 'github:typelevel/typelevel-nix/518374c569c63fdcae8eede4b41dfdc63da80ee3' (2024-02-05) → 'github:typelevel/typelevel-nix/85318b2ace46ee59560d5a5ce1a56ee08b46b15e' (2024-02-12) • Updated input 'typelevel-nix/nixpkgs': 'github:nixos/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814' (2024-02-03) → 'github:nixos/nixpkgs/f3a93440fbfff8a74350f4791332a19282cc6dc8' (2024-02-11) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Flake lock file updates: • Updated input 'typelevel-nix': 'github:typelevel/typelevel-nix/85318b2ace46ee59560d5a5ce1a56ee08b46b15e' (2024-02-12) → 'github:typelevel/typelevel-nix/035bec68f65a213bf6080c7aeb18ba88b9fe9b5f' (2024-02-26) • Updated input 'typelevel-nix/nixpkgs': 'github:nixos/nixpkgs/f3a93440fbfff8a74350f4791332a19282cc6dc8' (2024-02-11) → 'github:nixos/nixpkgs/2a34566b67bef34c551f204063faeecc444ae9da' (2024-02-25) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

…1037) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Flake lock file updates: • Updated input 'typelevel-nix': 'github:typelevel/typelevel-nix/035bec68f65a213bf6080c7aeb18ba88b9fe9b5f?narHash=sha256-mzSNb%2BbwOKtbgf2d/ypxR%2BmHsnzBPOXzssrckpr7RU0%3D' (2024-02-26) → 'github:typelevel/typelevel-nix/e494632f444ab0a45c7294e6231a0e7e13053e64?narHash=sha256-HYj9yoYOogKvC4lFx20mdrIkn0UBbYxkrp/1cycNrFM%3D' (2024-05-28) • Updated input 'typelevel-nix/devshell': 'github:numtide/devshell/83cb93d6d063ad290beee669f4badf9914cc16ec?narHash=sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA%3D' (2024-01-15) → 'github:numtide/devshell/12e914740a25ea1891ec619bb53cf5e6ca922e40?narHash=sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc%3D' (2024-04-19) • Updated input 'typelevel-nix/devshell/nixpkgs': 'github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932?narHash=sha256-QGua89Pmq%2BFBAro8NriTuoO/wNaUtugt29/qqA8zeeM%3D' (2024-01-02) → follows 'typelevel-nix/nixpkgs' • Updated input 'typelevel-nix/flake-utils': 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26?narHash=sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA%3D' (2024-01-15) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11) • Updated input 'typelevel-nix/nixpkgs': 'github:nixos/nixpkgs/2a34566b67bef34c551f204063faeecc444ae9da?narHash=sha256-RUZ7KEs/a4EzRELYDGnRB6i7M1Izii3JD/LyzH0c6Tg%3D' (2024-02-25) → 'github:nixos/nixpkgs/e2dd4e18cc1c7314e24154331bae07df76eb582f?narHash=sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c%3D' (2024-05-26)

flake.lock: Update

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

…1125) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update munit to 1.0.2 in series/0.9

Update scodec-bits to 1.2.1 in series/0.9

Update cats-core to 2.12.0 in series/0.9

Update sbt to 1.10.4 in series/0.9

…-0.17.5 Update sbt-http4s-org to 0.17.5 in series/0.9

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

…ect-2.0.0 Update munit-cats-effect to 2.0.0 in series/0.9

Update vault to 3.6.0 in series/0.9

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> Co-authored-by: Ross A. Baker <[email protected]>

Update fs2-core to 3.11.0 in series/0.9

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> Co-authored-by: Ross A. Baker <[email protected]>

…23.29 Update http4s-client, ... to 0.23.29 in series/0.9

Co-authored-by: Ross A. Baker <[email protected]>

rossabaker

No worries on the bad branch. I force-pushed it back, just so the history is undisturbed. And the commit is in the lineage of this PR, so there shouldn't be any subsequent merge pain.

http4s-steward bot and others added 30 commits February 2, 2024 20:58

Update munit to 1.0.0-M11 in series/0.9 (#1014)

41f5a04

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update sbt-typelevel-mergify to 0.6.6 in series/0.9 (#1019)

d35c269

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update scalafmt-core to 3.8.0 in series/0.9 (#1021)

4d8839f

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update sbt to 1.9.9 in series/0.9 (#1023)

b9eba54

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update sbt-typelevel-mergify to 0.6.7 in series/0.9 (#1025)

441725c

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update scala-library to 2.12.19 in series/0.9 (#1027)

b9083e7

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update sbt-http4s-org to 0.16.3 in series/0.9 (#1031)

e5ad922

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update scala3-library to 3.3.3 in series/0.9 (#1033)

873372a

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update http4s-client, ... to 0.23.26 in series/0.9 (#1035)

272ae63

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update cats-effect, cats-effect-kernel, ... to 3.5.4 in series/0.9 (#…

a728ab5

…1037) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update scalafmt-core to 3.8.1 in series/0.9 (#1046)

fffdf85

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Merge pull request #1034 from http4s/update/flake-lock

b93958a

flake.lock: Update

Update scalafmt-core to 3.8.2 in series/0.9 (#1083)

3065315

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update scalafmt-core to 3.8.3 in series/0.9 (#1089)

005f364

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update scodec-bits to 1.2.1 in series/0.9

0060d4b

Update munit to 1.0.2 in series/0.9

29cfcbe

Update scala3-library to 3.3.4 in series/0.9 (#1111)

16bfed6

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update cats-effect, cats-effect-kernel, ... to 3.5.5 in series/0.9 (#…

ddef8cb

…1125) Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update cats-core to 2.12.0 in series/0.9

046fd8d

Update sbt to 1.10.4 in series/0.9

4ddeb8b

Merge pull request #1105 from http4s/update/series/0.9/munit-1.0.2

1d82383

Update munit to 1.0.2 in series/0.9

Merge pull request #1095 from http4s/update/series/0.9/scodec-bits-1.2.1

524064d

Update scodec-bits to 1.2.1 in series/0.9

Merge pull request #1078 from http4s/update/series/0.9/cats-core-2.12.0

65e9717

Update cats-core to 2.12.0 in series/0.9

Merge pull request #1127 from http4s/update/series/0.9/sbt-1.10.4

b9d857c

Update sbt to 1.10.4 in series/0.9

Update sbt-http4s-org to 0.17.5 in series/0.9

80aa76d

Update scala-library to 2.13.15 in series/0.9

425547b

http4s-steward bot and others added 17 commits November 6, 2024 15:25

Update sbt-typelevel-mergify to 0.7.4 in series/0.9

d1e55a0

Regenerate workflow

6b40fda

Rename shadowing variable

db400ff

Merge pull request #1123 from http4s/update/series/0.9/sbt-http4s-org…

cc5bd6f

…-0.17.5 Update sbt-http4s-org to 0.17.5 in series/0.9

Update munit-cats-effect to 2.0.0 in series/0.9

87f0d99

Update sbt to 1.10.5 in series/0.9 (#1131)

e557ebe

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com>

Update vault to 3.6.0 in series/0.9

2c82e04

Merge pull request #1074 from http4s/update/series/0.9/munit-cats-eff…

356b6aa

…ect-2.0.0 Update munit-cats-effect to 2.0.0 in series/0.9

Merge pull request #1080 from http4s/update/series/0.9/vault-3.6.0

d708199

Update vault to 3.6.0 in series/0.9

Update fs2-core to 3.11.0 in series/0.9

1b820cf

Update scala-library to 2.12.20 in series/0.9 (#1101)

4ffb40d

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> Co-authored-by: Ross A. Baker <[email protected]>

Merge pull request #1097 from http4s/update/series/0.9/fs2-core-3.11.0

47a8e31

Update fs2-core to 3.11.0 in series/0.9

Update case-insensitive to 1.4.2 in series/0.9 (#1114)

17f2139

Co-authored-by: http4s-steward[bot] <106843772+http4s-steward[bot]@users.noreply.github.com> Co-authored-by: Ross A. Baker <[email protected]>

Update http4s-client, ... to 0.23.29 in series/0.9

d5cf705

Merge pull request #1121 from http4s/update/series/0.9/http4s-core-0.…

2b71c70

…23.29 Update http4s-client, ... to 0.23.29 in series/0.9

Merge remote-tracking branch 'origin/series/0.9' into merge-to-main

02e6f98

Apply suggestions from code review

e765c72

Co-authored-by: Ross A. Baker <[email protected]>

mergify bot added core docs labels Nov 7, 2024

rossabaker approved these changes Nov 7, 2024

View reviewed changes

hamnis merged commit 7be3dd4 into main Nov 7, 2024
22 checks passed

hamnis deleted the merge-to-main branch November 7, 2024 18:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge to main #1134

Merge to main #1134

hamnis commented Nov 7, 2024 •

edited

Loading

rossabaker left a comment

Merge to main #1134

Merge to main #1134

Conversation

hamnis commented Nov 7, 2024 • edited Loading

rossabaker left a comment

Choose a reason for hiding this comment

hamnis commented Nov 7, 2024 •

edited

Loading