Skip to content

Commit

Permalink
Scala 3.0.0-M3 support (#731)
Browse files Browse the repository at this point in the history
Co-authored-by: Martin Odersky <[email protected]>
Co-authored-by: Liu Fengyun <[email protected]>
  • Loading branch information
3 people authored Dec 16, 2020
1 parent 13a2235 commit 671c6b3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ 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: [[email protected], [email protected]]
platform: [jvm]
workers: [1, 4]
include:
- workers: 1
os: ubuntu-latest
java: [email protected]
scala: 3.0.0-M1
scala: 3.0.0-M2
platform: js
- workers: 1
os: ubuntu-latest
java: [email protected]
scala: 3.0.0-M2
scala: 3.0.0-M3
platform: js
- workers: 1
os: ubuntu-latest
Expand Down Expand Up @@ -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: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions jvm/src/test/scala/org/scalacheck/GenSpecification.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}

Expand Down Expand Up @@ -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]

Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/org/scalacheck/rng/Seed.scala
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ 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. */
def reseed(n: Long): Seed = {
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
}
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit 671c6b3

Please sign in to comment.