From 671c6b30539f18c2a7ba279f2b1515968291fc2f Mon Sep 17 00:00:00 2001 From: Michael Pilquist Date: Wed, 16 Dec 2020 16:14:06 -0500 Subject: [PATCH] Scala 3.0.0-M3 support (#731) Co-authored-by: Martin Odersky Co-authored-by: Liu Fengyun --- .github/workflows/ci.yml | 8 ++++---- build.sbt | 4 ++-- jvm/src/test/scala/org/scalacheck/GenSpecification.scala | 6 +++--- src/main/scala/org/scalacheck/rng/Seed.scala | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 806db616a..77cac41f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.0.0-M1, 3.0.0-M2, 2.11.12, 2.12.10, 2.13.3] + scala: [3.0.0-M2, 3.0.0-M3, 2.11.12, 2.12.10, 2.13.3] java: [adopt@1.8, adopt@1.11] platform: [jvm] workers: [1, 4] @@ -30,12 +30,12 @@ jobs: - workers: 1 os: ubuntu-latest java: adopt@1.8 - scala: 3.0.0-M1 + scala: 3.0.0-M2 platform: js - workers: 1 os: ubuntu-latest java: adopt@1.8 - scala: 3.0.0-M2 + scala: 3.0.0-M3 platform: js - workers: 1 os: ubuntu-latest @@ -139,7 +139,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.0.0-M1, 3.0.0-M2, 2.11.12, 2.12.10, 2.13.3] + scala: [3.0.0-M2, 3.0.0-M3, 2.11.12, 2.12.10, 2.13.3] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index bdae50e96..6b1bb120b 100644 --- a/build.sbt +++ b/build.sbt @@ -7,8 +7,8 @@ scalaVersionSettings val Scala211 = "2.11.12" val Scala212 = "2.12.10" val Scala213 = "2.13.3" -val DottyOld = "3.0.0-M1" -val DottyNew = "3.0.0-M2" +val DottyOld = "3.0.0-M2" +val DottyNew = "3.0.0-M3" ThisBuild / crossScalaVersions := Seq(DottyOld, DottyNew, Scala211, Scala212, Scala213) ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.last diff --git a/jvm/src/test/scala/org/scalacheck/GenSpecification.scala b/jvm/src/test/scala/org/scalacheck/GenSpecification.scala index c83694d4b..13b9df5e2 100644 --- a/jvm/src/test/scala/org/scalacheck/GenSpecification.scala +++ b/jvm/src/test/scala/org/scalacheck/GenSpecification.scala @@ -432,12 +432,12 @@ object GenSpecification extends Properties("Gen") with GenSpecificationVersionSp property("resultOf2") = { case class A(m: Int, s: String) - forAll(resultOf(A)) { (a:A) => true } + forAll(resultOf(A.apply _)) { (a:A) => true } } property("resultOf3") = { case class B(n: Int, s: String, b: Boolean) - implicit val arbB: Arbitrary[B] = Arbitrary(resultOf(B)) + implicit val arbB: Arbitrary[B] = Arbitrary(resultOf(B.apply _)) forAll { (b:B) => true } } @@ -550,7 +550,7 @@ object GenSpecification extends Properties("Gen") with GenSpecificationVersionSp ) property("22 field case class works") = - forAll(Gen.resultOf(Full22.tupled)) { _ => true } + forAll(Gen.resultOf((Full22.apply _).tupled)) { _ => true } type Trilean = Either[Unit, Boolean] diff --git a/src/main/scala/org/scalacheck/rng/Seed.scala b/src/main/scala/org/scalacheck/rng/Seed.scala index bd35d5981..73fa277d4 100644 --- a/src/main/scala/org/scalacheck/rng/Seed.scala +++ b/src/main/scala/org/scalacheck/rng/Seed.scala @@ -55,7 +55,7 @@ sealed abstract class Seed extends Serializable { val b1 = c + rotateLeft(d, 37) val c1 = d + e val d1 = e + a - Seed(a1, b1, c1, d1) + Seed.apply(a1, b1, c1, d1) } /** Reseed the RNG using the given Long value. */ @@ -63,7 +63,7 @@ sealed abstract class Seed extends Serializable { val n0 = ((n >>> 32) & 0xffffffff) val n1 = (n & 0xffffffff) var i = 0 - var seed: Seed = Seed(a ^ n0, b ^ n1, c, d) + var seed: Seed = Seed.apply(a ^ n0, b ^ n1, c, d) while(i < 16) { seed = seed.next; i += 1 } seed } @@ -105,7 +105,7 @@ object Seed { /** Generate a deterministic seed. */ def apply(s: Long): Seed = { var i = 0 - var seed: Seed = Seed(0xf1ea5eed, s, s, s) + var seed: Seed = Seed.apply(0xf1ea5eed, s, s, s) while (i < 20) { seed = seed.next; i += 1 } seed }