@@ -144,8 +144,8 @@ object Build {
144144 * scala-library.
145145 */
146146 def stdlibVersion (implicit mode : Mode ): String = mode match {
147- case NonBootstrapped => " 2.13.12 "
148- case Bootstrapped => " 2.13.12 "
147+ case NonBootstrapped => " 2.13.14 "
148+ case Bootstrapped => " 2.13.14 "
149149 }
150150
151151 /** Version of the scala-library for which we will generate TASTy.
@@ -155,7 +155,7 @@ object Build {
155155 * We can use nightly versions to tests the future compatibility in development.
156156 * Nightly versions: https://scala-ci.typesafe.com/ui/native/scala-integration/org/scala-lang
157157 */
158- val stdlibBootstrappedVersion = " 2.13.12 "
158+ val stdlibBootstrappedVersion = " 2.13.14 "
159159
160160 val dottyOrganization = " org.scala-lang"
161161 val dottyGithubUrl = " https://github.com/scala/scala3"
@@ -1126,19 +1126,23 @@ object Build {
11261126 IO .createDirectory(trgDir)
11271127 IO .unzip(scalaLibrarySourcesJar, trgDir)
11281128
1129- ((trgDir ** " *.scala" ) +++ (trgDir ** " *.java" )).get.toSet
1129+ val (ignoredSources, sources) =
1130+ ((trgDir ** " *.scala" ) +++ (trgDir ** " *.java" )).get.toSet
1131+ .partition{file =>
1132+ // sources from https://github.com/scala/scala/tree/2.13.x/src/library-aux
1133+ val path = file.getPath.replace('\\ ' , '/' )
1134+ path.endsWith(" scala-library-src/scala/Any.scala" ) ||
1135+ path.endsWith(" scala-library-src/scala/AnyVal.scala" ) ||
1136+ path.endsWith(" scala-library-src/scala/AnyRef.scala" ) ||
1137+ path.endsWith(" scala-library-src/scala/Nothing.scala" ) ||
1138+ path.endsWith(" scala-library-src/scala/Null.scala" ) ||
1139+ path.endsWith(" scala-library-src/scala/Singleton.scala" )
1140+ }
1141+ // These sources should be never compiled, filtering them out was not working correctly sometimes
1142+ ignoredSources.foreach(_.delete())
1143+ sources
11301144 } (Set (scalaLibrarySourcesJar)).toSeq
11311145 }.taskValue,
1132- (Compile / sources) ~= (_.filterNot { file =>
1133- // sources from https://github.com/scala/scala/tree/2.13.x/src/library-aux
1134- val path = file.getPath.replace('\\ ' , '/' )
1135- path.endsWith(" scala-library-src/scala/Any.scala" ) ||
1136- path.endsWith(" scala-library-src/scala/AnyVal.scala" ) ||
1137- path.endsWith(" scala-library-src/scala/AnyRef.scala" ) ||
1138- path.endsWith(" scala-library-src/scala/Nothing.scala" ) ||
1139- path.endsWith(" scala-library-src/scala/Null.scala" ) ||
1140- path.endsWith(" scala-library-src/scala/Singleton.scala" )
1141- }),
11421146 (Compile / sources) := {
11431147 val files = (Compile / sources).value
11441148 val overwrittenSourcesDir = (Compile / scalaSource).value
@@ -1361,7 +1365,7 @@ object Build {
13611365 .exclude(" org.eclipse.lsp4j" ," org.eclipse.lsp4j.jsonrpc" ),
13621366 " org.eclipse.lsp4j" % " org.eclipse.lsp4j" % " 0.20.1" ,
13631367 ),
1364- libraryDependencies += (" org.scalameta" % " mtags-shared_2.13.12 " % mtagsVersion % SourceDeps ),
1368+ libraryDependencies += (" org.scalameta" % " mtags-shared_2.13.14 " % mtagsVersion % SourceDeps ),
13651369 ivyConfigurations += SourceDeps .hide,
13661370 transitiveClassifiers := Seq (" sources" ),
13671371 scalacOptions ++= Seq (" -source" , " 3.3" ), // To avoid fatal migration warnings
0 commit comments