Skip to content

Commit

Permalink
Merge pull request #261 from ClydeMachine/tls-compatibility
Browse files Browse the repository at this point in the history
Change CrossVersion.full to use CrossVersion.patch for Typelevel Scala compatibility.
  • Loading branch information
fthomas authored Mar 5, 2017
2 parents 38a67bc + fb345d5 commit b5619df
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ val pureconfigVersion = "0.5.1"

// needed for tests with Scala 2.10
val macroParadise = compilerPlugin(
"org.scalamacros" % "paradise" % macroParadiseVersion % Test cross CrossVersion.full)
"org.scalamacros" % "paradise" % macroParadiseVersion % Test cross CrossVersion.patch)

val allSubprojects =
Seq("core", "eval", "scalacheck", "scalaz", "scodec", "pureconfig")
Expand Down Expand Up @@ -62,8 +62,8 @@ lazy val core = crossProject
.settings(siteSettings: _*)
.settings(
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
scalaOrganization.value % "scala-reflect" % scalaVersion.value,
scalaOrganization.value % "scala-compiler" % scalaVersion.value % Provided,
"org.typelevel" %%% "macro-compat" % macroCompatVersion,
"com.chuusai" %%% "shapeless" % shapelessVersion,
"org.scalacheck" %%% "scalacheck" % scalaCheckVersion % Test,
Expand Down Expand Up @@ -101,7 +101,7 @@ lazy val eval = crossProject
.configureCross(moduleCrossConfig("eval"))
.dependsOn(core % "compile->compile;test->test")
.settings(
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
libraryDependencies += scalaOrganization.value % "scala-compiler" % scalaVersion.value
)

lazy val evalJVM = eval.jvm
Expand Down

0 comments on commit b5619df

Please sign in to comment.