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 dependencies, except librespot #1183

Merged
merged 4 commits into from
Mar 22, 2023
Merged

Update dependencies, except librespot #1183

merged 4 commits into from
Mar 22, 2023

Conversation

Icelk
Copy link
Contributor

@Icelk Icelk commented Mar 8, 2023

There were no major changes to the code. Tested to function as expected.

@Icelk
Copy link
Contributor Author

Icelk commented Mar 8, 2023

Blocked on rust 1.64
See #1182 (comment)

@j-code-1

This comment was marked as off-topic.

Sign in to view
@eladyn
Copy link
Member

eladyn commented Mar 8, 2023

Thanks. This PR “conflicts” a bit with #1174, which also improves the keyring thing. Not sure how to handle this best. I guess you either could leave the keyring update to the other PR, or we merge one of them first and see what git thinks. Either is fine to me. :)

@Icelk
Copy link
Contributor Author

Icelk commented Mar 8, 2023

Sorry, I missed that. This doesn't update keyring. Let's merge #1174 first :)

This also blocks on #1182, since the MSRV is bumped there.

@Icelk
Copy link
Contributor Author

Icelk commented Mar 8, 2023

I also realized we can remove tokio-compat now, which I've also done in this PR.

@slondr
Copy link
Member

slondr commented Mar 9, 2023

The check failure is just the 1.64 requirement; that should be resolved when the other PR is merged.

@slondr slondr added this to the v0.3.5 milestone Mar 9, 2023
@slondr slondr added the dependencies Pull requests that update a dependency file label Mar 11, 2023
@Icelk Icelk mentioned this pull request Mar 15, 2023
Merged
@eladyn eladyn mentioned this pull request Mar 16, 2023
Closed
@slondr slondr linked an issue Mar 22, 2023 that may be closed by this pull request
error when compiling #1190
Closed
@slondr slondr removed a link to an issue Mar 22, 2023
error when compiling #1190
Closed
@slondr
Copy link
Member

slondr commented Mar 22, 2023

Ok, I think I fixed the merge conflicts

@slondr slondr requested a review from eladyn March 22, 2023 01:48
eladyn
eladyn approved these changes Mar 22, 2023
View reviewed changes
Copy link
Member

@eladyn eladyn left a comment

Choose a reason for hiding this comment

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

Thanks!

@eladyn eladyn merged commit c804184 into Spotifyd:master Mar 22, 2023
@Icelk Icelk deleted the deps-upgrade branch March 22, 2023 06:22
@Icelk
Copy link
Contributor Author

Icelk commented Mar 22, 2023

Great, thanks!

@eladyn eladyn mentioned this pull request Mar 27, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slondr slondr slondr approved these changes

@eladyn eladyn eladyn approved these changes

Assignees

@Icelk Icelk

Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
v0.3.5
Development

Successfully merging this pull request may close these issues.
4 participants
@Icelk @j-code-1 @eladyn @slondr