Fix dependencies for 2.12.

Conflicts: proptest/build.sbt scalapb-runtime/build.sbt
scalapb · Sep 5, 2015 · f42782c · f42782c
1 parent 0f1abcb
commit f42782c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 scala:
 - 2.10.4
 - 2.11.6
-- 2.12.0-M2
+- 2.12.0-M1
 
 # These directories are cached to S3 at the end of the build
 cache:

diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ sonatypeSettings
 
 scalaVersion in ThisBuild := "2.11.6"
 
-crossScalaVersions in ThisBuild := Seq("2.10.5", "2.11.6", "2.12.0-M2")
+crossScalaVersions in ThisBuild := Seq("2.10.5", "2.11.6", "2.12.0-M1")
 
 organization in ThisBuild := "com.trueaccord.scalapb"
 

diff --git a/proptest/build.sbt b/proptest/build.sbt
@@ -7,7 +7,7 @@ libraryDependencies ++= Seq(
   "com.google.protobuf" % "protobuf-java" % "3.0.0-alpha-3",
   "com.trueaccord.lenses" %% "lenses" % "0.4",
   "org.scalacheck" %% "scalacheck" % "1.12.4" % "test",
-  "org.scalatest" %% "scalatest" % "2.2.4" % "test"
+  "org.scalatest" %% "scalatest" % (if (scalaVersion.value.startsWith("2.12")) "2.2.5-M1" else "2.2.5") % "test"
 )
 
 libraryDependencies <+= (scalaVersion) { v => "org.scala-lang" % "scala-compiler" % v }

diff --git a/scalapb-runtime/build.sbt b/scalapb-runtime/build.sbt
@@ -4,7 +4,7 @@ name := "scalapb-runtime"
 
 libraryDependencies ++= Seq(
   "com.google.protobuf" % "protobuf-java" % "3.0.0-alpha-3",
-  "com.trueaccord.lenses" %% "lenses" % "0.4",
+  "com.trueaccord.lenses" %% "lenses" % "0.4.1",
   "org.scalacheck" %% "scalacheck" % "1.12.4" % "test",
   "org.scalatest" %% "scalatest" % "2.2.4" % "test"
 )