Skip to content

Commit 54c694c

Browse files
authored
Merge pull request #702 from ashawley/compat-1.15
Fix source compatibility 1.15.0
2 parents 2cd56eb + 36b39fc commit 54c694c

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
111111
// don't use fatal warnings in tests
112112
Test / scalacOptions ~= (_ filterNot (_ == "-Xfatal-warnings")),
113113

114+
mimaReportSignatureProblems := true,
114115
mimaPreviousArtifacts := {
115116
// TODO: re-enable MiMa for 2.14 once there is a final version
116117
if (scalaMajorVersion.value == 14 || isDotty.value) Set()

project/MimaSettings.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ object MimaSettings {
2525
)
2626

2727
private def otherProblems = Seq(
28-
// New issue added in MiMa 0.4.0
29-
exclude[IncompatibleSignatureProblem]("org.scalacheck.*"),
3028
)
3129

3230
}

src/main/scala/org/scalacheck/Gen.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -896,21 +896,21 @@ object Gen extends GenArities with GenVersionSpecific {
896896
}
897897

898898
/** A generator that picks a random number of elements from a list */
899-
def someOf[T](l: Iterable[T]): Gen[collection.Seq[T]] =
899+
def someOf[T](l: Iterable[T]) =
900900
choose(0, l.size).flatMap(pick(_,l))
901901

902902
/** A generator that picks a random number of elements from a list */
903-
def someOf[T](g1: Gen[T], g2: Gen[T], gs: Gen[T]*): Gen[collection.Seq[T]] =
903+
def someOf[T](g1: Gen[T], g2: Gen[T], gs: Gen[T]*) =
904904
choose(0, gs.length+2).flatMap(pick(_, g1, g2, gs: _*))
905905

906906
/** A generator that picks at least one element from a list */
907-
def atLeastOne[T](l: Iterable[T]): Gen[collection.Seq[T]] = {
907+
def atLeastOne[T](l: Iterable[T]) = {
908908
require(l.size > 0, "There has to be at least one option to choose from")
909909
choose(1,l.size).flatMap(pick(_,l))
910910
}
911911

912912
/** A generator that picks at least one element from a list */
913-
def atLeastOne[T](g1: Gen[T], g2: Gen[T], gs: Gen[T]*): Gen[collection.Seq[T]] =
913+
def atLeastOne[T](g1: Gen[T], g2: Gen[T], gs: Gen[T]*) =
914914
choose(1, gs.length+2).flatMap(pick(_, g1, g2, gs: _*))
915915

916916
/** A generator that randomly picks a given number of elements from a list

0 commit comments

Comments
 (0)