Skip to content

Commit

Permalink
Switch from CrossVersion.full to CrossVersion.patch for TLS compatibi… (
Browse files Browse the repository at this point in the history
#1541)

* Switch from CrossVersion.full to CrossVersion.patch for TLS compatibility.

* Use scalaOrganization.value instead of explicit org.scala-lang.
  • Loading branch information
milessabin authored and kailuowang committed Feb 22, 2017
1 parent 7919a30 commit 93a4bd0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -445,15 +445,15 @@ 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
case Some((2, scalaMajor)) if scalaMajor >= 11 => 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
)
}
Expand Down

0 comments on commit 93a4bd0

Please sign in to comment.