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

Replace Scala jars in UpdateReport with ScalaProvider jars in more situations. Fixes #661. 

Specifically, when the Scala version for sbt is the same as that for the project being built,
the jars in UpdateReport should be the same as those in ScalaProvider.  This is because the
loader will come from the ScalaProvider, which uses jars in the boot directory instead of the
cache.  The first part of the fix for #661 checks that loaded classes come from the classpath
and so they need to line up.
This commit is contained in:
Mark Harrah 2013-02-21 20:44:26 -05:00
parent 39428a996d
commit 0280216e02
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
interface/src/main/java/xsbti/compile/ScalaInstance.java
View File

@ -17,13 +17,16 @@ public interface ScalaInstance
/** A class loader providing access to the classes and resources in the library and compiler jars. */
ClassLoader loader();
/** The library jar file.*/
/**@deprecated Only `jars` can be reliably provided for modularized Scala. (Since 0.13.0) */
@Deprecated
File libraryJar();
/** The compiler jar file.*/
/**@deprecated Only `jars` can be reliably provided for modularized Scala. (Since 0.13.0) */
@Deprecated
File compilerJar();
/** Jars provided by this Scala instance other than the compiler and library jars. */
/**@deprecated Only `jars` can be reliably provided for modularized Scala. (Since 0.13.0) */
@Deprecated
File[] otherJars();
/** All jar files provided by this Scala instance.*/