@@ -1124,19 +1124,23 @@ object Build {
1124
1124
IO .createDirectory(trgDir)
1125
1125
IO .unzip(scalaLibrarySourcesJar, trgDir)
1126
1126
1127
- ((trgDir ** " *.scala" ) +++ (trgDir ** " *.java" )).get.toSet
1127
+ val (ignoredSources, sources) =
1128
+ ((trgDir ** " *.scala" ) +++ (trgDir ** " *.java" )).get.toSet
1129
+ .partition{file =>
1130
+ // sources from https://github.com/scala/scala/tree/2.13.x/src/library-aux
1131
+ val path = file.getPath.replace('\\ ' , '/' )
1132
+ path.endsWith(" scala-library-src/scala/Any.scala" ) ||
1133
+ path.endsWith(" scala-library-src/scala/AnyVal.scala" ) ||
1134
+ path.endsWith(" scala-library-src/scala/AnyRef.scala" ) ||
1135
+ path.endsWith(" scala-library-src/scala/Nothing.scala" ) ||
1136
+ path.endsWith(" scala-library-src/scala/Null.scala" ) ||
1137
+ path.endsWith(" scala-library-src/scala/Singleton.scala" )
1138
+ }
1139
+ // These sources should be never compiled, filtering them out was not working correctly sometimes
1140
+ ignoredSources.foreach(_.delete())
1141
+ sources
1128
1142
} (Set (scalaLibrarySourcesJar)).toSeq
1129
1143
}.taskValue,
1130
- (Compile / sources) ~= (_.filterNot { file =>
1131
- // sources from https://github.com/scala/scala/tree/2.13.x/src/library-aux
1132
- val path = file.getPath.replace('\\ ' , '/' )
1133
- path.endsWith(" scala-library-src/scala/Any.scala" ) ||
1134
- path.endsWith(" scala-library-src/scala/AnyVal.scala" ) ||
1135
- path.endsWith(" scala-library-src/scala/AnyRef.scala" ) ||
1136
- path.endsWith(" scala-library-src/scala/Nothing.scala" ) ||
1137
- path.endsWith(" scala-library-src/scala/Null.scala" ) ||
1138
- path.endsWith(" scala-library-src/scala/Singleton.scala" )
1139
- }),
1140
1144
(Compile / sources) := {
1141
1145
val files = (Compile / sources).value
1142
1146
val overwrittenSourcesDir = (Compile / scalaSource).value
0 commit comments