diff --git a/sbt/src/sbt-test/project/multi/changes/Build1.scala b/sbt/src/sbt-test/project/multi/changes/Build1.scala deleted file mode 100644 index d2aa4b9b2..000000000 --- a/sbt/src/sbt-test/project/multi/changes/Build1.scala +++ /dev/null @@ -1,13 +0,0 @@ -import sbt._ -import Keys.name -import AddSettings._ -import Import._ - -object TestBuild extends Build -{ - override def projects = Seq( - proj("a", "."), - proj("b", "b") - ) - def proj(id: String, dir: String) = Project(id, file(dir), settings = Seq( name := id ) ).settingSets(buildScalaFiles) -} diff --git a/sbt/src/sbt-test/project/multi/changes/Build2.scala b/sbt/src/sbt-test/project/multi/changes/Build2.scala deleted file mode 100644 index aa21b29e6..000000000 --- a/sbt/src/sbt-test/project/multi/changes/Build2.scala +++ /dev/null @@ -1,17 +0,0 @@ -import sbt._ -import Keys.name -import Import._ - -object TestBuild extends MakeBuild -{ - lazy val a = proj("a", ".") -} -object SecondBuild extends MakeBuild -{ - lazy val b = proj("b", "b") -} -trait MakeBuild extends Build -{ - import AddSettings._ - def proj(id: String, dir: String) = Project(id, file(dir), settings = Seq( name := id ) ).settingSets(buildScalaFiles, defaultSbtFiles) -} diff --git a/sbt/src/sbt-test/project/multi/changes/a.sbt b/sbt/src/sbt-test/project/multi/changes/a.sbt deleted file mode 100644 index ff6074adf..000000000 --- a/sbt/src/sbt-test/project/multi/changes/a.sbt +++ /dev/null @@ -1 +0,0 @@ -TaskKey[Unit]("example") := {} \ No newline at end of file diff --git a/sbt/src/sbt-test/project/multi/changes/b.sbt b/sbt/src/sbt-test/project/multi/changes/b.sbt deleted file mode 100644 index 5e889b0d2..000000000 --- a/sbt/src/sbt-test/project/multi/changes/b.sbt +++ /dev/null @@ -1 +0,0 @@ -TaskKey[Unit]("sample") := {} \ No newline at end of file diff --git a/sbt/src/sbt-test/project/multi/changes/b2.sbt b/sbt/src/sbt-test/project/multi/changes/b2.sbt deleted file mode 100644 index e61638a83..000000000 --- a/sbt/src/sbt-test/project/multi/changes/b2.sbt +++ /dev/null @@ -1 +0,0 @@ -TaskKey[Unit]("sample2") := {} \ No newline at end of file diff --git a/sbt/src/sbt-test/project/multi/test b/sbt/src/sbt-test/project/multi/test deleted file mode 100644 index 09a5fe171..000000000 --- a/sbt/src/sbt-test/project/multi/test +++ /dev/null @@ -1,29 +0,0 @@ -# A single project definition with projects only defining a name -$ copy-file changes/Build1.scala project/Build.scala -> reload -> a/name --> a/compile -> b/name --> b/compile -$ delete project/Build.scala - -# Two separate project definitions, implemented using a trait -# Only the modules should be discovered. -# A .sbt file should be used in each -$ copy-file changes/Build2.scala project/Build.scala -$ copy-file changes/a.sbt a.sbt -$ copy-file changes/b.sbt b/b.sbt -$ copy-file changes/b2.sbt b/b2.sbt -> reload - -> a/name --> a/compile -> a/example --> a/sample --> a/sample2 - -> b/name --> b/compile -> b/sample -> b/sample2 --> b/example