Skip to content

Commit e3dcf66

Browse files
Duhemmallanrenucci
authored andcommitted
Change name of scala-library jar in tests
For many tests, we need the `scala-library` jar on the classpath, and we used to search through the classpath for a JAR whose name contained `scala-library-2.`. This works great if the `scala-library` on the classpath comes from Ivy. However, if we use the same version of Scala as sbt, the `scala-library` will not be taken ouf of the Ivy cache but from sbt's boot directory. In this case, the JAR will simply be named `scala-library.jar`.
1 parent e3f955a commit e3dcf66

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

compiler/test/dotty/Jars.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object Jars {
2626
dottyLib :: dottyCompiler :: dottyInterfaces :: dottyExtras
2727

2828
def scalaLibrary: String = sys.env.get("DOTTY_SCALA_LIBRARY")
29-
.getOrElse(findJarFromRuntime("scala-library-2."))
29+
.getOrElse(findJarFromRuntime("scala-library"))
3030

3131
/** Gets the scala 2.* library at runtime, note that doing this is unsafe
3232
* unless you know that the library will be on the classpath of the running

0 commit comments

Comments
 (0)