luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation of the intrinsic Scala version

This commit is contained in:
Eugene Yokota 2022-09-26 01:17:12 -04:00
parent 4f85c11e01
commit 9a2ca3c4da
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/scala/sbt/Defaults.scala
View File

@ -1107,8 +1107,13 @@ object Defaults extends BuildCommon {
// use the same class loader as the Scala classes used by sbt
Def.task {
val allJars = scalaProvider.jars
val libraryJars = allJars.filter(_.getName == "scala-library.jar")
allJars.filter(_.getName == "scala-compiler.jar") match {
val libraryJars = allJars
.filter { jar =>
(jar.getName == "scala-library.jar") || (jar.getName.startsWith("scala3-library_3"))
}
(allJars.filter { jar =>
jar.getName == "scala-compiler.jar" || jar.getName.startsWith("scala3-compiler_3")
}) match {
case Array(compilerJar) if libraryJars.nonEmpty =>
makeScalaInstance(
version,