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

Merge http4s/http4s main #683

Merged
merged 252 commits into from
May 26, 2022
Merged

Merge http4s/http4s main #683

merged 252 commits into from
May 26, 2022

Conversation

rossabaker
Copy link
Member

Specifically, this merges http4s/http4s@e1cb48d, as filtered by:

git filter-repo --force --path blaze-client/ --path blaze-core/ --path blaze-server/ --path examples/src/ --path examples/blaze/ --replace-message ../expressions.txt

with the following expressions.txt:

#==>http4s/http4s#

armanbilge and others added 30 commits July 13, 2021 20:18
@armanbilge
Squash more warnings
8c3c7f1
@armanbilge
Merge branch 'main' into js
8fb5d71
@rossabaker
Merge branch 'main' into js
70fce65
@armanbilge
Use ip4s for Server address
92e1625
@rossabaker
Merge pull request http4s/http4s#4938 from armanbilge/js
32ee5ae 
Cross-build http4s for Scala.js
@armanbilge
Fix blaze example
9fc3bc4
@rossabaker
Merge branch 'series/0.23'
2f5cdae
@rossabaker
Merge pull request http4s/http4s#5037 from http4s/fs2-3.1.0-on-1.0
61c253d 
Merge fs2-3.1.0 changes to 1.0
@rossabaker
Merge branch 'series/0.23' into merge-oauth
7f6e7d1
@rossabaker
Merge branch 'series/0.23' into merge-oauth
ab2752c
@rossabaker
Merge branch 'series/0.23' into merge-oauth
a207f17
@rossabaker
Merge pull request http4s/http4s#5065 from http4s/merge-oauth
9c48afe 
Merge from series/0.23
@rpiaggio
Implement PR suggestions.
3ab6865
@gokyo
fixing typo in variable name
4032cab
@rossabaker
Merge pull request http4s/http4s#5101 from rpiaggio/fetch-options
dd91025 
Add fetch options+timeout to FetchClient.
@rossabaker
Merge branch 'series/0.23'
e880e3a
@rossabaker
Merge branch 'main' into sanitize-1.0
3fe22b9
@rossabaker
Merge pull request from GHSA-5vcm-3xc3-w7x3
75a749e 
Response splitting mitigation, 1.0
@rossabaker
Merge branch 'series/0.23'
93f0d6b
@armanbilge
Merge branch 'series/0.23'
21ad9a9
@armanbilge
Merge pull request http4s/http4s#5252 from armanbilge/topic/merge-crypto
570aaa1 
Nontrivial merges 2021 09 22, 1.0-edition
@rossabaker
Merge branch 'series/0.23'
f253fc8
@rossabaker
Merge pull request http4s/http4s#5269 from http4s/non-trivial-2021-09-23
a252aea 
Non-trivial merge to main
@armanbilge
Revert "Put dispatcher shutdown in Try"
49ac810 
This reverts commit 5fe4610b51e747565ecf3d33786d7165f7c0acd0.
@armanbilge
EC tinkering
ad0c8f8
@armanbilge
Revert "EC tinkering"
26aa4e3 
This reverts commit 6c27a56cfe92d879ab21c2c2d1c6b374b7db6e69.
@armanbilge
Remove rogue shutdown
62b6db8
@armanbilge
Shutdown correct IORuntime
ff96cf6
@armanbilge
Merge branch 'series/0.23' into feature/0.23-js-rebased
be23b51
@rossabaker
Merge pull request http4s/http4s#5298 from armanbilge/feature/0.23-js…
316ff88 
…-rebased

Cross-build 0.23 for Scala.js (rebased)
rossabaker and others added 26 commits April 2, 2022 00:29
@rossabaker
Merge branch 'series/0.23' into merge-0.23-20220326
0217193
@rossabaker
Merge branch 'series/0.22' into series/0.23
2cc1212
@danicheg
Refactor the Http1Connection.receiveResponse
8937475
@rossabaker
Merge pull request http4s/http4s#6227 from rossabaker/merge-0.22-2022…
14ff691 
…0402

Merge 0.22 -> 0.23
@armanbilge
Merge branch 'series/0.23'
6517461
@rossabaker
Merge pull request http4s/http4s#6250 from armanbilge/integration/0.2…
61c6987 
…3-main-20220405

Merge 0.23 -> main
@armanbilge
Merge pull request http4s/http4s#5712 from bplommer/covariant-media-mvp
f97ac72 
Covariant `Message`s: minimum viable PR
@danicheg
Merge branch 'series/0.22' into series/0.23
b97e23e
@danicheg
Scalafmt
3014d3e
@danicheg
Fix ExampleService
71b579a
@danicheg
Merge branch 'series/0.23' into main
a03c7c8
@danicheg
Remove deprecated blaze SSLContextFactory
164b123
@rossabaker
Merge pull request http4s/http4s#6295 from danicheg/ssl-factory
2e409e0 
Remove deprecated blaze `SSLContextFactory`
@danicheg
Remove EmptyBody
dad5224
@rossabaker
Merge pull request http4s/http4s#6296 from danicheg/empty-body
3136a5f 
Remove `http4s.EmptyBody`
@danicheg
Tweak unused args suppressing
a5d262a
@diesalbla
Make Part and Multipart covariant.
dd0e30f
@danicheg
Merge pull request http4s/http4s#6300 from danicheg/unused-args
8445c3f 
Tweak unused args suppressing
@armanbilge
Merge branch 'series/0.22' into series/0.23
b2c4254
@danicheg
Merge pull request http4s/http4s#6343 from armanbilge/integration/0.2…
54a855c 
…2-0.23-20220429

Merge 0.22 -> 0.23
@danicheg
Merge branch 'series/0.23' into main
4f31ddf
@rossabaker
Merge remote-tracking branch 'core/filtered'
1c6e9d8
@rossabaker
Base version is 1.0
557fa92
@rossabaker
Remove tlMimaPreviousVersions from 0.23
6cf8889
@rossabaker
Drop Scala 2.12
84342ad
@rossabaker
Update to http4s-1.0.0-M33
1106ba1
@rossabaker
Copy link
Member Author

This should be sufficient to release 1.0.0-M33.

danicheg
danicheg approved these changes May 26, 2022
View reviewed changes
Copy link
Member

@danicheg danicheg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥

@rossabaker rossabaker merged commit 7bb10bc into main May 26, 2022
@rossabaker rossabaker deleted the merge-core-1.0 branch October 24, 2024 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danicheg danicheg danicheg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@rossabaker @danicheg @armanbilge @rpiaggio @gokyo @bplommer @RafalSumislawski @diesalbla @wjoel