switch from CrossVersion.full to CrossVersion.patch for TLS compatibi…

…lity
etorreborre · Mar 7, 2017 · b16c2af · b16c2af
1 parent a7d4c14
commit b16c2af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/project/build.scala b/project/build.scala
@@ -64,7 +64,7 @@ object build extends Build {
   /** MODULES (sorted in alphabetical order) */
   lazy val analysis = Project(id = "analysis", base = file("analysis"),
     settings = Seq(
-      libraryDependencies ++= depends.classycle ++ depends.compiler(scalaVersion.value)) ++
+      libraryDependencies ++= depends.classycle ++ depends.compiler(scalaOrganization.value, scalaVersion.value)) ++
     moduleSettings("analysis") ++
     Seq(name := "specs2-analysis")
   ).dependsOn(common % "test->test", core, matcher, scalacheck % "test")
@@ -74,7 +74,7 @@ object build extends Build {
       Seq(conflictWarning ~= { _.copy(failOnConflict = false) }, // lame
           libraryDependencies ++=
             depends.scalaz(scalazVersion.value) ++
-            depends.reflect(scalaVersion.value) ++
+            depends.reflect(scalaOrganization.value, scalaVersion.value) ++
             depends.paradise(scalaVersion.value) ++
             depends.scalaParser(scalaVersion.value) ++
             depends.scalaXML(scalaVersion.value) ++

diff --git a/project/depends.scala b/project/depends.scala
@@ -5,9 +5,9 @@ object depends {
 
   lazy val classycle = Seq("org.specs2" % "classycle" % "1.4.3")
 
-  def compiler(scalaVersion: String) = Seq("org.scala-lang" % "scala-compiler" % scalaVersion)
+  def compiler(scalaOrganization: String, scalaVersion: String) = Seq(scalaOrganization % "scala-compiler" % scalaVersion)
 
-  def reflect(scalaVersion: String) = Seq("org.scala-lang" % "scala-reflect" % scalaVersion)
+  def reflect(scalaOrganization: String, scalaVersion: String) = Seq(scalaOrganization % "scala-reflect" % scalaVersion)
 
   def scalaz(scalazVersion: String) =
     Seq("org.scalaz" %% "scalaz-core",
@@ -60,7 +60,7 @@ object depends {
       Nil
     else
       Seq(compilerPlugin(
-          "org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full),
+          "org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.patch),
           "org.scalamacros" %% "quasiquotes" % "2.1.0")
 
   lazy val resolvers =