Port project/sbt-file-projects

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.")

sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.sbt

@@ -0,0 +1 @@
+lazy val root = (project in file("."))

sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.scala

@@ -1,7 +0,0 @@
-import sbt._
-import Keys._
-import Import._
-
-object B extends Build {
-	lazy val root = Project("root", file("."))
-}

sbt/src/sbt-test/project/sbt-file-projects/changes/Restricted.scala

@@ -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
-}

sbt/src/sbt-test/project/sbt-file-projects/other.sbt

@@ -1 +1 @@
-val c = Project("c", file("c"))
+val c = project

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