From 1471081c0d96912ed1f287507ae1d831c0132294 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 27 Aug 2011 23:13:10 -0400
Subject: [PATCH] test to ensure correctness of local resolver+useOrigin in
 ivysettings.xml

---
 main/Append.scala                             |  4 +--
 .../ivy-settings-c/dep/D.scala                |  3 ++
 .../ivy-settings-c/project/P.scala            | 31 +++++++++++++++++++
 .../dependency-management/ivy-settings-c/test |  3 ++
 .../ivy-settings-c/use/U.scala                |  3 ++
 .../ivy-settings-c/use/ivysettings.xml        | 10 ++++++
 6 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 sbt/src/sbt-test/dependency-management/ivy-settings-c/dep/D.scala
 create mode 100644 sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala
 create mode 100644 sbt/src/sbt-test/dependency-management/ivy-settings-c/test
 create mode 100644 sbt/src/sbt-test/dependency-management/ivy-settings-c/use/U.scala
 create mode 100644 sbt/src/sbt-test/dependency-management/ivy-settings-c/use/ivysettings.xml

diff --git a/main/Append.scala b/main/Append.scala
index c9a0e7e61..8278b544a 100644
--- a/main/Append.scala
+++ b/main/Append.scala
@@ -12,11 +12,11 @@ object Append
 		def appendValue(a: A, b: B): A
 	}
 	@implicitNotFound(msg = "No implicit for Append.Values[${A}, ${B}] found,\n  so ${B} cannot be appended to ${A}")
-	sealed trait Values[A,B]
+	sealed trait Values[A,-B]
 	{
 		def appendValues(a: A, b: B): A
 	}
-	sealed trait Sequence[A,B,T] extends Value[A,T] with Values[A,B]
+	sealed trait Sequence[A,-B,T] extends Value[A,T] with Values[A,B]
 
 	implicit def appendSeq[T, V <: T]: Sequence[Seq[T], Seq[V], V] = new Sequence[Seq[T], Seq[V], V] {
 		def appendValues(a: Seq[T], b: Seq[V]): Seq[T] = a ++ b
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-c/dep/D.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-c/dep/D.scala
new file mode 100644
index 000000000..9c83ff32a
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-c/dep/D.scala
@@ -0,0 +1,3 @@
+object D {
+	val x = 3
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala
new file mode 100644
index 000000000..5f7e87f76
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala
@@ -0,0 +1,31 @@
+import sbt._
+import Keys._
+
+object B extends Build
+{
+	lazy val dep = Project("dep", file("dep")) settings( baseSettings : _*) settings(
+		organization := "org.example",
+		version := "1.0",
+		publishTo <<= baseDirectory in ThisBuild apply { base =>
+			Some(Resolver.file("file", base / "repo")(Resolver.ivyStylePatterns))
+		}
+	)
+	lazy val use = Project("use", file("use")) settings(baseSettings : _*) settings(
+		libraryDependencies += "org.example" %% "dep" % "1.0",
+		externalIvySettings(),
+		publishTo <<= baseDirectory { base =>
+			Some(Resolver.file("file", base / "repo")(Resolver.ivyStylePatterns))
+		},
+		TaskKey[Unit]("check") <<= baseDirectory map {base =>
+			val inCache = ( (base / "target" / "use-cache") ** "*.jar").get
+			assert(inCache.isEmpty, "Cache contained jars: " + inCache)
+		}
+	)
+	lazy val baseSettings = Seq(
+		autoScalaLibrary := false,
+		unmanagedJars in Compile <++= scalaInstance map (_.jars),
+		publishArtifact in packageSrc := false,
+		publishArtifact in packageDoc := false,
+		publishMavenStyle := false
+	)
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-c/test b/sbt/src/sbt-test/dependency-management/ivy-settings-c/test
new file mode 100644
index 000000000..0eedeef8d
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-c/test
@@ -0,0 +1,3 @@
+> dep/publish
+> use/update
+> use/check
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-c/use/U.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-c/use/U.scala
new file mode 100644
index 000000000..70448e3bc
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-c/use/U.scala
@@ -0,0 +1,3 @@
+object U {
+	val x = D.x
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-c/use/ivysettings.xml b/sbt/src/sbt-test/dependency-management/ivy-settings-c/use/ivysettings.xml
new file mode 100644
index 000000000..5116f99f8
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-c/use/ivysettings.xml
@@ -0,0 +1,10 @@
+<ivysettings>
+	<caches defaultCacheDir="${ivy.settings.dir}/target/use-cache" useOrigin="true"/>
+	<settings defaultResolver="file"/>
+	<resolvers>
+		<filesystem name="file" checkconsistency="false" descriptor="required" local="true">
+			<ivy pattern="${ivy.settings.dir}/../repo/[organisation]/[module]/[revision]/ivys/ivy.xml"/>
+			<artifact pattern="${ivy.settings.dir}/../repo/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"/>
+	   </filesystem>
+	</resolvers>
+</ivysettings>
\ No newline at end of file