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

merge 2.12 to 2.13 20230517 #10401

Merged
merged 14 commits into from May 18, 2023
Merged

Conversation

SethTisue
Copy link
Member

@SethTisue SethTisue commented May 18, 2023

PICK PR 10371 Update sbt-mima-plugin to 1.1.2 in 2.12.x
SKIP PR 10381 Update jackson-module-scala to 2.15.0 in 2.12.x
PICK commit 2f2d4 update .mailmap for 2.12.18 release
PICK PR 10397 ClassfileParser: allow missing param names (for JDK 21)
PICK PR 10398 Lambdaless test is more forgiving

plus I picked only the sbt 1.8.3 upgrade and the JDK 21 test tweaks from #10400, the build changes will come later, after I publish 2.13.11-M2 with these changes (the important one being #10397 of course)

@scala-jenkins scala-jenkins added this to the 2.13.12 milestone May 18, 2023
@SethTisue SethTisue modified the milestones: 2.13.12, 2.13.11 May 18, 2023
@SethTisue SethTisue self-assigned this May 18, 2023
@SethTisue SethTisue merged commit 366ba4a into scala:2.13.x May 18, 2023
3 of 4 checks passed
@SethTisue SethTisue deleted the merge-2.12-to-2.13-20230517 branch May 18, 2023 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants