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

Update scala-library to 2.13.15 #1505

Merged
merged 3 commits into from
Jan 3, 2025
Merged

Conversation

scala-steward-asf[bot]
Copy link
Contributor

About this PR

πŸ“¦ Updates org.scala-lang:scala-library from 2.13.14 to 2.13.15

πŸ“œ GitHub Release Notes - Version Diff

Usage

βœ… Please merge!

I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.

If you'd like to skip this version, you can just close this PR. If you have any feedback, just mention me in the comments below.

Configure Scala Steward for your repository with a .scala-steward.conf file.

Have a fantastic day writing Scala!

πŸ” Files still referring to the old version number

The following files still refer to the old version number (2.13.14).
You might want to review and update them manually.

scripts/link-validator.conf
βš™ Adjust future updates

Add this to your .scala-steward.conf file to ignore future updates of this dependency:

updates.ignore = [ { groupId = "org.scala-lang", artifactId = "scala-library" } ]

Or, add this to slow down future updates of this dependency:

dependencyOverrides = [{
  pullRequests = { frequency = "30 days" },
  dependency = { groupId = "org.scala-lang", artifactId = "scala-library" }
}]
labels: library-update, early-semver-patch, semver-spec-patch, old-version-remains, commit-count:1

@pjfanning pjfanning force-pushed the update/scala-library-2.13.15 branch from 5ac5e91 to 3ef1758 Compare October 2, 2024 23:59
@pjfanning
Copy link
Contributor

original build was failing due to @warn annotations that are not needed

Copy link
Member

@raboof raboof left a comment

Choose a reason for hiding this comment

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

ah looks like there's some more places that need changes to compile

@pjfanning pjfanning marked this pull request as draft October 3, 2024 09:14
@pjfanning pjfanning added this to the 1.1.x milestone Oct 3, 2024
@pjfanning
Copy link
Contributor

It looks like at least some of the @nowarn annotations are needed in the Scala 2.12 build but that Scala 2.13.15 fails if they are there. I think the best solution is to leave them there and change the Scala 2.13 build settings to not fail if there are unnecessary @nowarn annotations.

@raboof
Copy link
Member

raboof commented Oct 3, 2024

that sounds reasonable - perhaps the other way around would be slightly nicer? i.e. could we change the scala 2.12 build settings not to treat warnings as errors?

@pjfanning pjfanning force-pushed the update/scala-library-2.13.15 branch 2 times, most recently from 11059e8 to 0c44c3b Compare October 3, 2024 11:26
@He-Pin
Copy link
Member

He-Pin commented Dec 1, 2024

I tried locally, seems too hard to keep three Scala versions :(
wait scala/scala3#21818

@raboof raboof force-pushed the update/scala-library-2.13.15 branch 2 times, most recently from 8ab0d19 to 97f99c3 Compare January 3, 2025 14:11
@He-Pin
Copy link
Member

He-Pin commented Jan 3, 2025

Cool, thanks @raboof, but I think we can wait for the 3.3.5 release too, which keeps the same behavior.

@raboof raboof self-assigned this Jan 3, 2025
@raboof raboof force-pushed the update/scala-library-2.13.15 branch 3 times, most recently from 2b604c9 to fdcd55b Compare January 3, 2025 15:32
case (3, _) => Seq("-Wconf:cat=unused:s,cat=deprecation,cat=other-shadowing:s,any:e")
case (2, 13) => Seq("-Wconf:any:e,cat=unused:s,cat=deprecation:s,cat=unchecked:s")
case (2, 12) => Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
}),
Copy link
Member

Choose a reason for hiding this comment

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

painful to tweak this, hope @som-snytt can back port this to 2.12.x too

Copy link
Member

Choose a reason for hiding this comment

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

TBH I'm OK with keeping it around until we drop support for 2.12

@raboof raboof force-pushed the update/scala-library-2.13.15 branch from fdcd55b to 28159df Compare January 3, 2025 16:04
@raboof raboof marked this pull request as ready for review January 3, 2025 17:05
@raboof
Copy link
Member

raboof commented Jan 3, 2025

Cool, thanks @raboof, but I think we can wait for the 3.3.5 release too, which keeps the same behavior.

We could, but we don't have to, and I think it's useful to get these updates in small chunks instead of large ones - so I'd still propose we merge this.

@raboof raboof requested a review from He-Pin January 3, 2025 17:06
Copy link
Member

@He-Pin He-Pin left a comment

Choose a reason for hiding this comment

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

Excellent!

Copy link
Contributor

@pjfanning pjfanning left a comment

Choose a reason for hiding this comment

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

lgtm

@pjfanning pjfanning merged commit dad6b9f into main Jan 3, 2025
9 checks passed
@pjfanning pjfanning deleted the update/scala-library-2.13.15 branch January 3, 2025 19:21
@He-Pin He-Pin mentioned this pull request Jan 4, 2025
He-Pin pushed a commit to He-Pin/incubator-pekko that referenced this pull request Jan 4, 2025
* Update scala-library to 2.13.15

* Update link-validator.conf

* fix `-Wconf` to match new semantics

Override order reversed, see also https://github.com/scala/scala/releases

---------

Co-authored-by: Arnout Engelen <[email protected]>
Co-authored-by: PJ Fanning <[email protected]>
(cherry picked from commit dad6b9f)
@pjfanning pjfanning modified the milestones: 1.1.x, 1.1.3 Jan 4, 2025
@He-Pin He-Pin modified the milestones: 1.1.3, 1.2.0 Jan 4, 2025
He-Pin added a commit that referenced this pull request Jan 8, 2025
* Update scala-library to 2.13.15

* Update link-validator.conf

* fix `-Wconf` to match new semantics

Override order reversed, see also https://github.com/scala/scala/releases

---------

Co-authored-by: Arnout Engelen <[email protected]>
Co-authored-by: PJ Fanning <[email protected]>
(cherry picked from commit dad6b9f)

Co-authored-by: scala-steward-asf[bot] <147768647+scala-steward-asf[bot]@users.noreply.github.com>
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.

3 participants