From f976c4b04f293af43f9d892a93179828b0c64b67 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 28 Mar 2016 16:48:30 -0400
Subject: [PATCH] Remove project/external-conflict test

---
 .../project/external-conflict/A.scala         |  3 ---
 .../project/external-conflict/build.sbt       | 11 --------
 .../project/external-conflict/changes/A.scala |  3 ---
 .../project/external-conflict/changes/B.scala | 11 --------
 .../external-conflict/changes/Build.scala     | 26 ------------------
 .../project/external-conflict/changes/ext.sbt |  9 -------
 .../sbt-test/project/external-conflict/test   | 27 -------------------
 7 files changed, 90 deletions(-)
 delete mode 100644 sbt/src/sbt-test/project/external-conflict/A.scala
 delete mode 100644 sbt/src/sbt-test/project/external-conflict/build.sbt
 delete mode 100644 sbt/src/sbt-test/project/external-conflict/changes/A.scala
 delete mode 100644 sbt/src/sbt-test/project/external-conflict/changes/B.scala
 delete mode 100644 sbt/src/sbt-test/project/external-conflict/changes/Build.scala
 delete mode 100644 sbt/src/sbt-test/project/external-conflict/changes/ext.sbt
 delete mode 100644 sbt/src/sbt-test/project/external-conflict/test

diff --git a/sbt/src/sbt-test/project/external-conflict/A.scala b/sbt/src/sbt-test/project/external-conflict/A.scala
deleted file mode 100644
index 2a499fa7b..000000000
--- a/sbt/src/sbt-test/project/external-conflict/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object A {
-  val x = 3
-}
diff --git a/sbt/src/sbt-test/project/external-conflict/build.sbt b/sbt/src/sbt-test/project/external-conflict/build.sbt
deleted file mode 100644
index cb5b64a94..000000000
--- a/sbt/src/sbt-test/project/external-conflict/build.sbt
+++ /dev/null
@@ -1,11 +0,0 @@
-organization := "org.example"
-
-name := "app"
-
-version := "0.1.17"
-
-publishTo <<= baseDirectory(base => Some(Resolver.file("sample", base / "repo")))
-
-resolvers <++= publishTo(_.toList)
-
-ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache")))
\ No newline at end of file
diff --git a/sbt/src/sbt-test/project/external-conflict/changes/A.scala b/sbt/src/sbt-test/project/external-conflict/changes/A.scala
deleted file mode 100644
index c3fa8f914..000000000
--- a/sbt/src/sbt-test/project/external-conflict/changes/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object A {
- val x = 5
-}
diff --git a/sbt/src/sbt-test/project/external-conflict/changes/B.scala b/sbt/src/sbt-test/project/external-conflict/changes/B.scala
deleted file mode 100644
index 94ed22c90..000000000
--- a/sbt/src/sbt-test/project/external-conflict/changes/B.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-object B
-{
-	def main(args: Array[String])
-	{
-		val expected = args(0).toInt
-		val actual = A.x
-		println("Expected: " + expected)
-		println("Actual: " + actual)
-		assert(expected == actual, "Expected " + expected + ", got: " + actual)
-	}
-}
diff --git a/sbt/src/sbt-test/project/external-conflict/changes/Build.scala b/sbt/src/sbt-test/project/external-conflict/changes/Build.scala
deleted file mode 100644
index 576964d51..000000000
--- a/sbt/src/sbt-test/project/external-conflict/changes/Build.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-import sbt._
-import Import._
-import Keys._
-
-object B extends Build
-{
-	override def projectDefinitions(f: File) = Seq( makeProject(f) )
-
-	def makeProject(f: File) =
-	{
-		val addBin = if(isBinary(f)) binaryDep(baseProject) else baseProject
-		if(isSource(f)) sourceDep(addBin) else addBin
-	}
-
-	def isBinary(f: File) = f / "binary" exists;
-	def isSource(f: File) = f / "source" exists;
-
-	def baseProject = Project("root", file(".")) settings(
-		ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache")))
-	)
-	def sourceDep(p: Project) = p dependsOn( file("ext") )
-	def binaryDep(p: Project) = p settings(
-		libraryDependencies += "org.example" %% "app" % "0.1.17",
-		resolvers <+= baseDirectory(base => "sample" at (base / "repo").toURI.toString)
-	)
-}
diff --git a/sbt/src/sbt-test/project/external-conflict/changes/ext.sbt b/sbt/src/sbt-test/project/external-conflict/changes/ext.sbt
deleted file mode 100644
index 1e1823121..000000000
--- a/sbt/src/sbt-test/project/external-conflict/changes/ext.sbt
+++ /dev/null
@@ -1,9 +0,0 @@
-organization := "org.example"
-
-name := "app"
-
-version <<= baseDirectory { base =>
-	if(base / "older" exists) "0.1.16" else "0.1.18"
-}
-
-ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "../ivy-cache")))
\ No newline at end of file
diff --git a/sbt/src/sbt-test/project/external-conflict/test b/sbt/src/sbt-test/project/external-conflict/test
deleted file mode 100644
index f288246dd..000000000
--- a/sbt/src/sbt-test/project/external-conflict/test
+++ /dev/null
@@ -1,27 +0,0 @@
-> publish
-$ delete A.scala build.sbt
-
-$ mkdir ext
-$ copy-file changes/A.scala ext/A.scala
-$ copy-file changes/B.scala B.scala
-$ copy-file changes/Build.scala project/Build.scala
-$ copy-file changes/ext.sbt ext/build.sbt
-
--> compile
-
-$ touch binary
-> reload
-> run 3
-
-$ delete binary
-$ touch source
-> reload
-> run 5
-
-$ touch binary source
-> reload
-> run 5
-
-$ touch ext/older
-> reload
-> run 5
\ No newline at end of file