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

Scala 2.12 and sbt updates #6328

Closed
wants to merge 10 commits into from
Closed

Scala 2.12 and sbt updates #6328

wants to merge 10 commits into from

Conversation

kshakir
Copy link
Contributor

@kshakir kshakir commented May 2, 2021

No description provided.

aednichols
aednichols approved these changes May 4, 2021
View reviewed changes
Copy link
Collaborator

@aednichols aednichols left a comment

Choose a reason for hiding this comment

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

💯

cjllanwarne
cjllanwarne approved these changes May 4, 2021
View reviewed changes
Copy link
Contributor

@cjllanwarne cjllanwarne left a comment

Choose a reason for hiding this comment

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

🎉

kshakir added 3 commits June 12, 2021 12:41
@kshakir
Merge branch 'develop' into ks_2.12.13
64a7a6c
@kshakir
PR Fixup: 2.12.14 was released
89fc0f4
@kshakir
PR Fixup: sbt updates:
884b60c 
- sbt 1.5.3
- sbt-assembly 1.0.0
- more assembly merging workarounds
- disabled test log buffering
- removed some intellij warnings and false-errors
- only set dockerCustomSettings when required
@kshakir kshakir changed the title Scala 2.12.13 Scala 2.12 and sbt updates Jun 13, 2021
@cjllanwarne
Copy link
Contributor

It looks like the recent scala-steward rush has caused a bunch of merge conflicts here, but this appears to resolve the sticky issues with nowarn in https://broadworkbench.atlassian.net/browse/CROM-6777

@kshakir
Copy link
Contributor Author

kshakir commented Jun 26, 2021

Merge conflicts come with the territory of "not in sprint" weekend PRs 😅

RE: CROM-6777- As this PR mentions, the nowarn issues are a bug fixed by scala/scala-collection-compat#426. But as of 2021-06-26 the fix hasn't been released yet. Whether the amelioration in this PR gets merged will depend on if upgrading scala/sbt appears on BT's priority backlog first, or if @SethTisue drops a new release of scala-collection-compat before then.

For now, in this branch the test command sbt centaurCwlRunner/assembly with 2.12.14 Works For Me™.

@cjllanwarne
Copy link
Contributor

cjllanwarne commented Jun 28, 2021 •
edited
Loading

Will be much neater if a new release is published (requested at scala/scala-collection-compat#466)

kshakir added 4 commits July 11, 2021 06:29
@kshakir
Merge branch 'develop' into ks_2.12.13
03ba4f9
@kshakir
PR fixup:
cc44ec5 
- updated scala-collection-compat
- removed obsolete merging exclusions
- removed intellij warnings from Dependencies.scala
@kshakir
Merge branch 'develop' into ks_2.12.13
0d9444f
@kshakir
PR Fixup: sbt 1.5.5 released
c1d5b46
@kshakir
Copy link
Contributor Author

kshakir commented Aug 31, 2021

Replaced by #6456

@kshakir kshakir closed this Aug 31, 2021
@kshakir kshakir deleted the ks_2.12.13 branch May 10, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjllanwarne cjllanwarne cjllanwarne approved these changes

@aednichols aednichols aednichols 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.
3 participants
@kshakir @cjllanwarne @aednichols