Skip to content

Upgrade Scala 2 to 2.13.14 (was 2.13.12) #20902

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

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Upgrade Scala 2 to 2.13.14 (was 2.13.12) #20902

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc2dd1e
use Scala 2.13.13 stdlib (was .12)
SethTisue Feb 26, 2024
e81b4a3
Upgrade Scala 2 to 2.13.14
WojciechMazur Jul 1, 2024
2a142cd
Phiscally remove the ignored Scala 2 library-aux files instead of fil…
WojciechMazur Jul 1, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Phiscally remove the ignored Scala 2 library-aux files instead of fil… 
…tering them out in `Compile / sources` (not reliable, for some reasone the AnyRef.scala was still compiled)
  • Loading branch information
@WojciechMazur
WojciechMazur committed Jul 1, 2024
commit 2a142cd5d49a050cee78b860d1428679cee0a2a1
26 changes: 15 additions & 11 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,19 +1126,23 @@ object Build {
IO.createDirectory(trgDir)
IO.unzip(scalaLibrarySourcesJar, trgDir)

((trgDir ** "*.scala") +++ (trgDir ** "*.java")).get.toSet
val (ignoredSources, sources) =
((trgDir ** "*.scala") +++ (trgDir ** "*.java")).get.toSet
.partition{file =>
// sources from https://github.com/scala/scala/tree/2.13.x/src/library-aux
val path = file.getPath.replace('\\', '/')
path.endsWith("scala-library-src/scala/Any.scala") ||
path.endsWith("scala-library-src/scala/AnyVal.scala") ||
path.endsWith("scala-library-src/scala/AnyRef.scala") ||
path.endsWith("scala-library-src/scala/Nothing.scala") ||
path.endsWith("scala-library-src/scala/Null.scala") ||
path.endsWith("scala-library-src/scala/Singleton.scala")
}
// These sources should be never compiled, filtering them out was not working correctly sometimes
ignoredSources.foreach(_.delete())
sources
} (Set(scalaLibrarySourcesJar)).toSeq
}.taskValue,
(Compile / sources) ~= (_.filterNot { file =>
// sources from https://github.com/scala/scala/tree/2.13.x/src/library-aux
val path = file.getPath.replace('\\', '/')
path.endsWith("scala-library-src/scala/Any.scala") ||
path.endsWith("scala-library-src/scala/AnyVal.scala") ||
path.endsWith("scala-library-src/scala/AnyRef.scala") ||
path.endsWith("scala-library-src/scala/Nothing.scala") ||
path.endsWith("scala-library-src/scala/Null.scala") ||
path.endsWith("scala-library-src/scala/Singleton.scala")
}),
(Compile / sources) := {
val files = (Compile / sources).value
val overwrittenSourcesDir = (Compile / scalaSource).value
Expand Down