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.

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

v2.0: Merge latest master into v2.0 #684

Merged
merged 19 commits into from
Jul 8, 2024

Conversation

johnnyshields
Copy link
Collaborator

@johnnyshields johnnyshields commented Jul 8, 2024

This PR catches up v2.x branch with the latest master code.

This PR also drops support for Ruby 2.6, 2.7 and JRuby 9.3 all of which are now both EOL. (Even Ruby 3.0 is EOL, but we can support it for now.)

@johnnyshields johnnyshields changed the base branch from master to v2.x July 8, 2024 09:30
@johnnyshields johnnyshields changed the title Update v2.x 20240708 Merge latest master into v2.x Jul 8, 2024
@johnnyshields johnnyshields force-pushed the update-v2.x-20240708 branch from bdd79f0 to ec20f55 Compare July 8, 2024 09:46
@johnnyshields
Copy link
Collaborator Author

@pitbulk this is ready for your review now.

@@ -2,6 +2,6 @@

module OneLogin
module RubySaml
VERSION = '1.15.0'
VERSION = '1.16.0'
Copy link
Collaborator

@pitbulk pitbulk Jul 8, 2024

Choose a reason for hiding this comment

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

@johnnyshields I'm more inclined to move to a 2.X version now that we have dropped support for old Ruby versions.

That way we can use 1.16 and 1.X for security bugfixes and key features we want to add to the old branch.
We should also update the changelog properly.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done! Changed to 2.0.0

@pitbulk
Copy link
Collaborator

pitbulk commented Jul 8, 2024

I only have the concern of the ruby-saml version, the rest seems good to be merged.

Do you want to fix this at this PR or later?

We should also, after the PR 685, apply somehow adapted versions of:

@johnnyshields johnnyshields changed the title Merge latest master into v2.x v2.0: Merge latest master into v2.0 Jul 8, 2024
@johnnyshields
Copy link
Collaborator Author

johnnyshields commented Jul 8, 2024

@pitbulk I've bumped the version to 2.0.0

#681 and #679 are both already handled on the v2 branch as part of my Rubocop fixes you merged yesterday. Both those PRs can be closed.

Let's merge this one!

@pitbulk pitbulk merged commit a4e7808 into SAML-Toolkits:v2.x Jul 8, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants