From 3b9ffafc909b562de44c9e8746bd8ffaccaedf1e Mon Sep 17 00:00:00 2001 From: Miles Sabin Date: Tue, 21 Feb 2017 11:43:17 +0000 Subject: [PATCH 1/2] Switch from CrossVersion.full to CrossVersion.patch for TLS compatibility. --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 6ef066ee63..ba1a243d25 100644 --- a/build.sbt +++ b/build.sbt @@ -38,7 +38,7 @@ lazy val commonSettings = Seq( libraryDependencies ++= Seq( "com.github.mpilquist" %%% "simulacrum" % "0.10.0", "org.typelevel" %%% "machinist" % "0.6.1", - compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full), + compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.patch), compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3") ), fork in test := true, @@ -453,7 +453,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" cross CrossVersion.full), + compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.patch), "org.scalamacros" %% "quasiquotes" % "2.1.0" cross CrossVersion.binary ) } From d1dbd2ce3243f76d357e09bc1ed8ff3f28528b59 Mon Sep 17 00:00:00 2001 From: Miles Sabin Date: Tue, 21 Feb 2017 12:16:50 +0000 Subject: [PATCH 2/2] Use scalaOrganization.value instead of explicit org.scala-lang. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ba1a243d25..6d09ffeb94 100644 --- a/build.sbt +++ b/build.sbt @@ -445,7 +445,7 @@ lazy val crossVersionSharedSources: Seq[Setting[_]] = } 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