Skip to content

[stdlib] Pin scala3 files before merging the full history #23517

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

Merged
merged 2 commits into from
Jul 14, 2025

Conversation

hamzaremmal
Copy link
Member

Before merging the history of the scala 2 library with Dotty, we first pin the set of files to be compiled for now.
This will change in 3.8.0 when we bundle all the files of the scala 3 library in the same jar and drop the dependency to scala2 stdlib

[test_non_bootstrapped]

@hamzaremmal hamzaremmal changed the title Pin scala3 files [stdlib] Pin scala3 files before merging the full history Jul 14, 2025
@hamzaremmal hamzaremmal requested a review from natsukagami July 14, 2025 09:53
Copy link
Contributor

@natsukagami natsukagami left a comment

Choose a reason for hiding this comment

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

I trust that you took the list from print _ / Compile / sources properly 👍

@@ -1138,7 +1138,275 @@ object Build {
)

lazy val `scala3-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)
.settings(
// Note: extracted using `print scala3-library / Compile / sources`
// Only keep scala3 files until 3.8.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Note to self: this means after 3.8 we will remove this and have the full stdlib

@hamzaremmal hamzaremmal marked this pull request as ready for review July 14, 2025 09:59
@hamzaremmal hamzaremmal enabled auto-merge July 14, 2025 09:59
@hamzaremmal
Copy link
Member Author

I trust that you took the list from print _ / Compile / sources properly 👍

I trust MiMa would have complained if something was missing!

@hamzaremmal hamzaremmal merged commit 1f057d2 into scala:main Jul 14, 2025
29 checks passed
@hamzaremmal hamzaremmal deleted the pin-scala3-files branch July 14, 2025 11:11
hamzaremmal added a commit that referenced this pull request Jul 14, 2025
#23518)

Follows #23517

The compiler adds the `sourceDirectories` as an option so that it can
load the definitions from the stdlib.
Now, instead of adding the directories, we just add the pinned files.

This has been missing when I merged locally the scala 2 history. With
this change, everything behaves as expected when I opened #23517.
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.

2 participants