From 5158728b8a67a980260d90422b82bb15fc4dd559 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 28 Mar 2016 22:55:33 -0400 Subject: [PATCH] Port source-dependencies/macro-annotation --- .../macro-annotation/build.sbt | 33 +++++++++++++ .../macro-annotation/project/Build.scala | 46 ------------------- 2 files changed, 33 insertions(+), 46 deletions(-) create mode 100644 sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt delete mode 100644 sbt/src/sbt-test/source-dependencies/macro-annotation/project/Build.scala diff --git a/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt new file mode 100644 index 000000000..08839d26b --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt @@ -0,0 +1,33 @@ +val paradiseVersion = "2.0.1" +val commonSettings = Seq( + version := "1.0.0", + scalacOptions ++= Seq(""), + scalaVersion := "2.11.4", + resolvers += Resolver.sonatypeRepo("snapshots"), + resolvers += Resolver.sonatypeRepo("releases"), + addCompilerPlugin("org.scalamacros" % "paradise" % paradiseVersion cross CrossVersion.full), + incOptions := incOptions.value.withNameHashing(true) +) + +lazy val root = (project in file(".")). + aggregate(macros, core). + settings( + commonSettings, + run <<= run in Compile in core + ) + +lazy val macros = (project in file("macros")). + settings( + commonSettings, + libraryDependencies <+= (scalaVersion)("org.scala-lang" % "scala-reflect" % _), + libraryDependencies ++= ( + if (scalaVersion.value.startsWith("2.10")) List("org.scalamacros" %% "quasiquotes" % paradiseVersion) + else Nil + ) + ) + +lazy val core = (project in file("core")). + dependsOn(macros). + settings( + commonSettings + ) diff --git a/sbt/src/sbt-test/source-dependencies/macro-annotation/project/Build.scala b/sbt/src/sbt-test/source-dependencies/macro-annotation/project/Build.scala deleted file mode 100644 index deadc9798..000000000 --- a/sbt/src/sbt-test/source-dependencies/macro-annotation/project/Build.scala +++ /dev/null @@ -1,46 +0,0 @@ -import sbt._ -import Import._ -import Keys._ - -object BuildSettings { - val paradiseVersion = "2.0.1" - val buildSettings = Defaults.defaultSettings ++ Seq( - version := "1.0.0", - scalacOptions ++= Seq(""), - scalaVersion := "2.11.4", - resolvers += Resolver.sonatypeRepo("snapshots"), - resolvers += Resolver.sonatypeRepo("releases"), - addCompilerPlugin("org.scalamacros" % "paradise" % paradiseVersion cross CrossVersion.full), - incOptions := incOptions.value.withNameHashing(true) - ) -} - -object MyBuild extends Build { - import BuildSettings._ - - lazy val root: Project = Project( - "root", - file("."), - settings = buildSettings ++ Seq( - run <<= run in Compile in core - ) - ) aggregate(macros, core) - - lazy val macros: Project = Project( - "macros", - file("macros"), - settings = buildSettings ++ Seq( - libraryDependencies <+= (scalaVersion)("org.scala-lang" % "scala-reflect" % _), - libraryDependencies ++= ( - if (scalaVersion.value.startsWith("2.10")) List("org.scalamacros" %% "quasiquotes" % paradiseVersion) - else Nil - ) - ) - ) - - lazy val core: Project = Project( - "core", - file("core"), - settings = buildSettings - ) dependsOn(macros) -}