Permalink
Browse files

Use updated scalariform and refactoring.

Don't include runtime stuff in compile path just because we're including test.
  • Loading branch information...
1 parent bdd5120 commit 03e9ddf64dd906b3e46d32b8de88a66d666c8749 @aemoncannon aemoncannon committed Sep 25, 2010
@@ -14,7 +14,8 @@ class EnsimeProject(info: ProjectInfo) extends DefaultProject(info){
val maven = "org.apache.maven" % "maven-ant-tasks" % "2.1.0" % "compile;runtime;test"
val scalatest = "org.scalatest" % "scalatest" % "1.2" % "test"
val jdt = "org.eclipse.jdt" % "core" % "3.4.2.v_883_R34x" % "compile;runtime;test"
- val scalariform = "org.scalariform" % "scalariform_2.8.0" % "0.0.5-SNAPSHOT"%"compile;runtime;test"
+ val scalariform = "org.scalariform" % "scalariform_2.8.0" % "0.0.5"%"compile;runtime;test"
+// val refactoring = "org.scala-refactoring" % "org.scala-refactoring.library" % "0.2.0-SNAPSHOT"%"compile;runtime;test"
val asm = "asm" % "asm" % "3.2"
val asmCommons = "asm" % "asm-commons" % "3.2"
@@ -158,9 +158,10 @@ object ExternalConfigInterface {
println("Resolving sbt dependencies...")
println("Using build config '" + conf + "'")
- // Recreate the default sbt classpaths
+ // Recreate the default sbt classpaths.
+ // Except we include 'test' in the compile configuration, since ENSIME needs to analyze test sources..
val confs = conf match {
- case "compile" => List("compile", "default", "provided", "optional")
+ case "compile" => List("compile", "default", "provided", "optional", "test")
case "runtime" => List("compile", "default", "provided", "optional", "runtime")
case "test" => List("compile", "default", "provided", "optional", "runtime", "test")
}
@@ -43,7 +43,6 @@ object ProjectConfig {
sourceRoots ++= ext.sourceRoots
runtimeDeps ++= ext.runtimeDepJars
compileDeps ++= ext.compileDepJars
- compileDeps ++= ext.testDepJars
target = ext.target
}
case _ =>
@@ -299,8 +298,8 @@ class ProjectConfig(
}
def runtimeClasspath: String = {
- val allFiles = compileDeps ++ runtimeDeps ++ classDirs ++ target
- val paths = allFiles.map(_.getPath).toSet
+ val deps = runtimeDeps ++ classDirs ++ target
+ val paths = deps.map(_.getPath).toSet
paths.mkString(File.pathSeparator)
}

0 comments on commit 03e9ddf

Please sign in to comment.