Upgrade to Scala 2.13.0-RC2

.travis.yml

@@ -48,7 +48,7 @@ matrix:
       script:
         - ./sbt ++$SCALA_VERSION "; coverage; ${PROJECT}/test; coverageReport"
         - "./sbt coverageAggregate && bash <(curl -s https://codecov.io/bash)"
-    - env: SCALA_VERSION=2.13.0-RC1 PROJECT=projectJVM2_13
+    - env: SCALA_VERSION=2.13.0-RC2 PROJECT=projectJVM2_13
       jdk: openjdk11
       services: postgresql
       before_script: psql -c 'create database travis_ci_test;' -U postgres

airframe-canvas/src/test/scala/wvlet/airframe/canvas/CanvasTest.scala

@@ -15,14 +15,14 @@ package wvlet.airframe.canvas
 import java.nio.ByteBuffer
 
 import org.scalacheck.Gen
-import org.scalatest.prop.PropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 import wvlet.airframe.AirframeSpec
 import wvlet.airframe.control.Control
 
 /**
   *
   */
-class CanvasTest extends AirframeSpec with PropertyChecks {
+class CanvasTest extends AirframeSpec with ScalaCheckPropertyChecks {
 
   def check[A](v: A, canvas: Canvas, writer: Canvas => Unit, reader: Canvas => A): Unit = {
     writer(canvas)

airframe-codec/.jvm/src/test/scala/wvlet/airframe/codec/PrimitiveCodecTest.scala

@@ -16,14 +16,14 @@ package wvlet.airframe.codec
 import java.math.BigInteger
 
 import org.scalacheck.Arbitrary
-import org.scalatest.prop.GeneratorDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import wvlet.airframe.msgpack.spi.MessagePack
 import wvlet.airframe.surface.{ArraySurface, GenericSurface, Surface}
 
 /**
   *
   */
-class PrimitiveCodecTest extends CodecSpec with GeneratorDrivenPropertyChecks {
+class PrimitiveCodecTest extends CodecSpec with ScalaCheckDrivenPropertyChecks {
   import scala.collection.JavaConverters._
 
   def roundTripTest[T](surface: Surface, dataType: DataType)(implicit impArb: Arbitrary[T]): Unit = {

airframe-msgpack/src/test/scala/wvlet/airframe/msgpack/spi/RoundTripTest.scala

@@ -19,14 +19,14 @@ import java.time.Instant
 
 import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.Gen
-import org.scalatest.prop.PropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 import wvlet.airframe.AirframeSpec
 import wvlet.airframe.msgpack.io.ByteArrayBuffer
 
 /**
   *
   */
-class RoundTripTest extends AirframeSpec with PropertyChecks {
+class RoundTripTest extends AirframeSpec with ScalaCheckPropertyChecks {
 
   val buf = ByteArrayBuffer.newBuffer(1024)
 

airframe-msgpack/src/test/scala/wvlet/airframe/msgpack/spi/ValueTest.scala

@@ -15,15 +15,15 @@ package wvlet.airframe.msgpack.spi
 
 import java.math.BigInteger
 
-import org.scalatest.prop.PropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 import wvlet.airframe.AirframeSpec
 import wvlet.airframe.msgpack.io.ByteArrayBuffer
 import wvlet.airframe.msgpack.spi.Value._
 
 /**
   *
   */
-class ValueTest extends AirframeSpec with PropertyChecks {
+class ValueTest extends AirframeSpec with ScalaCheckPropertyChecks {
 
   private def rankOf(mf: MessageFormat): Int = {
     val order =
@@ -169,9 +169,9 @@ class ValueTest extends AirframeSpec with PropertyChecks {
     }
 
     "check appropriate range for integers" in {
+      import java.lang.{Byte, Short}
+
       import ValueFactory._
-      import java.lang.Byte
-      import java.lang.Short
 
       newInteger(Byte.MAX_VALUE).asByte shouldBe Byte.MAX_VALUE
       newInteger(Byte.MIN_VALUE).asByte shouldBe Byte.MIN_VALUE

build.sbt

@@ -2,12 +2,12 @@ import sbtcrossproject.{CrossType, crossProject}
 
 val SCALA_2_11 = "2.11.12"
 val SCALA_2_12 = "2.12.8"
-val SCALA_2_13 = "2.13.0-RC1"
+val SCALA_2_13 = "2.13.0-RC2"
 
 val untilScala2_12      = SCALA_2_12 :: SCALA_2_11 :: Nil
 val targetScalaVersions = SCALA_2_13 :: untilScala2_12
 
-val SCALATEST_VERSION               = "3.0.8-RC2"
+val SCALATEST_VERSION               = "3.0.8-RC4"
 val SCALACHECK_VERSION              = "1.14.0"
 val MSGPACK_VERSION                 = "0.8.16"
 val SCALA_PARSER_COMBINATOR_VERSION = "1.1.2"