Skip to content

Commit

Permalink
Merge pull request scala#8115 from SethTisue/rc3-is-starr
Browse files Browse the repository at this point in the history
re-STARR and reset MiMa onto RC3
  • Loading branch information
dwijnand authored May 31, 2019
2 parents a73bacc + fb46b4e commit 3274eff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 85 deletions.
85 changes: 1 addition & 84 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -83,96 +83,13 @@ ThisBuild / headerLicense := Some(HeaderLicense.Custom(
|""".stripMargin
))

Global / mimaReferenceVersion := Some("2.13.0-RC2")
Global / mimaReferenceVersion := Some("2.13.0-RC3")

import com.typesafe.tools.mima.core._
val mimaPrereleaseHandlingSettings = Seq(
mimaBinaryIssueFilters ++= Seq(
// Drop after 2.13.0 is out, whence src/reflect/mima-filters/ takes over.
ProblemFilters.exclude[Problem]("scala.reflect.internal.*"),


// #8094
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.FutureConverters#CompletionStageOps.toScala"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.FutureConverters#FutureOps.toJava"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.FutureConverters#CompletionStageOps.toScala$extension"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.FutureConverters#FutureOps.toJava$extension"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.javaapi.FutureConverters.toJava"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.javaapi.FutureConverters.toScala"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.FutureConverters#CompletionStageOps.asScala"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.FutureConverters#FutureOps.asJava"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.FutureConverters#CompletionStageOps.asScala$extension"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.FutureConverters#FutureOps.asJava$extension"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.javaapi.FutureConverters.asJava"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.jdk.javaapi.FutureConverters.asScala"),


// #8096
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.HashSet.this"),


// #8093
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.IterableOnceOps.knownSize"),
ProblemFilters.exclude[DirectAbstractMethodProblem]("scala.collection.IterableOnce.knownSize"),


// #8089
ProblemFilters.exclude[MissingClassProblem]("scala.collection.MapView$Concat"),
ProblemFilters.exclude[IncompatibleMethTypeProblem]("scala.collection.AbstractMapView.++"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.AbstractMapView.+"),
ProblemFilters.exclude[IncompatibleMethTypeProblem]("scala.collection.AbstractMapView.concat"),
ProblemFilters.exclude[IncompatibleMethTypeProblem]("scala.collection.MapView.++"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.MapView.+"),
ProblemFilters.exclude[IncompatibleMethTypeProblem]("scala.collection.MapView.concat"),


// #8104
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.RichFloat.isFinite$extension"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.RichDouble.isFinite$extension"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.RichFloat.isFinite"),
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.RichDouble.isFinite"),


// #8083
ProblemFilters.exclude[FinalMethodProblem]("scala.jdk.Accumulator.stepper"),


// #8099
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#Drop.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#Take.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#Concat.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.AbstractIndexedSeqView.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#Sorted.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#Drop.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#TakeRight.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#Appended.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#Sorted#ReverseSorted.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#Map.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#DropRight.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#Take.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#Reverse.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.AbstractMapView.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#Prepended.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#Map.tapEach"),
ProblemFilters.exclude[MissingClassProblem]("scala.collection.MapView$TapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#DropRight.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#Id.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#Appended.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.MapView.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#TakeRight.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.SeqView#Concat.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.IndexedSeqView#Prepended.tapEach"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.AbstractSeqView.tapEach"),


// #8107
ProblemFilters.exclude[MissingClassProblem]("scala.jdk.CollectionConverters$Ops$"),

// #8108
ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.collection.immutable.StrictOptimizedSeqOps.scala$collection$immutable$StrictOptimizedSeqOps$$super$sorted"),

),
)

Expand Down
2 changes: 1 addition & 1 deletion versions.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Scala version used for bootstrapping (see README.md)
starr.version=2.13.0-RC2
starr.version=2.13.0-RC3

# These are the versions of the modules that go with this release.
# Artifact dependencies:
Expand Down

0 comments on commit 3274eff

Please sign in to comment.