Merge pull request #48 from alexarchambault/topic/updates

Bump dependency versions
alexarchambault · Oct 24, 2016 · 566a8bf · 566a8bf
2 parents 6d5d99f + b3f20d3
commit 566a8bf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: scala
 scala:
+- 2.12.0-RC2
 - 2.11.8
 - 2.10.6
 jdk:

diff --git a/build.sbt b/build.sbt
@@ -14,7 +14,7 @@ lazy val core = crossProject
     name := coreName,
     moduleName := coreName,
     libraryDependencies ++= Seq(
-      "org.scalacheck" %%% "scalacheck" % "1.13.2",
+      "org.scalacheck" %%% "scalacheck" % "1.13.3",
       "com.chuusai" %%% "shapeless" % "2.3.2"
     )
   )
@@ -32,7 +32,7 @@ lazy val test = crossProject
   .settings(commonSettings: _*)
   .settings(noPublishSettings: _*)
   .settings(
-    libraryDependencies += "com.lihaoyi" %%% "utest" % "0.3.0" % "test",
+    libraryDependencies += "com.lihaoyi" %%% "utest" % "0.4.4" % "test",
     testFrameworks += new TestFramework("utest.runner.Framework")
   )
   .jsSettings(
@@ -56,7 +56,7 @@ lazy val compileSettings = Seq(
   ),
   libraryDependencies ++= {
     if (scalaVersion.value.startsWith("2.10."))
-      Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full))
+      Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full))
     else
       Seq()
   },

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.7")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M11")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.11")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14")
diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14")
diff --git a/test/shared/src/test/scala/org/scalacheck/ArbitraryTests.scala b/test/shared/src/test/scala/org/scalacheck/ArbitraryTests.scala
@@ -498,7 +498,7 @@ object ArbitraryTests extends TestSuite {
           false
         }
         catch {
-          case _: utest.AssertionError => true
+          case _: java.lang.AssertionError => true
         }
 
       assert(result)

diff --git a/test/shared/src/test/scala/org/scalacheck/CogenTests.scala b/test/shared/src/test/scala/org/scalacheck/CogenTests.scala
@@ -81,7 +81,7 @@ object CogenTests extends TestSuite {
           false
         }
         catch {
-          case _: utest.AssertionError => true
+          case _: java.lang.AssertionError => true
         }
 
       assert(result)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14")
-Original file line number
+Diff line change
@@ Expand Up / @@ -498,7 +498,7 @@ object ArbitraryTests extends TestSuite { @@
               false
             }
             catch {
-              case _: utest.AssertionError => true
+              case _: java.lang.AssertionError => true
             }
           assert(result)
@@ Expand Down @@