From d71ac5c6c3a4a581d269e9671df9ec598ea9ebb6 Mon Sep 17 00:00:00 2001 From: Joe Greene Date: Fri, 3 Mar 2017 22:51:13 -0800 Subject: [PATCH 1/2] Change CrossVersion.full to CrossVersion.patch. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e744d9624..eb069fa8f 100644 --- a/build.sbt +++ b/build.sbt @@ -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") From fb345d5a851d614bfec52bff8d2ec8170f371e4e Mon Sep 17 00:00:00 2001 From: Joe Greene Date: Fri, 3 Mar 2017 22:51:59 -0800 Subject: [PATCH 2/2] Change org.scala-lang to scalaOrganization.value. --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index eb069fa8f..573b67a38 100644 --- a/build.sbt +++ b/build.sbt @@ -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, @@ -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