Skip to content

[2.x] fix: Support alternative Scala lib directories for scalaHome #1630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eed3si9n merged 1 commit into from
Jan 14, 2026
Merged

[2.x] fix: Support alternative Scala lib directories for scalaHome #1630

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,23 @@ object ScalaInstance {
def allJars(scalaHome: File): Seq[File] =
IO.listFiles(scalaLib(scalaHome)).toIndexedSeq.filter(f => !excludeList(f.getName))

private def scalaLib(scalaHome: File): File =
new File(scalaHome, "lib")
private def scalaLib(scalaHome: File): File = {
val candidates = Seq(
new File(scalaHome, "lib"),
new File(scalaHome, "build/pack/lib"),
new File(scalaHome, "dist/target/pack/lib")
)
candidates.find(d => d.isDirectory && hasScalaLibrary(d))
.getOrElse(new File(scalaHome, "lib"))
}

private def hasScalaLibrary(dir: File): Boolean = {
val files = Option(dir.listFiles()).getOrElse(Array.empty[File])
files.exists { f =>
val name = f.getName
name == "scala-library.jar" || name.startsWith("scala3-library_3")
}
}

private val excludeList: Set[String] = Set(
"scala-actors.jar",
Expand All @@ -283,8 +298,17 @@ object ScalaInstance {
/** Get a scala artifact from a given directory. */
def scalaJar(scalaHome: File, name: String) =
new File(scalaLib(scalaHome), name)
private def libraryJar(scalaHome: File) =
scalaJar(scalaHome, "scala-library.jar")

private def libraryJar(scalaHome: File): File = {
val libDir = scalaLib(scalaHome)
val scala2Lib = new File(libDir, "scala-library.jar")
if (scala2Lib.exists()) scala2Lib
else {
val files = Option(libDir.listFiles()).getOrElse(Array.empty[File])
files.find(_.getName.startsWith("scala3-library_3"))
.getOrElse(scala2Lib)
}
}

/** Gets the version of Scala in the compiler.properties file from the loader.*/
private def actualVersion(scalaLoader: ClassLoader)(label: String) = {
Expand Down