Update Scala 2.13 to 2.13.0-M5

estatico · Jan 27, 2019 · a354b5d · a354b5d
1 parent 890917b
commit a354b5d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ scala:
   - 2.10.7
   - 2.11.12
   - 2.12.8
-  - 2.13.0-M4
+  - 2.13.0-M5
 
 jdk:
   - oraclejdk8

diff --git 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-RC1"
     )
   )
 
@@ -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-SNAP6" % "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
@@ -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.ScalaCheckPropertyChecks
 
-class NewTypeCatsTest extends FlatSpec with Matchers with GeneratorDrivenPropertyChecks {
+class NewTypeCatsTest extends FlatSpec with Matchers with ScalaCheckPropertyChecks {
 
   import NewTypeCatsTest._
 

diff --git a/jvm/src/test/scala/io/estatico/newtype/macros/NewTypeMacrosJVMTest.scala b/jvm/src/test/scala/io/estatico/newtype/macros/NewTypeMacrosJVMTest.scala
@@ -2,13 +2,15 @@ package io.estatico.newtype.macros
 
 import org.scalatest.{FlatSpec, Matchers}
 
+import scala.collection.immutable.ArraySeq
+
 class NewTypeMacrosJVMTest extends FlatSpec with Matchers {
 
   behavior of "@newsubtype"
 
   it should "not box primitives" in {
     // Introspect the runtime type returned by the `apply` method
-    def ctorReturnType(o: Any) = List(o.getClass.getMethods: _*).find(_.getName == "apply").get.getReturnType
+    def ctorReturnType(o: Any) = ArraySeq.unsafeWrapArray(o.getClass.getMethods).find(_.getName == "apply").get.getReturnType
 
     // newtypes will box primitive values.
     @newtype case class BoxedInt(private val x: Int)

diff --git 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._