From 85b9a78245d87a09a12d28776cf5bf9303bd1e59 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 29 Mar 2016 02:33:48 -0400 Subject: [PATCH] Port tests/serial --- sbt/src/sbt-test/tests/serial/build.sbt | 27 +++++++++++++++++++ .../sbt-test/tests/serial/project/Build.scala | 17 ------------ 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 sbt/src/sbt-test/tests/serial/build.sbt delete mode 100644 sbt/src/sbt-test/tests/serial/project/Build.scala diff --git a/sbt/src/sbt-test/tests/serial/build.sbt b/sbt/src/sbt-test/tests/serial/build.sbt new file mode 100644 index 000000000..394f0b27c --- /dev/null +++ b/sbt/src/sbt-test/tests/serial/build.sbt @@ -0,0 +1,27 @@ +val commonSettings = Seq( + libraryDependencies += "org.scalatest" %% "scalatest" % "1.9.1" % "test" +) + +lazy val root = (project in file(".")). + aggregate(sub1, sub2). + settings(inThisBuild(List( + organization := "com.softwaremill", + version := "0.0.1-SNAPSHOT", + scalaVersion := "2.10.0" + )), + commonSettings + ) + +lazy val rootRef = LocalProject("root") + +lazy val sub1 = project. + dependsOn(rootRef). + settings( + commonSettings + ) + +lazy val sub2 = project. + dependsOn(rootRef). + settings( + commonSettings + ) diff --git a/sbt/src/sbt-test/tests/serial/project/Build.scala b/sbt/src/sbt-test/tests/serial/project/Build.scala deleted file mode 100644 index 2375b6e09..000000000 --- a/sbt/src/sbt-test/tests/serial/project/Build.scala +++ /dev/null @@ -1,17 +0,0 @@ -import sbt._ -import Keys._ -import Import._ - -object SomeBuild extends Build { - val buildSettings = Seq( - organization := "com.softwaremill", - version := "0.0.1-SNAPSHOT", - scalaVersion := "2.10.0", - libraryDependencies += "org.scalatest" %% "scalatest" % "1.9.1" % "test" - ) - - lazy val parent: Project = Project("root", file("."), aggregate = Seq(sub1,sub2)).settings(buildSettings : _*) - - lazy val sub1: Project = Project("sub1", file("sub1")).settings(buildSettings : _*).dependsOn(parent) - lazy val sub2: Project = Project("sub2", file("sub2")).settings(buildSettings : _*).dependsOn(parent) -}