diff --git a/sbt/src/sbt-test/project/sbt-file-projects/build.sbt b/sbt/src/sbt-test/project/sbt-file-projects/build.sbt index 500a32076..9b5410eff 100644 --- a/sbt/src/sbt-test/project/sbt-file-projects/build.sbt +++ b/sbt/src/sbt-test/project/sbt-file-projects/build.sbt @@ -2,8 +2,9 @@ val a = "a" val f = file("a") val g = taskKey[Unit]("A task in the root project") -val p = Project(a, f).settingSets(AddSettings.autoPlugins, AddSettings.sbtFiles( file("a.sbt") )) +val p = Project(a, f). + settingSets(AddSettings.autoPlugins, AddSettings.sbtFiles( file("a.sbt") )) -val b = Project("b", file("b")) +val b = (project in file("b")) g := println("Hello.") diff --git a/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.sbt b/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.sbt new file mode 100644 index 000000000..c128b140e --- /dev/null +++ b/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.sbt @@ -0,0 +1 @@ +lazy val root = (project in file(".")) diff --git a/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.scala b/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.scala deleted file mode 100644 index 4b8ae9c25..000000000 --- a/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.scala +++ /dev/null @@ -1,7 +0,0 @@ -import sbt._ -import Keys._ -import Import._ - -object B extends Build { - lazy val root = Project("root", file(".")) -} \ No newline at end of file diff --git a/sbt/src/sbt-test/project/sbt-file-projects/changes/Restricted.scala b/sbt/src/sbt-test/project/sbt-file-projects/changes/Restricted.scala deleted file mode 100644 index 02e9609b9..000000000 --- a/sbt/src/sbt-test/project/sbt-file-projects/changes/Restricted.scala +++ /dev/null @@ -1,9 +0,0 @@ -import sbt._ -import Keys._ -import Import._ - -object B extends Build { - lazy val root = Project("root", file(".")).settingSets( - AddSettings.autoPlugins, - AddSettings.sbtFiles( file("other.sbt") )) // ignore build.sbt -} diff --git a/sbt/src/sbt-test/project/sbt-file-projects/other.sbt b/sbt/src/sbt-test/project/sbt-file-projects/other.sbt index c9166192a..94e5f2363 100644 --- a/sbt/src/sbt-test/project/sbt-file-projects/other.sbt +++ b/sbt/src/sbt-test/project/sbt-file-projects/other.sbt @@ -1 +1 @@ -val c = Project("c", file("c")) \ No newline at end of file +val c = project diff --git a/sbt/src/sbt-test/project/sbt-file-projects/test b/sbt/src/sbt-test/project/sbt-file-projects/test index 07d74c340..d7bf3e913 100644 --- a/sbt/src/sbt-test/project/sbt-file-projects/test +++ b/sbt/src/sbt-test/project/sbt-file-projects/test @@ -7,7 +7,7 @@ > b/h > c/compile -$ copy-file changes/Basic.scala project/Build.scala +$ copy-file changes/Basic.sbt basic.sbt > reload > g > root/compile @@ -16,14 +16,3 @@ $ copy-file changes/Basic.scala project/Build.scala > b/compile > b/h > c/compile - -$ copy-file changes/Restricted.scala project/Build.scala -> reload -> root/compile --> g --> h --> a/compile --> a/aa --> b/compile --> b/h -> c/compile \ No newline at end of file