From 83866ffb427c78af6901d4e4c3f7f482ddbe41e4 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 26 Feb 2011 20:34:18 -0500
Subject: [PATCH] incremental tests, misc fixes

---
 compile/inc/Incremental.scala                 |  2 +-
 main/Main.scala                               |  2 +-
 main/Project.scala                            |  2 +-
 .../abstract-type/project/build.properties    |  3 ---
 .../added/project/build.properties            |  2 --
 .../by-name/project/build.properties          |  3 ---
 .../source-dependencies/compactify/build.sbt  |  4 ++++
 .../compactify/project/build.properties       |  2 --
 .../project/build/CompactifyTest.scala        |  7 -------
 .../default-params/project/build.properties   |  3 ---
 .../empty-a/project/build.properties          |  4 ----
 .../erasure/project/build.properties          |  3 ---
 .../false-error/project/build.properties      |  3 ---
 .../implicit-params/project/build.properties  |  3 ---
 .../inherited_type_params/build.sbt           |  8 ++++++++
 .../inherited_type_params/project/P.scala     | 12 ------------
 .../project/build.properties                  |  2 --
 .../project/build.properties                  |  3 ---
 .../java-basic/project/build.properties       |  2 --
 .../source-dependencies/java-basic/test       |  2 +-
 .../java-static/project/build.properties      |  2 --
 .../lazy-val/project/build.properties         |  3 ---
 .../linearization/project/build.properties    |  3 ---
 .../named/project/build.properties            |  3 ---
 .../new-cyclic/project/build.properties       |  4 ----
 .../parent-change/project/build.properties    |  3 ---
 .../project/build.properties                  |  3 ---
 .../qualified-access/project/build.properties |  3 ---
 .../remove-test-a/project/build.properties    |  4 ----
 .../remove-test-b/project/build.properties    |  4 ----
 .../project/build.properties                  |  3 ---
 .../replace-test-a/project/Build.scala        | 19 +++++++++++++++++++
 .../replace-test-a/project/build.properties   |  2 --
 .../project/build/TestProject.scala           | 12 ------------
 .../sealed/project/build.properties           |  3 ---
 .../specialized/project/build.properties      |  3 ---
 .../project/build/SpecializeTest.scala        |  7 -------
 .../stability-change/project/build.properties |  3 ---
 .../struct-usage/project/build.properties     |  3 ---
 .../struct/project/build.properties           |  3 ---
 .../transitive-a/project/build.properties     |  4 ----
 .../transitive-b/project/build.properties     |  4 ----
 .../type-parameter/project/build.properties   |  3 ---
 .../typeref-return/project/build.properties   |  3 ---
 .../var/project/build.properties              |  3 ---
 .../variance/project/build.properties         |  3 ---
 46 files changed, 35 insertions(+), 147 deletions(-)
 delete mode 100644 sbt/src/sbt-test/source-dependencies/abstract-type/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/added/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/by-name/project/build.properties
 create mode 100644 sbt/src/sbt-test/source-dependencies/compactify/build.sbt
 delete mode 100644 sbt/src/sbt-test/source-dependencies/compactify/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
 delete mode 100644 sbt/src/sbt-test/source-dependencies/default-params/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/empty-a/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/erasure/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/false-error/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/implicit-params/project/build.properties
 create mode 100644 sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt
 delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited_type_params/project/P.scala
 delete mode 100644 sbt/src/sbt-test/source-dependencies/inherited_type_params/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/intermediate-error/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/java-basic/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/java-static/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/lazy-val/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/linearization/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/named/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/new-cyclic/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/parent-change/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/parent-member-change/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/qualified-access/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/remove-test-a/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/remove-test-b/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
 create mode 100644 sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala
 delete mode 100644 sbt/src/sbt-test/source-dependencies/replace-test-a/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/replace-test-a/project/build/TestProject.scala
 delete mode 100644 sbt/src/sbt-test/source-dependencies/sealed/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/specialized/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
 delete mode 100644 sbt/src/sbt-test/source-dependencies/stability-change/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/struct-usage/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/struct/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/transitive-a/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/transitive-b/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/type-parameter/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/typeref-return/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/var/project/build.properties
 delete mode 100644 sbt/src/sbt-test/source-dependencies/variance/project/build.properties

diff --git a/compile/inc/Incremental.scala b/compile/inc/Incremental.scala
index f94f647ed..7407e037f 100644
--- a/compile/inc/Incremental.scala
+++ b/compile/inc/Incremental.scala
@@ -11,7 +11,7 @@ import java.io.File
 
 object Incremental
 {
-	def println(s: String) = if(java.lang.Boolean.getBoolean("xsbt.inc.debug")) System.out.println(s) else ()
+	def println(s: => String) = if(java.lang.Boolean.getBoolean("xsbt.inc.debug")) System.out.println(s) else ()
 	def compile(sources: Set[File], entry: String => Option[File], previous: Analysis, current: ReadStamps, forEntry: File => Option[Analysis], doCompile: Set[File] => Analysis)(implicit equivS: Equiv[Stamp]): (Boolean, Analysis) =
 	{
 		val initialChanges = changedInitial(entry, sources, previous, current, forEntry)
diff --git a/main/Main.scala b/main/Main.scala
index c29e37608..8b87cc08d 100644
--- a/main/Main.scala
+++ b/main/Main.scala
@@ -220,7 +220,7 @@ object BuiltinCommands
 		val extracted = Project extract s
 		import extracted._
 		val result = session.currentEval().eval(arg, srcName = "<eval>", imports = autoImports(extracted))
-		log.info("ans: " + result.tpe + " = " + result.value.toString)
+		log.info("ans: " + result.tpe + " = " + result.value)
 		s
 	}
 	def sessionCommand = Command.make(SessionCommand, sessionBrief, SessionSettings.Help)(SessionSettings.command)
diff --git a/main/Project.scala b/main/Project.scala
index 7ab6cbe76..cfa5b312a 100644
--- a/main/Project.scala
+++ b/main/Project.scala
@@ -237,7 +237,7 @@ object SessionSettings
 		val project = Project.getProject(pref, structure).getOrElse(error("Invalid project reference " + pref))
 		val appendTo: File = BuildPaths.configurationSources(project.base).headOption.getOrElse(new File(project.base, "build.sbt"))
 		val baseAppend = settingStrings(settings).flatMap("" :: _ :: Nil)
-		val adjustedLines = if( hasTrailingBlank(IO.readLines(appendTo)) ) baseAppend else baseAppend
+		val adjustedLines = if(appendTo.isFile && hasTrailingBlank(IO.readLines(appendTo)) ) baseAppend else "" +: baseAppend
 		IO.writeLines(appendTo, adjustedLines, append = true)
 	}
 	def hasTrailingBlank(lines: Seq[String]) = lines.takeRight(1).exists(_.trim.isEmpty) 
diff --git a/sbt/src/sbt-test/source-dependencies/abstract-type/project/build.properties b/sbt/src/sbt-test/source-dependencies/abstract-type/project/build.properties
deleted file mode 100644
index 5206c1758..000000000
--- a/sbt/src/sbt-test/source-dependencies/abstract-type/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=abstract-type
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/added/project/build.properties b/sbt/src/sbt-test/source-dependencies/added/project/build.properties
deleted file mode 100644
index 3f2496999..000000000
--- a/sbt/src/sbt-test/source-dependencies/added/project/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-project.name=test
-project.version=1.0
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/by-name/project/build.properties b/sbt/src/sbt-test/source-dependencies/by-name/project/build.properties
deleted file mode 100644
index a69cc28b4..000000000
--- a/sbt/src/sbt-test/source-dependencies/by-name/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=by-name
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/compactify/build.sbt b/sbt/src/sbt-test/source-dependencies/compactify/build.sbt
new file mode 100644
index 000000000..6e9cf9cef
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/compactify/build.sbt
@@ -0,0 +1,4 @@
+TaskKey("output-empty") <<= ClassDirectory in Configurations.Compile map { outputDirectory =>
+	def classes = (outputDirectory ** "*.class").get
+	if(!classes.isEmpty) error("Classes existed:\n\t" + classes.mkString("\n\t"))
+}
diff --git a/sbt/src/sbt-test/source-dependencies/compactify/project/build.properties b/sbt/src/sbt-test/source-dependencies/compactify/project/build.properties
deleted file mode 100644
index be8323d58..000000000
--- a/sbt/src/sbt-test/source-dependencies/compactify/project/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-project.name=Compactify Test
-project.version=1.0
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala b/sbt/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
deleted file mode 100644
index 3e2dd3117..000000000
--- a/sbt/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-import sbt._
-
-class CompactifyTest(info: ProjectInfo) extends DefaultProject(info)
-{
-	def classes = (outputDirectory ** "*.class").get
-	lazy val outputEmpty = task { if(!classes.isEmpty) error("Classes existed:\n\t" + classes.mkString("\n\t")) }
-}
diff --git a/sbt/src/sbt-test/source-dependencies/default-params/project/build.properties b/sbt/src/sbt-test/source-dependencies/default-params/project/build.properties
deleted file mode 100644
index 76fda34a1..000000000
--- a/sbt/src/sbt-test/source-dependencies/default-params/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=default-params
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/empty-a/project/build.properties b/sbt/src/sbt-test/source-dependencies/empty-a/project/build.properties
deleted file mode 100644
index 5fe3e1d87..000000000
--- a/sbt/src/sbt-test/source-dependencies/empty-a/project/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Project properties
-#Tue Jan 27 07:55:42 EST 2009
-project.name=Empty Source Test
-project.version=1.0
diff --git a/sbt/src/sbt-test/source-dependencies/erasure/project/build.properties b/sbt/src/sbt-test/source-dependencies/erasure/project/build.properties
deleted file mode 100644
index a38a143cd..000000000
--- a/sbt/src/sbt-test/source-dependencies/erasure/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=erasure
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/false-error/project/build.properties b/sbt/src/sbt-test/source-dependencies/false-error/project/build.properties
deleted file mode 100644
index 168e1bf4d..000000000
--- a/sbt/src/sbt-test/source-dependencies/false-error/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=no-false-error
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/implicit-params/project/build.properties b/sbt/src/sbt-test/source-dependencies/implicit-params/project/build.properties
deleted file mode 100644
index 473fe0930..000000000
--- a/sbt/src/sbt-test/source-dependencies/implicit-params/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=implicit-params
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt
new file mode 100644
index 000000000..f5651a60e
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt
@@ -0,0 +1,8 @@
+Name :== "test"
+
+TaskKey("check-same") <<= CompileTask in Configurations.Compile map { analysis =>
+	analysis.apis.internal foreach { case (_, api) =>
+		assert( xsbt.api.APIUtil.verifyTypeParameters(api) )
+		assert( xsbt.api.SameAPI(api, api) )
+	}
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/inherited_type_params/project/P.scala b/sbt/src/sbt-test/source-dependencies/inherited_type_params/project/P.scala
deleted file mode 100644
index a784a62f8..000000000
--- a/sbt/src/sbt-test/source-dependencies/inherited_type_params/project/P.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import sbt._
-
-class P(info: ProjectInfo) extends DefaultProject(info)
-{
-	override def name = "test"
-	lazy val checkSame = compile map { analysis =>
-		analysis.apis.internal foreach { case (_, api) =>
-			assert( xsbt.api.APIUtil.verifyTypeParameters(api) )
-			assert( xsbt.api.SameAPI(api, api) )
-		}
-	}
-}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/inherited_type_params/project/build.properties b/sbt/src/sbt-test/source-dependencies/inherited_type_params/project/build.properties
deleted file mode 100644
index 3f2496999..000000000
--- a/sbt/src/sbt-test/source-dependencies/inherited_type_params/project/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-project.name=test
-project.version=1.0
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/intermediate-error/project/build.properties b/sbt/src/sbt-test/source-dependencies/intermediate-error/project/build.properties
deleted file mode 100644
index c67debabc..000000000
--- a/sbt/src/sbt-test/source-dependencies/intermediate-error/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=intermediate-error
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/java-basic/project/build.properties b/sbt/src/sbt-test/source-dependencies/java-basic/project/build.properties
deleted file mode 100644
index 5838ca7f8..000000000
--- a/sbt/src/sbt-test/source-dependencies/java-basic/project/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-project.name=Basic Java Dependency Test
-project.version=1.0
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/java-basic/test b/sbt/src/sbt-test/source-dependencies/java-basic/test
index ee62f0b85..9dac40735 100644
--- a/sbt/src/sbt-test/source-dependencies/java-basic/test
+++ b/sbt/src/sbt-test/source-dependencies/java-basic/test
@@ -1,5 +1,5 @@
 # Basic test for Java dependency tracking
-> set xsbt.inc.debug true
+> 'eval System.setProperty("xsbt.inc.debug", "true")'
 
 # A is a basic Java file with no dependencies.  Just a basic check for Java compilation
 $ copy-file changes/A.java src/main/java/a/A.java
diff --git a/sbt/src/sbt-test/source-dependencies/java-static/project/build.properties b/sbt/src/sbt-test/source-dependencies/java-static/project/build.properties
deleted file mode 100644
index 3253ff5ca..000000000
--- a/sbt/src/sbt-test/source-dependencies/java-static/project/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-project.name=Java static test
-project.version=9.5.3
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/lazy-val/project/build.properties b/sbt/src/sbt-test/source-dependencies/lazy-val/project/build.properties
deleted file mode 100644
index 713d6be32..000000000
--- a/sbt/src/sbt-test/source-dependencies/lazy-val/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=lazy-val
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/linearization/project/build.properties b/sbt/src/sbt-test/source-dependencies/linearization/project/build.properties
deleted file mode 100644
index 713d6be32..000000000
--- a/sbt/src/sbt-test/source-dependencies/linearization/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=lazy-val
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/named/project/build.properties b/sbt/src/sbt-test/source-dependencies/named/project/build.properties
deleted file mode 100644
index 61029bf16..000000000
--- a/sbt/src/sbt-test/source-dependencies/named/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=named
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/new-cyclic/project/build.properties b/sbt/src/sbt-test/source-dependencies/new-cyclic/project/build.properties
deleted file mode 100644
index 66fbd1686..000000000
--- a/sbt/src/sbt-test/source-dependencies/new-cyclic/project/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Project properties
-#Mon Feb 09 21:05:16 EST 2009
-project.name=Test
-project.version=1.0
diff --git a/sbt/src/sbt-test/source-dependencies/parent-change/project/build.properties b/sbt/src/sbt-test/source-dependencies/parent-change/project/build.properties
deleted file mode 100644
index 14d3f7e07..000000000
--- a/sbt/src/sbt-test/source-dependencies/parent-change/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=parent-member
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/parent-member-change/project/build.properties b/sbt/src/sbt-test/source-dependencies/parent-member-change/project/build.properties
deleted file mode 100644
index d08e70fba..000000000
--- a/sbt/src/sbt-test/source-dependencies/parent-member-change/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=parent-member-change
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/qualified-access/project/build.properties b/sbt/src/sbt-test/source-dependencies/qualified-access/project/build.properties
deleted file mode 100644
index 51409b08c..000000000
--- a/sbt/src/sbt-test/source-dependencies/qualified-access/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=qualified-access
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/remove-test-a/project/build.properties b/sbt/src/sbt-test/source-dependencies/remove-test-a/project/build.properties
deleted file mode 100644
index 8c4503ca9..000000000
--- a/sbt/src/sbt-test/source-dependencies/remove-test-a/project/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Project properties
-#Fri Jan 23 22:29:49 EST 2009
-project.name=Test Project A
-project.version=1.0
diff --git a/sbt/src/sbt-test/source-dependencies/remove-test-b/project/build.properties b/sbt/src/sbt-test/source-dependencies/remove-test-b/project/build.properties
deleted file mode 100644
index fcc97e13f..000000000
--- a/sbt/src/sbt-test/source-dependencies/remove-test-b/project/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Project properties
-#Sat Jan 24 19:12:23 EST 2009
-project.name=Remove Test B
-project.version=1.0
diff --git a/sbt/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties b/sbt/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
deleted file mode 100644
index 245bcfdf1..000000000
--- a/sbt/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=repeated-parameters
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala b/sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala
new file mode 100644
index 000000000..b3c1fca29
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala
@@ -0,0 +1,19 @@
+import sbt._
+import Keys._
+import java.net.URLClassLoader
+
+object B extends Build
+{
+	lazy val projects = Seq(root)
+	lazy val root = Project("root", file(".")) settings( ss : _*)
+
+	def ss = Seq(
+		TaskKey("check-first") <<= checkTask("First"),
+		TaskKey("check-second") <<= checkTask("Second")
+	)
+	private def checkTask(className: String) =
+		FullClasspath in Configurations.Runtime map { runClasspath =>
+			val cp = runClasspath.map(_.data.toURI.toURL).toArray
+			Class.forName(className, false, new URLClassLoader(cp))
+		}
+}
diff --git a/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build.properties b/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build.properties
deleted file mode 100644
index 2b4d7e5a1..000000000
--- a/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-project.name=Test
-project.version=1.0
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build/TestProject.scala b/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build/TestProject.scala
deleted file mode 100644
index 51bca4efb..000000000
--- a/sbt/src/sbt-test/source-dependencies/replace-test-a/project/build/TestProject.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import sbt._
-import java.net.URLClassLoader
-class TestProject(info: ProjectInfo) extends DefaultProject(info)
-{
-	lazy val checkFirst = checkTask("First")
-	lazy val checkSecond = checkTask("Second")
-	private def checkTask(className: String) =
-		fullClasspath(Configurations.Runtime) map { runClasspath =>
-			val cp = runClasspath.map(_.data.toURI.toURL).toArray
-			Class.forName(className, false, new URLClassLoader(cp))
-		}
-}
diff --git a/sbt/src/sbt-test/source-dependencies/sealed/project/build.properties b/sbt/src/sbt-test/source-dependencies/sealed/project/build.properties
deleted file mode 100644
index cfd728873..000000000
--- a/sbt/src/sbt-test/source-dependencies/sealed/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=sealed
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/specialized/project/build.properties b/sbt/src/sbt-test/source-dependencies/specialized/project/build.properties
deleted file mode 100644
index c90a11c70..000000000
--- a/sbt/src/sbt-test/source-dependencies/specialized/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=specialized
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala b/sbt/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
deleted file mode 100644
index 094dd9442..000000000
--- a/sbt/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-import sbt._
-
-class SpecializeTest(info: ProjectInfo) extends DefaultProject(info)
-{
-// now on by default in 2.8
-//	override def compileOptions = super.compileOptions ++ Seq(CompileOption("-Yspecialize"))
-}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/stability-change/project/build.properties b/sbt/src/sbt-test/source-dependencies/stability-change/project/build.properties
deleted file mode 100644
index b66876fb0..000000000
--- a/sbt/src/sbt-test/source-dependencies/stability-change/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=stability
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/struct-usage/project/build.properties b/sbt/src/sbt-test/source-dependencies/struct-usage/project/build.properties
deleted file mode 100644
index 94ffa9f9c..000000000
--- a/sbt/src/sbt-test/source-dependencies/struct-usage/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=struct-usage
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/struct/project/build.properties b/sbt/src/sbt-test/source-dependencies/struct/project/build.properties
deleted file mode 100644
index b7368a54a..000000000
--- a/sbt/src/sbt-test/source-dependencies/struct/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=struct
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/transitive-a/project/build.properties b/sbt/src/sbt-test/source-dependencies/transitive-a/project/build.properties
deleted file mode 100644
index 309b0ced2..000000000
--- a/sbt/src/sbt-test/source-dependencies/transitive-a/project/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Project properties
-#Mon Jan 26 19:13:08 EST 2009
-project.name=Transitive A
-project.version=1.0
diff --git a/sbt/src/sbt-test/source-dependencies/transitive-b/project/build.properties b/sbt/src/sbt-test/source-dependencies/transitive-b/project/build.properties
deleted file mode 100644
index 309b0ced2..000000000
--- a/sbt/src/sbt-test/source-dependencies/transitive-b/project/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Project properties
-#Mon Jan 26 19:13:08 EST 2009
-project.name=Transitive A
-project.version=1.0
diff --git a/sbt/src/sbt-test/source-dependencies/type-parameter/project/build.properties b/sbt/src/sbt-test/source-dependencies/type-parameter/project/build.properties
deleted file mode 100644
index 707edcb0d..000000000
--- a/sbt/src/sbt-test/source-dependencies/type-parameter/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=type-parameter
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/typeref-return/project/build.properties b/sbt/src/sbt-test/source-dependencies/typeref-return/project/build.properties
deleted file mode 100644
index e086c7b22..000000000
--- a/sbt/src/sbt-test/source-dependencies/typeref-return/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=typeref-return
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/var/project/build.properties b/sbt/src/sbt-test/source-dependencies/var/project/build.properties
deleted file mode 100644
index 7dc1118ac..000000000
--- a/sbt/src/sbt-test/source-dependencies/var/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=var
-project.version=1.0
-project.scratch=true
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/variance/project/build.properties b/sbt/src/sbt-test/source-dependencies/variance/project/build.properties
deleted file mode 100644
index 7550db3ca..000000000
--- a/sbt/src/sbt-test/source-dependencies/variance/project/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=variance
-project.version=1.0
-project.scratch=true
\ No newline at end of file