From fda31ec5e7f3575cb05f01ab2fec9ac113be5f7c Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 16 Jul 2017 20:05:19 -0400
Subject: [PATCH] Fixes dependency-management / extra

---
 .../extra/DefineColor.sbt                     |  4 +--
 .../extra/changes/UseColor.sbt                | 33 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt b/sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt
index 1959d0b68..934dc7bf7 100644
--- a/sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt
+++ b/sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt
@@ -1,7 +1,7 @@
 lazy val root = (project in file("."))
   .settings(
-    organization := "org.scala-sbt",
-    version := "1.0-SNAPSHOT",
+    organization := "com.example",
+    version := "1.0",
     name := "define-color",
     projectID := {
       val old = projectID.value
diff --git a/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt b/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt
index 370ca6317..fdb138835 100644
--- a/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt
+++ b/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt
@@ -1,17 +1,16 @@
-ivyPaths := IvyPaths(baseDirectory.value, Some(target.value / "ivy-cache"))
-
-publishMavenStyle := false
-
-resolvers := baseDirectory( base => 
-	Resolver.file("test-repo", base / "repo" / "test")(Resolver.defaultIvyPatterns) :: Nil
-).value
-
-libraryDependencies := (baseDirectory { base =>
-	val color = IO.read(base / "color")
-	val dep = "org.scala-sbt" %% "define-color" % "1.0" extra("e:color" -> color)
-	dep :: Nil
-}).value
-
-organization := "org.example"
-
-name := "use-color"
+lazy val root = (project in file("."))
+  .settings(
+    organization := "org.example",
+    name := "use-color",
+    ivyPaths := IvyPaths(baseDirectory.value, Some(target.value / "ivy-cache")),
+    publishMavenStyle := false,
+    resolvers := baseDirectory( base => 
+      Resolver.file("test-repo", base / "repo" / "test")(Resolver.defaultIvyPatterns) :: Nil
+    ).value,
+    libraryDependencies := {
+      val base = baseDirectory.value
+      val color = IO.read(base / "color")
+      val dep = "com.example" %% "define-color" % "1.0" extra("e:color" -> color)
+      dep :: Nil
+    }
+  )