@@ -144,8 +144,8 @@ object Build {
144
144
* scala-library.
145
145
*/
146
146
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 "
149
149
}
150
150
151
151
/** Version of the scala-library for which we will generate TASTy.
@@ -155,7 +155,7 @@ object Build {
155
155
* We can use nightly versions to tests the future compatibility in development.
156
156
* Nightly versions: https://scala-ci.typesafe.com/ui/native/scala-integration/org/scala-lang
157
157
*/
158
- val stdlibBootstrappedVersion = " 2.13.12 "
158
+ val stdlibBootstrappedVersion = " 2.13.14 "
159
159
160
160
val dottyOrganization = " org.scala-lang"
161
161
val dottyGithubUrl = " https://github.com/scala/scala3"
@@ -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
@@ -1358,7 +1362,7 @@ object Build {
1358
1362
" io.get-coursier" % " interface" % " 1.0.18" ,
1359
1363
" org.scalameta" % " mtags-interfaces" % mtagsVersion,
1360
1364
),
1361
- libraryDependencies += (" org.scalameta" % " mtags-shared_2.13.12 " % mtagsVersion % SourceDeps ),
1365
+ libraryDependencies += (" org.scalameta" % " mtags-shared_2.13.14 " % mtagsVersion % SourceDeps ),
1362
1366
ivyConfigurations += SourceDeps .hide,
1363
1367
transitiveClassifiers := Seq (" sources" ),
1364
1368
scalacOptions ++= Seq (" -source" , " 3.3" ), // To avoid fatal migration warnings
0 commit comments