From 734f5f503a13365c71dee2424002e56a07be2449 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 20 Oct 2016 10:30:39 +0200 Subject: [PATCH 1/2] Bump dependency versions --- build.sbt | 6 +++--- project/plugins.sbt | 6 +++--- project/project/plugins.sbt | 1 + .../src/test/scala/org/scalacheck/ArbitraryTests.scala | 2 +- test/shared/src/test/scala/org/scalacheck/CogenTests.scala | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 project/project/plugins.sbt diff --git a/build.sbt b/build.sbt index 6c9ee64..3f918a1 100644 --- 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 index b487f3c..93ba799 100644 --- 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 new file mode 100644 index 0000000..2617da2 --- /dev/null +++ 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 index 2d27fc4..854e1f6 100644 --- 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 index 2fe8de1..ac90d4a 100644 --- 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) From b3f20d32e2c73be3e438af6162b8d40025114158 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 24 Oct 2016 12:26:03 +0200 Subject: [PATCH 2/2] Cross-compile for 2.12.0-RC2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b7f5f2f..2cd8521 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: scala scala: +- 2.12.0-RC2 - 2.11.8 - 2.10.6 jdk: