File tree 2 files changed +21
-8
lines changed
2 files changed +21
-8
lines changed Original file line number Diff line number Diff line change @@ -1002,7 +1002,21 @@ object Build {
1002
1002
IO .createDirectory(trgDir)
1003
1003
IO .unzip(scalaLibrarySourcesJar, trgDir)
1004
1004
1005
- ((trgDir ** " *.scala" ) +++ (trgDir ** " *.java" )).get.toSet
1005
+ val (ignoredSources, sources) =
1006
+ ((trgDir ** " *.scala" ) +++ (trgDir ** " *.java" )).get.toSet
1007
+ .partition{file =>
1008
+ // sources from https://github.com/scala/scala/tree/2.13.x/src/library-aux
1009
+ val path = file.getPath.replace('\\ ' , '/' )
1010
+ path.endsWith(" scala-library-src/scala/Any.scala" ) ||
1011
+ path.endsWith(" scala-library-src/scala/AnyVal.scala" ) ||
1012
+ path.endsWith(" scala-library-src/scala/AnyRef.scala" ) ||
1013
+ path.endsWith(" scala-library-src/scala/Nothing.scala" ) ||
1014
+ path.endsWith(" scala-library-src/scala/Null.scala" ) ||
1015
+ path.endsWith(" scala-library-src/scala/Singleton.scala" )
1016
+ }
1017
+ // These sources should be never compiled, filtering them out was not working correctly sometimes
1018
+ ignoredSources.foreach(_.delete())
1019
+ sources
1006
1020
} (Set (scalaLibrarySourcesJar)).toSeq
1007
1021
}.taskValue,
1008
1022
(Compile / sourceGenerators) += Def .task {
Original file line number Diff line number Diff line change @@ -14,13 +14,12 @@ object MiMaFilters {
14
14
ProblemFilters .exclude[MissingFieldProblem ](" scala.runtime.stdLibPatches.language#experimental.relaxedExtensionImports" ),
15
15
ProblemFilters .exclude[MissingClassProblem ](" scala.runtime.stdLibPatches.language$experimental$relaxedExtensionImports$" ),
16
16
// end of New experimental features in 3.3.X
17
-
18
- // New in 2.13.13
19
- " scala.collection.mutable.ArrayBuffer.resizeUp" , // private[mutable] def
20
- // New in 2.13.14
21
- " scala.util.Properties.consoleIsTerminal" , // private[scala] lazy val
22
- // end of new in Scala 2
23
- )
17
+ ) ++ Seq (
18
+ // New in 2.13.13
19
+ " scala.collection.mutable.ArrayBuffer.resizeUp" , // private[mutable] def
20
+ // New in 2.13.14
21
+ " scala.util.Properties.consoleIsTerminal" , // private[scala] lazy val
22
+ ).map(ProblemFilters .exclude[DirectMissingMethodProblem ])
24
23
val TastyCore : Seq [ProblemFilter ] = Seq (
25
24
)
26
25
val Interfaces : Seq [ProblemFilter ] = Seq (
You can’t perform that action at this time.
0 commit comments