mirror of https://github.com/sbt/sbt.git
Remove hard-coded scala version in compile test.
This commit is contained in:
parent
12c5f5a0d5
commit
e388ffd3a6
|
|
@ -37,7 +37,6 @@ class AnalyzeCompiler(scalaVersion: String, scalaLoader: ClassLoader, manager: C
|
||||||
* and used to load the class that actually interfaces with Global.*/
|
* and used to load the class that actually interfaces with Global.*/
|
||||||
def apply(arguments: Seq[String], callback: AnalysisCallback, maximumErrors: Int, log: Logger)
|
def apply(arguments: Seq[String], callback: AnalysisCallback, maximumErrors: Int, log: Logger)
|
||||||
{
|
{
|
||||||
println("Compiling: " + arguments)
|
|
||||||
// this is the instance used to compile the analysis
|
// this is the instance used to compile the analysis
|
||||||
val componentCompiler = new ComponentCompiler(scalaVersion, new RawCompiler(scalaLoader), manager)
|
val componentCompiler = new ComponentCompiler(scalaVersion, new RawCompiler(scalaLoader), manager)
|
||||||
val interfaceJar = componentCompiler(ComponentCompiler.compilerInterfaceID)
|
val interfaceJar = componentCompiler(ComponentCompiler.compilerInterfaceID)
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ object WithCompiler
|
||||||
TestIvyLogger { log =>
|
TestIvyLogger { log =>
|
||||||
FileUtilities.withTemporaryDirectory { temp =>
|
FileUtilities.withTemporaryDirectory { temp =>
|
||||||
val launch = new xsbt.boot.Launch(temp)
|
val launch = new xsbt.boot.Launch(temp)
|
||||||
val scalaVersion = "2.7.2"
|
|
||||||
val sbtVersion = xsbti.Versions.Sbt
|
val sbtVersion = xsbti.Versions.Sbt
|
||||||
val manager = new ComponentManager(launch.getSbtHome(sbtVersion, scalaVersion), log)
|
val manager = new ComponentManager(launch.getSbtHome(sbtVersion, scalaVersion), log)
|
||||||
prepare(manager, ComponentCompiler.compilerInterfaceSrcID, "CompilerInterface.scala")
|
prepare(manager, ComponentCompiler.compilerInterfaceSrcID, "CompilerInterface.scala")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue