From 30f5664a34cd59981d6a2b56a532b5f0373f39c8 Mon Sep 17 00:00:00 2001 From: Joe Greene Date: Wed, 22 Feb 2017 01:06:52 -0800 Subject: [PATCH 1/2] Change CrossVersion.full to CrossVersion.patch. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4ea2c76f..74327a34 100644 --- a/build.sbt +++ b/build.sbt @@ -249,7 +249,7 @@ lazy val scalaMacroDependencies: Seq[Setting[_]] = Seq( // in Scala 2.10, quasiquotes are provided by macro paradise case Some((2, 10)) => Seq( - compilerPlugin("org.scalamacros" % "paradise" % "2.1.0-M5" cross CrossVersion.full), + compilerPlugin("org.scalamacros" % "paradise" % "2.1.0-M5" cross CrossVersion.patch), "org.scalamacros" %% "quasiquotes" % "2.1.0-M5" cross CrossVersion.binary ) } From 43f1e0bae1a2fbadda03d72f9457635e308a519f Mon Sep 17 00:00:00 2001 From: Joe Greene Date: Wed, 22 Feb 2017 01:08:16 -0800 Subject: [PATCH 2/2] Change org.scala-lang to use scalaOrganization.value instead. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 74327a34..3e01141b 100644 --- a/build.sbt +++ b/build.sbt @@ -241,7 +241,7 @@ def crossVersionSharedSources() = } lazy val scalaMacroDependencies: Seq[Setting[_]] = Seq( - libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided", + libraryDependencies += scalaOrganization.value % "scala-reflect" % scalaVersion.value % "provided", libraryDependencies ++= { CrossVersion.partialVersion(scalaVersion.value) match { // if scala 2.11+ is used, quasiquotes are merged into scala-reflect