Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change CrossVersion.full to use CrossVersion.patch for Typelevel Scala compatibility. #261

Merged
merged 2 commits into from
Mar 5, 2017
Merged

Change CrossVersion.full to use CrossVersion.patch for Typelevel Scala compatibility. #261

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d71ac5c
Change CrossVersion.full to CrossVersion.patch.
ClydeMachine Mar 4, 2017
fb345d5
Change org.scala-lang to scalaOrganization.value.
ClydeMachine Mar 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.sbt
View file
Open in desktop
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