diff --git a/.travis.yml b/.travis.yml index 92ffa3e..0a2a5b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,9 @@ language: scala scala: - - 2.10.7 - 2.11.12 - 2.12.5 - - 2.13.0-M4 + - 2.13.0-M5 jdk: - oraclejdk8 diff --git a/build.sbt b/build.sbt index 0c12e90..15938bf 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ lazy val catsTests = crossProject(JSPlatform, JVMPlatform).in(file("cats-tests") name := "newtype-cats-tests", description := "Test suite for newtype + cats interop", libraryDependencies ++= Seq( - "org.typelevel" %%% "cats-core" % "1.2.0" + "org.typelevel" %%% "cats-core" % "1.6.0" ) ) @@ -128,7 +128,7 @@ lazy val defaultLibraryDependencies = libraryDependencies ++= Seq( scalaOrganization.value % "scala-reflect" % scalaVersion.value % Provided, scalaOrganization.value % "scala-compiler" % scalaVersion.value % Provided, "org.scalacheck" %%% "scalacheck" % "1.14.0" % "test", - "org.scalatest" %%% "scalatest" % "3.0.6-SNAP1" % "test" + "org.scalatest" %%% "scalatest" % "3.0.6" % "test" ) def scalaPartV = Def.setting(CrossVersion.partialVersion(scalaVersion.value)) diff --git a/cats-tests/shared/src/test/scala/io/estatico/newtype/NewTypeCatsTest.scala b/cats-tests/shared/src/test/scala/io/estatico/newtype/NewTypeCatsTest.scala index 3f5fd8c..02c66b4 100644 --- a/cats-tests/shared/src/test/scala/io/estatico/newtype/NewTypeCatsTest.scala +++ b/cats-tests/shared/src/test/scala/io/estatico/newtype/NewTypeCatsTest.scala @@ -5,9 +5,9 @@ import cats.implicits._ import io.estatico.newtype.ops._ import io.estatico.newtype.macros.{newsubtype, newtype} import org.scalatest.{FlatSpec, Matchers} -import org.scalatest.prop.GeneratorDrivenPropertyChecks +import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks -class NewTypeCatsTest extends FlatSpec with Matchers with GeneratorDrivenPropertyChecks { +class NewTypeCatsTest extends FlatSpec with Matchers with ScalaCheckDrivenPropertyChecks { import NewTypeCatsTest._ diff --git a/project/plugins.sbt b/project/plugins.sbt index 0e5bd0f..92266c3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.4") addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.1.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.23") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") diff --git a/shared/src/test/scala/io/estatico/newtype/NewTypeTest.scala b/shared/src/test/scala/io/estatico/newtype/NewTypeTest.scala index bd006e4..a02a01d 100644 --- a/shared/src/test/scala/io/estatico/newtype/NewTypeTest.scala +++ b/shared/src/test/scala/io/estatico/newtype/NewTypeTest.scala @@ -1,10 +1,10 @@ package io.estatico.newtype import org.scalacheck.Arbitrary -import org.scalatest.prop.PropertyChecks +import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks import org.scalatest.{FlatSpec, Matchers} -class NewTypeTest extends FlatSpec with PropertyChecks with Matchers { +class NewTypeTest extends FlatSpec with ScalaCheckPropertyChecks with Matchers { import NewTypeTest._