[2.x] fix: Support alternative Scala lib directories for scalaHome #1630
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes sbt/sbt#7477 When using scalaHome with a Scala checkout, the lib directory may be in different locations depending on the build system: - lib/ (traditional/installed Scala) - build/pack/lib/ (Scala 2.13 after dist/mkPack) - dist/target/pack/lib/ (Scala 3 builds) This change updates scalaLib() to check these candidate directories and use the first one that contains a Scala library jar. Also updates libraryJar() to support both Scala 2 (scala-library.jar) and Scala 3 (scala3-library_3-*.jar) library jar naming.
MkDev11
force-pushed
the
fix/scalaHome-alternative-lib-dirs-7477
branch
from
b09f20d to
cf370e4
Compare
Contributor
Author
|
@eed3si9n please review the push and let me know the result |
eed3si9n
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix scalaHome support for Scala 2.13/3 build directories
Fixes sbt/sbt#7477
The Problem
When using
scalaHomewith a Scala checkout (e.g., for testing local Scala changes), sbt fails with:This happens because zinc expects Scala jars in
$scalaHome/lib/, but:$scalaHome/build/pack/lib/after runningdist/mkPack$scalaHome/dist/target/pack/lib/The Fix
Update
ScalaInstance.scalaLib()to check multiple candidate directories:lib/(traditional/installed Scala)build/pack/lib/(Scala 2.13 afterdist/mkPack)dist/target/pack/lib/(Scala 3 builds)Also update
libraryJar()to support both:scala-library.jarscala3-library_3-*.jarTesting
With this fix, the following now works without the symlink workaround:
After running
dist/mkPackin the Scala checkout,sbt compileandsbt runwork correctly.