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

Exclude files from Scala's library-aux to prepare for 2.13.14. #4980

Merged
merged 1 commit into from
Apr 28, 2024

Conversation

sjrd
Copy link
Member

@sjrd sjrd commented Apr 23, 2024

Since Scala 2.13.14, the stdlib's source jar contains the files of their library-aux directory. These files are not meant to be processed by the regular compiler (only by Scaladoc). We must therefore exclude them from the compilation of the scalalib.

In the process, we remove the exclusion of /scala/util/parsing/ which has been dead code since we dropped support for Scala 2.11.


Locally tested with the "RC" 2.13.14-bin-a527019.

Since Scala 2.13.14, the stdlib's source jar contains the files of
their `library-aux` directory. These files are not meant to be
processed by the regular compiler (only by Scaladoc). We must
therefore exclude them from the compilation of the scalalib.

In the process, we remove the exclusion of `/scala/util/parsing/`
which has been dead code since we dropped support for Scala 2.11.
@sjrd sjrd requested a review from gzm0 April 23, 2024 09:27
@gzm0
Copy link
Contributor

gzm0 commented Apr 28, 2024

Upstream change: scala/scala#10714

* meant to be compiled. They are part of the source jar since Scala 2.13.14.
*/
val excludeFiles =
Set("Any.scala", "AnyRef.scala", "Nothing.scala", "Null.scala", "Singleton.scala")
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not so happy about this verbatim list. But I guess it is highly unlikely that it changes.

@gzm0 gzm0 merged commit 28366ea into scala-js:main Apr 28, 2024
3 checks passed
@sjrd sjrd deleted the prepare-for-scala-2.13.14 branch April 28, 2024 09:16
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.

None yet

2 participants