From 93a4bd0ddffe6f79282f272ccd1623038417cf37 Mon Sep 17 00:00:00 2001 From: Miles Sabin Date: Wed, 22 Feb 2017 12:18:42 +0000 Subject: [PATCH] =?UTF-8?q?Switch=20from=20CrossVersion.full=20to=20CrossV?= =?UTF-8?q?ersion.patch=20for=20TLS=20compatibi=E2=80=A6=20(#1541)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Switch from CrossVersion.full to CrossVersion.patch for TLS compatibility. * Use scalaOrganization.value instead of explicit org.scala-lang. --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 6ef066ee63..6d09ffeb94 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, @@ -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 @@ -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 ) }