From 7db47d073bf3650ce330841d35022f162741abe9 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 29 Mar 2016 00:26:37 -0400 Subject: [PATCH] Port dependency-management/ivy-settings-multi-a --- .../ivy-settings-multi-a/build.sbt | 19 +++++++++++++++++++ .../ivy-settings-multi-a/project/P.scala | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/build.sbt delete mode 100644 sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/build.sbt new file mode 100644 index 000000000..28330f49c --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/build.sbt @@ -0,0 +1,19 @@ +lazy val commonSettings = Seq( + autoScalaLibrary := false, + unmanagedJars in Compile <++= scalaInstance map (_.allJars.toSeq) +) + +lazy val dep = project. + settings( + commonSettings, + organization := "org.example", + version := "1.0" + ) + +lazy val use = project. + dependsOn(dep). + settings( + commonSettings, + libraryDependencies += "junit" % "junit" % "4.5", + externalIvySettings() + ) diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala deleted file mode 100644 index c4dfc7bec..000000000 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala +++ /dev/null @@ -1,19 +0,0 @@ -import sbt._ -import Keys._ -import Import._ - -object B extends Build -{ - lazy val dep = Project("dep", file("dep")) settings( baseSettings : _*) settings( - organization := "org.example", - version := "1.0" - ) - lazy val use = Project("use", file("use")) dependsOn(dep) settings(baseSettings : _*) settings( - libraryDependencies += "junit" % "junit" % "4.5", - externalIvySettings() - ) - lazy val baseSettings = Seq( - autoScalaLibrary := false, - unmanagedJars in Compile <++= scalaInstance map (_.allJars.toSeq) - ) -}