Update dependencies

cchantep · Dec 23, 2016 · ac5f3cd · ac5f3cd
1 parent 869e5a0
commit ac5f3cd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/project/Acolyte.scala b/project/Acolyte.scala
@@ -26,7 +26,8 @@ object Acolyte extends Build with Dependencies with Format
         "-source", javaVersion, "-target", javaVersion),
       scalaVersion in ThisBuild := "2.11.8",
       crossScalaVersions in ThisBuild := Seq(
-        "2.10.5", (scalaVersion in ThisBuild).value),
+        "2.10.5", (scalaVersion in ThisBuild).value
+      ),
       publishTo in ThisBuild := Some(Resolver.file("file", 
         new File(Path.userHome.absolutePath+"/.m2/repository"))),
       homepage := Some(url("http://acolyte.eu.org")),
@@ -64,7 +65,7 @@ object Acolyte extends Build with Dependencies with Format
 }
 
 trait Dependencies {
-  val specs2Test = "org.specs2" %% "specs2-core" % "3.8.3" % Test
+  val specs2Test = "org.specs2" %% "specs2-core" % "3.8.6" % Test
 }
 
 trait Format {

diff --git a/project/JdbcJava8.scala b/project/JdbcJava8.scala
@@ -10,7 +10,6 @@ trait JdbcJava8 { deps: Dependencies ⇒
       name := "jdbc-java8",
       //javacOptions in := Seq("-source", "1.8", "-target", "1.8"),
       javacOptions in Test ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
-      scalaVersion := "2.11.6",
       autoScalaLibrary := false,
       libraryDependencies += specs2Test,
       crossPaths := false,

diff --git a/project/PlayJdbc.scala b/project/PlayJdbc.scala
@@ -11,8 +11,6 @@ trait PlayJdbc { deps: Dependencies with Format ⇒
       settings(formatSettings).settings(
         name := "play-jdbc",
         javacOptions in Test ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
-        scalaVersion := "2.11.8",
-        crossScalaVersions := Seq(scalaVersion.value),
         scalacOptions in Compile ++= Seq("-unchecked", "-deprecation"),
         scalacOptions in Compile <++= (scalaVersion in ThisBuild).map { v =>
           if (v startsWith "2.11") Seq("-Ywarn-unused-import")
@@ -26,6 +24,7 @@ trait PlayJdbc { deps: Dependencies with Format ⇒
             val msv =
               if (sv startsWith "2.10") "2.10"
               else if (sv startsWith "2.11") "2.11"
+              else if (sv startsWith "2.12") "2.12"
               else sv
 
             val td = b / "target" / s"scala-$msv"

diff --git a/project/ReactiveMongo.scala b/project/ReactiveMongo.scala
@@ -12,6 +12,8 @@ trait ReactiveMongo { deps: Dependencies with Format ⇒
   lazy val generatedClassDirectory = settingKey[File](
     "Directory where classes get generated")
 
+  val reactiveMongoVer = "0.12.1"
+
   lazy val reactiveMongo =
     Project(id = "reactive-mongo", base = file("reactive-mongo")).
       settings(formatSettings).settings(
@@ -34,10 +36,10 @@ trait ReactiveMongo { deps: Dependencies with Format ⇒
           },
         resolvers ++= reactiveResolvers,
         libraryDependencies ++= Seq(
-          "org.reactivemongo" %% "reactivemongo" % "0.12.0" % "provided",
-          "com.jsuereth" %% "scala-arm" % "1.4",
+          "org.reactivemongo" %% "reactivemongo" % reactiveMongoVer % "provided",
+          "com.jsuereth" %% "scala-arm" % "2.0",
           "org.slf4j" % "slf4j-simple" % "1.7.13" % Test,
-          "com.chuusai" % "shapeless" % "2.0.0" % Test cross CrossVersion.
+          "com.chuusai" % "shapeless" % "2.3.2" % Test cross CrossVersion.
             binaryMapped {
               case "2.10" => scalaVersion.value
               case x => x
@@ -51,7 +53,7 @@ trait ReactiveMongo { deps: Dependencies with Format ⇒
         name := "play-reactive-mongo",
         javacOptions in Test ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
         scalaVersion := "2.11.8",
-        crossScalaVersions := Seq(scalaVersion.value),
+        //crossScalaVersions := Seq(scalaVersion.value),
         scalacOptions <++= (version in ThisBuild).
           zip(scalaVersion in ThisBuild).
           zip(baseDirectory in (scalacPlugin, Compile)).
@@ -67,7 +69,7 @@ trait ReactiveMongo { deps: Dependencies with Format ⇒
         resolvers ++= reactiveResolvers,
         libraryDependencies ++= Seq(
           "com.typesafe.play" %% "play" % "2.5.8" % "provided",
-          "org.reactivemongo" %% "play2-reactivemongo" % "0.12.0" % "provided",
+          "org.reactivemongo" %% "play2-reactivemongo" % reactiveMongoVer % "provided",
           specs2Test)
       ).dependsOn(scalacPlugin, reactiveMongo)
 

diff --git a/project/ScalacPlugin.scala b/project/ScalacPlugin.scala
@@ -23,6 +23,7 @@ trait ScalacPlugin { deps: Dependencies with Format ⇒
           val msv =
             if (sv startsWith "2.10") "2.10"
             else if (sv startsWith "2.11") "2.11"
+            else if (sv startsWith "2.12") "2.12"
             else sv
 
           val td = b / "target" / s"scala-$msv"