diff --git a/main/actions/AggressiveCompile.scala b/compile/integration/AggressiveCompile.scala similarity index 100% rename from main/actions/AggressiveCompile.scala rename to compile/integration/AggressiveCompile.scala diff --git a/main/actions/Compiler.scala b/compile/integration/Compiler.scala similarity index 94% rename from main/actions/Compiler.scala rename to compile/integration/Compiler.scala index dac5a5ce7..b6818fcae 100644 --- a/main/actions/Compiler.scala +++ b/compile/integration/Compiler.scala @@ -13,16 +13,6 @@ object Compiler { val DefaultMaxErrors = 100 - def allProblems(inc: Incomplete): Seq[Problem] = - allProblems(inc :: Nil) - def allProblems(incs: Seq[Incomplete]): Seq[Problem] = - problems(Incomplete.allExceptions(incs).toSeq) - def problems(es: Seq[Throwable]): Seq[Problem] = - es flatMap { - case cf: xsbti.CompileFailed => cf.problems - case _ => Nil - } - final case class Inputs(compilers: Compilers, config: Options, incSetup: IncSetup) final case class Options(classpath: Seq[File], sources: Seq[File], classesDirectory: File, options: Seq[String], javacOptions: Seq[String], maxErrors: Int, order: CompileOrder.Value) final case class IncSetup(analysisMap: Map[File, Analysis], definesClass: DefinesClass, skip: Boolean, cacheFile: File) diff --git a/project/Sbt.scala b/project/Sbt.scala index 22ac427bd..3ea36b9b1 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -104,6 +104,8 @@ object Sbt extends Build // sbt-side interface to compiler. Calls compiler-side interface reflectively lazy val compilerSub = testedBaseProject(compilePath, "Compile") dependsOn(launchInterfaceSub, interfaceSub % "compile;test->test", ivySub, ioSub, classpathSub, logSub % "test->test", launchSub % "test->test", apiSub % "test") settings( compilerSettings : _*) + lazy val compilerIntegrationSub = baseProject(compilePath / "integration", "Compiler Integration") dependsOn( + compileIncrementalSub, compilerSub, compilePersistSub, apiSub, classfileSub) lazy val scriptedBaseSub = baseProject(scriptedPath / "base", "Scripted Framework") dependsOn(ioSub, processSub) lazy val scriptedSbtSub = baseProject(scriptedPath / "sbt", "Scripted sbt") dependsOn(ioSub, logSub, processSub, scriptedBaseSub, launchInterfaceSub % "provided") @@ -112,7 +114,7 @@ object Sbt extends Build // Implementation and support code for defining actions. lazy val actionsSub = baseProject(mainPath / "actions", "Actions") dependsOn( - classfileSub, classpathSub, compileIncrementalSub, compilePersistSub, compilerSub, completeSub, apiSub, + classpathSub, completeSub, apiSub, compilerIntegrationSub, interfaceSub, ioSub, ivySub, logSub, processSub, runSub, stdTaskSub, taskSub, trackingSub, testingSub) lazy val commandSub = testedBaseProject(commandPath, "Command") dependsOn(interfaceSub, ioSub, launchInterfaceSub, logSub, completeSub, classpathSub)