Crossbuild for 2.13.0

typelevel · Jun 15, 2019 · 206e584 · 206e584
1 parent 9d6024d
commit 206e584
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: scala
 scala:
   - 2.11.12
   - 2.12.8
-  - 2.13.0-RC1
+  - 2.13.0
 
 jdk:
   - openjdk10

diff --git a/build.sbt b/build.sbt
@@ -4,15 +4,15 @@ import ReleaseTransformations._
 import sbtcrossproject.{CrossType, crossProject}
 
 lazy val scalaVersions: Map[String, String] =
-  Map("2.11" -> "2.11.12", "2.12" -> "2.12.8", "2.13" -> "2.13.0-RC1")
+  Map("2.11" -> "2.11.12", "2.12" -> "2.12.8", "2.13" -> "2.13.0")
 
 lazy val scalaCheckVersion = "1.14.0"
-lazy val scalaTestVersion = "3.1.0-SNAP9"
-lazy val scalaTestPlusVersion = "1.0.0-SNAP4"
+lazy val scalaTestVersion = "3.1.0-SNAP13"
+lazy val scalaTestPlusVersion = "1.0.0-SNAP8"
 lazy val shapelessVersion = "2.3.3"
-lazy val disciplineVersion = "0.11.2-M1"
-lazy val machinistVersion = "0.6.7"
-lazy val algebraVersion = "2.0.0-M1"
+lazy val disciplineVersion = "0.12.0-M3"
+lazy val machinistVersion = "0.6.8"
+lazy val algebraVersion = "2.0.0-M2"
 
 lazy val apfloatVersion = "1.8.3"
 lazy val jscienceVersion = "4.3.1"
@@ -155,7 +155,8 @@ lazy val laws = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure)
   .settings(moduleName := "spire-laws")
   .settings(spireSettings:_*)
   .settings(libraryDependencies ++= Seq(
-    "org.typelevel" %%% "discipline" % disciplineVersion,
+    "org.typelevel" %%% "discipline-core" % disciplineVersion,
+    "org.typelevel" %%% "discipline-scalatest" % disciplineVersion,
     "org.scalacheck" %%% "scalacheck" % scalaCheckVersion
   ))
   .jvmSettings(commonJvmSettings:_*)
@@ -494,7 +495,10 @@ lazy val commonScalacOptions = Def.setting(
     case Some((2, v)) if v >= 13 =>
       Seq()
     case _ =>
-      Seq("-Yno-adapted-args")
+      Seq(
+        "-Yno-adapted-args",
+        "-Xfuture"
+      )
   }) ++ Seq(
     "-deprecation",
     "-encoding", "UTF-8",
@@ -509,7 +513,6 @@ lazy val commonScalacOptions = Def.setting(
     "-Ywarn-dead-code",
     "-Ywarn-numeric-widen",
     "-Ywarn-value-discard",
-    "-Xfuture"
   )
 )
 

diff --git a/...0-RC1/spire/example/BigStreamCompat.scala → ...-2.13/spire/example/BigStreamCompat.scala b/...0-RC1/spire/example/BigStreamCompat.scala → ...-2.13/spire/example/BigStreamCompat.scala
diff --git a/macros/src/test/scala/spire/macros/CheckedTest.scala b/macros/src/test/scala/spire/macros/CheckedTest.scala
@@ -2,7 +2,7 @@ package spire
 package macros
 
 import org.scalatest.Matchers
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import org.scalatest.funsuite.AnyFunSuite
 
 import org.scalacheck.Arbitrary

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,7 +5,7 @@ addSbtPlugin("com.github.gseitz"   % "sbt-release"           % "1.0.11")
 addSbtPlugin("com.eed3si9n"        % "sbt-unidoc"            % "0.4.2")
 addSbtPlugin("com.eed3si9n"        % "sbt-buildinfo"         % "0.9.0")
 addSbtPlugin("pl.project13.scala"  % "sbt-jmh"               % "0.3.6")
-addSbtPlugin("org.scoverage"       % "sbt-scoverage"         % "1.6.0-RC1")
+addSbtPlugin("org.scoverage"       % "sbt-scoverage"         % "1.6.0")
 addSbtPlugin("org.scalastyle"     %% "scalastyle-sbt-plugin" % "1.0.0")
 addSbtPlugin("com.typesafe.sbt"    % "sbt-git"               % "1.0.0")
 addSbtPlugin("org.xerial.sbt"      % "sbt-sonatype"          % "2.4")

diff --git a/tests/src/test/scala/spire/PartialSyntaxTest.scala b/tests/src/test/scala/spire/PartialSyntaxTest.scala
@@ -13,7 +13,7 @@ import org.scalacheck.Prop.forAll
 
 import org.scalatest.NonImplicitAssertions
 import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.check.Checkers
+import org.scalatestplus.scalacheck.Checkers
 
 class PartialSyntaxTest extends AnyFunSuite with Checkers with BaseSyntaxTest with NonImplicitAssertions {
 

diff --git a/tests/src/test/scala/spire/SyntaxTest.scala b/tests/src/test/scala/spire/SyntaxTest.scala
@@ -13,7 +13,7 @@ import org.scalacheck.{Arbitrary, Gen}
 import org.scalacheck.Arbitrary._
 import org.scalacheck.Prop._
 
-import org.scalatest.check.Checkers
+import org.scalatestplus.scalacheck.Checkers
 
 class SyntaxTest extends SpireTests with Checkers with BaseSyntaxTest {
   import spire.syntax.signed._

diff --git a/tests/src/test/scala/spire/algebra/EqTest.scala b/tests/src/test/scala/spire/algebra/EqTest.scala
@@ -5,7 +5,7 @@ import spire.std.int._
 
 import org.scalacheck.Prop.forAll
 
-import org.scalatest.check.Checkers
+import org.scalatestplus.scalacheck.Checkers
 import org.scalatest.funsuite.AnyFunSuite
 
 class EqTests extends AnyFunSuite with Checkers {

diff --git a/tests/src/test/scala/spire/math/ComplexCheck.scala b/tests/src/test/scala/spire/math/ComplexCheck.scala
@@ -2,7 +2,7 @@ package spire
 package math
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import spire.implicits._
 import spire.laws.arb.{ complex, real }

diff --git a/tests/src/test/scala/spire/math/IntervalTest.scala b/tests/src/test/scala/spire/math/IntervalTest.scala
@@ -10,7 +10,7 @@ import spire.implicits.{eqOps => _, _}
 import spire.laws.arb.{interval => interval_, rational}
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import org.scalatest.funsuite.AnyFunSuite
 
 import interval.Overlap._

diff --git a/tests/src/test/scala/spire/math/NaturalTest.scala b/tests/src/test/scala/spire/math/NaturalTest.scala
@@ -3,7 +3,7 @@ package math
 
 import org.scalacheck.Arbitrary._
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import scala.util.Try
 

diff --git a/tests/src/test/scala/spire/math/NumberTest.scala b/tests/src/test/scala/spire/math/NumberTest.scala
@@ -3,7 +3,7 @@ package math
 
 import org.scalacheck.Arbitrary._
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import org.scalatest.funsuite.AnyFunSuite
 
 class NumberPropertiesTest extends PropSpec with Matchers with ScalaCheckDrivenPropertyChecks {

diff --git a/tests/src/test/scala/spire/math/PackageCheck.scala b/tests/src/test/scala/spire/math/PackageCheck.scala
@@ -2,7 +2,7 @@ package spire
 package math
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 class PackageCheck extends PropSpec with Matchers with ScalaCheckDrivenPropertyChecks {
   fib(0) shouldBe 0

diff --git a/tests/src/test/scala/spire/math/PolynomialSamplingCheck.scala b/tests/src/test/scala/spire/math/PolynomialSamplingCheck.scala
@@ -10,7 +10,7 @@ import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary.arbitrary
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 class PolynomialSamplingCheck extends PropSpec with Matchers with ScalaCheckDrivenPropertyChecks {
 

diff --git a/tests/src/test/scala/spire/math/PolynomialTest.scala b/tests/src/test/scala/spire/math/PolynomialTest.scala
@@ -13,7 +13,7 @@ import org.scalacheck.{Arbitrary, Gen}
 import org.scalacheck.Arbitrary.arbitrary
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import org.scalatest.funsuite.AnyFunSuite
 
 object PolynomialSetup {

diff --git a/tests/src/test/scala/spire/math/QuaternionCheck.scala b/tests/src/test/scala/spire/math/QuaternionCheck.scala
@@ -8,7 +8,7 @@ import org.scalacheck.{Arbitrary, Gen}
 import org.scalacheck.Arbitrary.arbitrary
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 class QuaternionCheck extends PropSpec with Matchers with ScalaCheckDrivenPropertyChecks {
 

diff --git a/tests/src/test/scala/spire/math/RationalCheck.scala b/tests/src/test/scala/spire/math/RationalCheck.scala
@@ -5,7 +5,7 @@ import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary.arbitrary
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 class RationalCheck extends PropSpec with Matchers with ScalaCheckDrivenPropertyChecks {
   type Q = Rational

diff --git a/tests/src/test/scala/spire/math/RealCheck.scala b/tests/src/test/scala/spire/math/RealCheck.scala
@@ -5,7 +5,7 @@ import spire.implicits._
 import spire.laws.arb.{rational, real}
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import ArbitrarySupport._
 import Ordinal._

diff --git a/tests/src/test/scala/spire/math/SafeLongCheck.scala b/tests/src/test/scala/spire/math/SafeLongCheck.scala
@@ -4,7 +4,7 @@ package math
 import java.math.BigInteger
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import spire.util.Opt
 
 class SafeLongCheck extends PropSpec with Matchers with ScalaCheckDrivenPropertyChecks {
@@ -263,5 +263,5 @@ class SafeLongCheck extends PropSpec with Matchers with ScalaCheckDrivenProperty
       SafeLong(b * 2 + 1).isEven shouldBe false
     }
   }
-  
+
 }
diff --git a/tests/src/test/scala/spire/math/TrileanCheck.scala b/tests/src/test/scala/spire/math/TrileanCheck.scala
@@ -2,7 +2,7 @@ package spire
 package math
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import spire.laws.arb._
 

diff --git a/tests/src/test/scala/spire/math/UnsignedTest.scala b/tests/src/test/scala/spire/math/UnsignedTest.scala
@@ -2,7 +2,7 @@ package spire
 package math
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import spire.laws.arb.{ubyte, ushort, uint, ulong}
 

diff --git a/tests/src/test/scala/spire/math/extras/FixedPointCheck.scala b/tests/src/test/scala/spire/math/extras/FixedPointCheck.scala
@@ -6,7 +6,7 @@ import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary.arbitrary
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import spire.implicits._
 import spire.laws.arb.rational

diff --git a/tests/src/test/scala/spire/math/fpf/FPFilterTest.scala b/tests/src/test/scala/spire/math/fpf/FPFilterTest.scala
@@ -10,7 +10,7 @@ import org.scalacheck.{Arbitrary, Gen}
 import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.Prop.forAll
 
-import org.scalatest.check.Checkers
+import org.scalatestplus.scalacheck.Checkers
 import org.scalatest.funsuite.AnyFunSuite
 
 case class Degenerate[A](value: A)

diff --git a/tests/src/test/scala/spire/math/interval/BoundTest.scala b/tests/src/test/scala/spire/math/interval/BoundTest.scala
@@ -1,7 +1,7 @@
 package spire.math.interval
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import spire.laws.arb._
 import spire.syntax.eq._
 import spire.math.Rational

diff --git a/tests/src/test/scala/spire/math/interval/OverlapTest.scala b/tests/src/test/scala/spire/math/interval/OverlapTest.scala
@@ -1,7 +1,7 @@
 package spire.math.interval
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import spire.laws.arb._
 import spire.math.{Interval, Rational}
 import spire.math.interval.Overlap._

diff --git a/tests/src/test/scala/spire/math/prime/FactorHeapCheck.scala b/tests/src/test/scala/spire/math/prime/FactorHeapCheck.scala
@@ -4,7 +4,7 @@ package math.prime
 import spire.math.SafeLong
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import spire.implicits._
 

diff --git a/tests/src/test/scala/spire/math/prime/FactorsCheck.scala b/tests/src/test/scala/spire/math/prime/FactorsCheck.scala
@@ -9,7 +9,7 @@ import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary.arbitrary
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import spire.math.ArbitrarySupport._
 import Ordinal._

diff --git a/tests/src/test/scala/spire/random/SamplingTest.scala b/tests/src/test/scala/spire/random/SamplingTest.scala
@@ -4,7 +4,7 @@ package random
 import org.scalacheck.Gen
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 class SamplingTest extends PropSpec with Matchers with ScalaCheckDrivenPropertyChecks {
   val rng = spire.random.rng.Lcg64.fromTime()

diff --git a/tests/src/test/scala/spire/random/ShufflingTest.scala b/tests/src/test/scala/spire/random/ShufflingTest.scala
@@ -4,7 +4,7 @@ package random
 import org.scalacheck.Gen
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 class ShufflingTest extends PropSpec with Matchers with ScalaCheckDrivenPropertyChecks {
   val rng = spire.random.rng.Lcg64.fromTime()

diff --git a/tests/src/test/scala/spire/tests/package.scala b/tests/src/test/scala/spire/tests/package.scala
@@ -2,7 +2,7 @@ package spire
 package tests
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import org.scalatest.funsuite.AnyFunSuite
 
 trait SpireProperties extends PropSpec with Matchers with ScalaCheckDrivenPropertyChecks {

diff --git a/tests/src/test/scala/spire/util/PackCheck.scala b/tests/src/test/scala/spire/util/PackCheck.scala
@@ -2,7 +2,7 @@ package spire
 package util
 
 import org.scalatest.{Matchers, PropSpec}
-import org.scalatest.check.ScalaCheckDrivenPropertyChecks
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 import java.nio.ByteBuffer