Skip to content

Commit 8cef8ef

Browse files
authored
Merge pull request #399 from ashawley/fix-mima
Re-enable mima check
2 parents c2eb980 + 8b330fa commit 8cef8ef

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

build.sbt

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

81-
mimaPreviousArtifacts := (
82-
if (CrossVersion isScalaApiCompatible scalaVersion.value)
83-
Set("org.scalacheck" %%% "scalacheck" % "1.14.0")
84-
else
85-
Set.empty
86-
),
81+
mimaPreviousArtifacts := Set("org.scalacheck" %% "scalacheck" % "1.14.0"),
8782

8883
publishTo := {
8984
val nexus = "https://oss.sonatype.org/"

project/MimaSettings.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ object MimaSettings {
2222
)
2323

2424
private def removedPrivateClasses = Seq(
25+
"org.scalacheck.Platform$EnableReflectiveInstantiation"
2526
)
2627

2728
private def otherProblems = Seq(

src/main/scala/org/scalacheck/ScalaCheckFramework.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private abstract class ScalaCheckRunner extends Runner {
2727
val errorCount = new AtomicInteger(0)
2828
val testCount = new AtomicInteger(0)
2929

30-
def deserializeTask(task: String, deserializer: String => TaskDef) = {
30+
def deserializeTask(task: String, deserializer: String => TaskDef): BaseTask = {
3131
val taskDef = deserializer(task)
3232
val countTestSelectors = taskDef.selectors.toSeq.count {
3333
case _:TestSelector => true

0 commit comments

Comments
 (0)