From be4f965cd4e20f1e3a78b9f4f87db04443a1bff9 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 28 Mar 2016 23:03:14 -0400 Subject: [PATCH] Port source-dependencies/macro-arg-dep-2-11 --- .../macro-arg-dep-2-11/build.sbt | 21 +++++++++++++ .../macro-arg-dep-2-11/project/build.scala | 31 ------------------- 2 files changed, 21 insertions(+), 31 deletions(-) create mode 100644 sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/build.sbt delete mode 100644 sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/project/build.scala diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/build.sbt new file mode 100644 index 000000000..ced00eb8d --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/build.sbt @@ -0,0 +1,21 @@ +val defaultSettings = Seq( + scalaVersion := "2.11.7", + libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ ) +) + +lazy val root = (project in file(".")). + aggregate(macroProvider, macroClient). + settings( + defaultSettings + ) + +lazy val macroProvider = (project in file("macro-provider")). + settings( + defaultSettings + ) + +lazy val macroClient = (project in file("macro-client")). + dependsOn(macroProvider). + settings( + defaultSettings + ) diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/project/build.scala deleted file mode 100644 index e2411e8ba..000000000 --- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/project/build.scala +++ /dev/null @@ -1,31 +0,0 @@ -import sbt._ -import Keys._ -import Import._ - -object build extends Build { - val defaultSettings = Seq( - libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ ), - incOptions := incOptions.value.withNameHashing(true), - scalaVersion := "2.11.6" - ) - - lazy val root = Project( - base = file("."), - id = "macro", - aggregate = Seq(macroProvider, macroClient), - settings = Defaults.defaultSettings ++ defaultSettings - ) - - lazy val macroProvider = Project( - base = file("macro-provider"), - id = "macro-provider", - settings = Defaults.defaultSettings ++ defaultSettings - ) - - lazy val macroClient = Project( - base = file("macro-client"), - id = "macro-client", - dependencies = Seq(macroProvider), - settings = Defaults.defaultSettings ++ defaultSettings - ) -}