From c635049f22673d9066533afe32d0dc19aafaaae3 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 29 Mar 2016 01:29:48 -0400
Subject: [PATCH] Port project/auto-settings

---
 .../sbt-test/project/auto-settings/build.sbt  | 37 +++++++++++++++++++
 .../project/auto-settings/{test => disabled}  |  0
 .../project/auto-settings/project/P.scala     | 32 ----------------
 3 files changed, 37 insertions(+), 32 deletions(-)
 create mode 100644 sbt/src/sbt-test/project/auto-settings/build.sbt
 rename sbt/src/sbt-test/project/auto-settings/{test => disabled} (100%)
 delete mode 100644 sbt/src/sbt-test/project/auto-settings/project/P.scala

diff --git a/sbt/src/sbt-test/project/auto-settings/build.sbt b/sbt/src/sbt-test/project/auto-settings/build.sbt
new file mode 100644
index 000000000..7d4a01490
--- /dev/null
+++ b/sbt/src/sbt-test/project/auto-settings/build.sbt
@@ -0,0 +1,37 @@
+import AddSettings._
+
+// version should be from explicit/a.txt
+lazy val root = proj("root", "1.4").settingSets(
+  buildScalaFiles,
+  userSettings,
+  sbtFiles(file("explicit/a.txt"))
+)
+
+// version should be from global/user.sbt
+lazy val a = proj("a", "1.1").
+  settingSets( buildScalaFiles, userSettings )
+
+// version should be the default 0.1-SNAPSHOT
+lazy val b = proj("b", "0.1-SNAPSHOT").
+  settingSets(buildScalaFiles)
+
+// version should be from the explicit settings call
+lazy val c = proj("c", "0.9").settings(version := "0.9").
+  settingSets(buildScalaFiles)
+
+// version should be from d/build.sbt
+lazy val d = proj("d", "1.3").settings(version := "0.9").
+  settingSets( buildScalaFiles, defaultSbtFiles )
+
+// version should be from global/user.sbt
+lazy val e = proj("e", "1.1").settings(version := "0.9").
+  settingSets( buildScalaFiles, defaultSbtFiles, sbtFiles(file("../explicit/a.txt")), userSettings )
+
+def proj(id: String, expectedVersion: String): Project =
+  Project(id, if(id == "root") file(".") else file(id)).
+  settings(
+    TaskKey[Unit]("check") := {
+      assert(version.value == expectedVersion,
+        "Expected version '" + expectedVersion + "', got: " + version.value + " in " + id)
+    }
+  )
diff --git a/sbt/src/sbt-test/project/auto-settings/test b/sbt/src/sbt-test/project/auto-settings/disabled
similarity index 100%
rename from sbt/src/sbt-test/project/auto-settings/test
rename to sbt/src/sbt-test/project/auto-settings/disabled
diff --git a/sbt/src/sbt-test/project/auto-settings/project/P.scala b/sbt/src/sbt-test/project/auto-settings/project/P.scala
deleted file mode 100644
index 7eff57a14..000000000
--- a/sbt/src/sbt-test/project/auto-settings/project/P.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-	import sbt._
-	import Keys._
-
-	import AddSettings._
-  import Import._
-
-object B extends Build
-{
-	// version should be from explicit/a.txt
-	lazy val root = project("root", "1.4") settingSets( buildScalaFiles, userSettings, sbtFiles(file("explicit/a.txt")) )
-
-	// version should be from global/user.sbt
-	lazy val a = project("a", "1.1") settingSets( buildScalaFiles, userSettings )
-
-	// version should be the default 0.1-SNAPSHOT
-	lazy val b = project("b", "0.1-SNAPSHOT") settingSets(buildScalaFiles)
-
-	// version should be from the explicit settings call
-	lazy val c = project("c", "0.9") settings(version := "0.9") settingSets(buildScalaFiles)
-
-	// version should be from d/build.sbt
-	lazy val d = project("d", "1.3") settings(version := "0.9") settingSets( buildScalaFiles, defaultSbtFiles )
-
-	// version should be from global/user.sbt
-	lazy val e = project("e", "1.1") settings(version := "0.9") settingSets( buildScalaFiles, defaultSbtFiles, sbtFiles(file("../explicit/a.txt")), userSettings )
-
-	def project(id: String, expectedVersion: String): Project = Project(id, if(id == "root") file(".") else file(id)) settings(
-		TaskKey[Unit]("check") <<= version map { v =>
-			assert(v == expectedVersion, "Expected version '" + expectedVersion + "', got: " + v)
-		}
-	)
-}