From 6f9d437d251198d22b86dca826bcf476f0510956 Mon Sep 17 00:00:00 2001 From: Filipe Regadas Date: Wed, 18 Sep 2019 18:01:06 +0100 Subject: [PATCH 1/2] Fix: ignore MiMa false positives --- build.sbt | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index f32f067a1..3dc58393a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import ReleaseTransformations._ import algebird._ -import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings +import com.typesafe.tools.mima.core._ import pl.project13.scala.sbt.JmhPlugin val algebraVersion = "0.7.0" @@ -142,7 +142,7 @@ val sharedSettings = Seq( http://twitter.com/sritchie ) -) ++ mimaDefaultSettings +) ++ mimaSettings lazy val noPublishSettings = Seq( publish := {}, @@ -151,6 +151,56 @@ lazy val noPublishSettings = Seq( publishArtifact := false ) +// https://github.com/lightbend/mima/issues/388 +lazy val mimaSettings = Def.settings( + mimaBinaryIssueFilters ++= Seq( + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.IdentityMonad.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.Averager.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.AveragedGroup.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.MomentsGroup.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.MomentsAggregator.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.NullGroup.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.BigIntRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.BitSetLite.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.BooleanRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.JBoolRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.DoubleRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.JDoubleRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.JShortRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.ShortRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.IntRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.JIntRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.FloatRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.JFloatRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.LongRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.JLongRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.BigDecimalRing.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.UnitGroup.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.HLLSeries.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.SparseHLL.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.DenseHLL.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.StringMonoid.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.OrValMonoid.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.AndValMonoid.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.DecayedValueMonoid.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.MinHashSignature.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.statistics.PlainCounter.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.statistics.AtomicCounter.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.statistics.GaussianDistributionMonoid.*"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.util.summer.CompactionSize.apply"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.util.summer.FlushFrequency.apply"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.util.summer.MemoryFlushPercent.apply"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.util.summer.UpdateFrequency.apply"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.util.summer.RollOverFrequency.apply"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.util.summer.HeavyHittersPercent.apply"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.util.summer.BufferSize.apply"), + ProblemFilters.exclude[DirectMissingMethodProblem]("com.twitter.algebird.util.summer.Compact.apply"), + + ProblemFilters.exclude[IncompatibleSignatureProblem]("com.twitter.algebird.MinHashSignature.*"), + ProblemFilters.exclude[IncompatibleSignatureProblem]("com.twitter.algebird.MinHasher.*") + ) +) + /** * This returns the previous jar we released that is compatible with * the current. From 298bc591aabbd6a537bad85572cb23df11f92f4c Mon Sep 17 00:00:00 2001 From: Filipe Regadas Date: Thu, 19 Sep 2019 08:27:26 +0100 Subject: [PATCH 2/2] Reverting to scala 2.12.9 --- .travis.yml | 2 +- build.sbt | 2 +- sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1d0419b2..bce5cf6dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: after_success: - bash <(curl -s https://codecov.io/bash) - - scala: 2.12.10 + - scala: 2.12.9 jdk: openjdk8 script: sbt "++$TRAVIS_SCALA_VERSION clean" "++$TRAVIS_SCALA_VERSION test" "scalafmt::test" "test:scalafmt::test" "++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues" "++$TRAVIS_SCALA_VERSION docs/makeMicrosite" #script: ./sbt "+++$TRAVIS_SCALA_VERSION clean" "+++$TRAVIS_SCALA_VERSION test" "++$TRAVIS_SCALA_VERSION docs/makeMicrosite" diff --git a/build.sbt b/build.sbt index 3dc58393a..132660026 100644 --- a/build.sbt +++ b/build.sbt @@ -45,7 +45,7 @@ def docsSourcesAndProjects(sv: String): (Boolean, Seq[ProjectReference]) = val sharedSettings = Seq( organization := "com.twitter", scalaVersion := "2.11.12", - crossScalaVersions := Seq("2.10.6", "2.11.12", "2.12.10"), + crossScalaVersions := Seq("2.10.6", "2.11.12", "2.12.9"), resolvers ++= Seq( Opts.resolver.sonatypeSnapshots, diff --git a/sbt b/sbt index bc70b4746..902836c98 100755 --- a/sbt +++ b/sbt @@ -10,7 +10,7 @@ declare -r sbt_release_version="0.13.17" declare -r sbt_unreleased_version="0.13.17" declare -r latest_213="2.13.0-M5" -declare -r latest_212="2.12.10" +declare -r latest_212="2.12.9" declare -r latest_211="2.11.12" declare -r latest_210="2.10.7" declare -r latest_29="2.9.3"