Skip to content

Commit 93a4bd0

Browse files
milessabinkailuowang
authored andcommitted
Switch from CrossVersion.full to CrossVersion.patch for TLS compatibi… (#1541)
* Switch from CrossVersion.full to CrossVersion.patch for TLS compatibility. * Use scalaOrganization.value instead of explicit org.scala-lang.
1 parent 7919a30 commit 93a4bd0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ lazy val commonSettings = Seq(
3838
libraryDependencies ++= Seq(
3939
"com.github.mpilquist" %%% "simulacrum" % "0.10.0",
4040
"org.typelevel" %%% "machinist" % "0.6.1",
41-
compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full),
41+
compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.patch),
4242
compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3")
4343
),
4444
fork in test := true,
@@ -445,15 +445,15 @@ lazy val crossVersionSharedSources: Seq[Setting[_]] =
445445
}
446446

447447
lazy val scalaMacroDependencies: Seq[Setting[_]] = Seq(
448-
libraryDependencies += "org.scala-lang" %%% "scala-reflect" % scalaVersion.value % "provided",
448+
libraryDependencies += scalaOrganization.value %%% "scala-reflect" % scalaVersion.value % "provided",
449449
libraryDependencies ++= {
450450
CrossVersion.partialVersion(scalaVersion.value) match {
451451
// if scala 2.11+ is used, quasiquotes are merged into scala-reflect
452452
case Some((2, scalaMajor)) if scalaMajor >= 11 => Seq()
453453
// in Scala 2.10, quasiquotes are provided by macro paradise
454454
case Some((2, 10)) =>
455455
Seq(
456-
compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full),
456+
compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.patch),
457457
"org.scalamacros" %% "quasiquotes" % "2.1.0" cross CrossVersion.binary
458458
)
459459
}

0 commit comments

Comments
 (0)