From c2273415c99d51ccb0e1d906c972c3a7cad2f7ec Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Wed, 21 Aug 2019 14:58:34 +0200 Subject: [PATCH 1/2] Update mima Needs release of mima --- .../main/mima-filters/10.1.8.backwards.excludes | 3 +-- .../main/mima-filters/10.0.11.backwards.excludes | 4 ++-- .../main/mima-filters/10.1.8.backwards.excludes | 16 ++++++++-------- .../main/mima-filters/10.0.11.backwards.excludes | 8 ++++---- project/plugins.sbt | 2 +- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/akka-http-caching/src/main/mima-filters/10.1.8.backwards.excludes b/akka-http-caching/src/main/mima-filters/10.1.8.backwards.excludes index d873564c513..1f9bb9bb0ca 100644 --- a/akka-http-caching/src/main/mima-filters/10.1.8.backwards.excludes +++ b/akka-http-caching/src/main/mima-filters/10.1.8.backwards.excludes @@ -17,7 +17,6 @@ ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.http.caching.LfuCache. #### The following are against 10.1.5, but weren't caught by a previous version of MiMa -# Safe, since more specific -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.http.caching.javadsl.CachingSettings.create") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.caching.javadsl.CachingSettings.create") #### diff --git a/akka-http-core/src/main/mima-filters/10.0.11.backwards.excludes b/akka-http-core/src/main/mima-filters/10.0.11.backwards.excludes index 4d2e8cd5592..c85b1a74167 100644 --- a/akka-http-core/src/main/mima-filters/10.0.11.backwards.excludes +++ b/akka-http-core/src/main/mima-filters/10.0.11.backwards.excludes @@ -27,7 +27,7 @@ ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.http.javadsl.model.Htt # Renamed to fromFile to match the fromPath version ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.model.HttpEntity.apply$default$3") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.http.scaladsl.model.HttpEntity.apply") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.model.HttpEntity.apply") # Removal of deprecated methods in 10.0.x ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.javadsl.model.Multipart.toEntity") @@ -84,4 +84,4 @@ ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.http.scaladsl.setting # Method additions to @DoNotInherit class ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.http.javadsl.TimeoutAccess.getTimeout") ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.http.scaladsl.TimeoutAccess.timeout") -ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.http.scaladsl.TimeoutAccess.getTimeout") \ No newline at end of file +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.http.scaladsl.TimeoutAccess.getTimeout") diff --git a/akka-http-core/src/main/mima-filters/10.1.8.backwards.excludes b/akka-http-core/src/main/mima-filters/10.1.8.backwards.excludes index 902fcc0d8ab..3d6ec55dcf8 100644 --- a/akka-http-core/src/main/mima-filters/10.1.8.backwards.excludes +++ b/akka-http-core/src/main/mima-filters/10.1.8.backwards.excludes @@ -44,16 +44,16 @@ ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.impl.engine.render #### The following are against 10.1.5, but weren't caught by a previous version of MiMa -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.http.javadsl.Http.get") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.http.scaladsl.Http.apply") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.javadsl.Http.get") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.Http.apply") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.http.javadsl.settings.PreviewServerSettings.create") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.javadsl.settings.PreviewServerSettings.create") ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.http.impl.settings.ConnectionPoolSettingsImpl.unapply") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.http.javadsl.settings.ConnectionPoolSettings.create") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.http.javadsl.settings.ServerSettings.create") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.http.javadsl.settings.HttpsProxySettings.create") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.http.javadsl.settings.ParserSettings.create") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.http.javadsl.settings.ClientConnectionSettings.create") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.javadsl.settings.ConnectionPoolSettings.create") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.javadsl.settings.ServerSettings.create") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.javadsl.settings.HttpsProxySettings.create") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.javadsl.settings.ParserSettings.create") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.javadsl.settings.ClientConnectionSettings.create") ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.model.*.register") diff --git a/akka-http/src/main/mima-filters/10.0.11.backwards.excludes b/akka-http/src/main/mima-filters/10.0.11.backwards.excludes index d318a1b4d13..b4a33f5927f 100644 --- a/akka-http/src/main/mima-filters/10.0.11.backwards.excludes +++ b/akka-http/src/main/mima-filters/10.0.11.backwards.excludes @@ -12,14 +12,14 @@ ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.marshalli # Removal of deprecated methods 10.0.x before 10.0.11 ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.javadsl.marshalling.Marshaller.fromDataToEntity") ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.coding.Gzip.encode") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.http.scaladsl.coding.Gzip.decode") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.coding.Gzip.decode") ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.coding.Deflate.encode") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.http.scaladsl.coding.Deflate.decode") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.coding.Deflate.decode") ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.coding.NoCoding.encode") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.http.scaladsl.coding.NoCoding.decode") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.coding.NoCoding.decode") ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.coding.Encoder.encode") ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.coding.Decoder.decode") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.http.scaladsl.coding.Decoder.decode") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.coding.Decoder.decode") # Commonized code in PredefinedToResponseMarshallers #1877 ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.http.scaladsl.marshalling.PredefinedToResponseMarshallers.fromEntityStreamingSupportAndByteStringMarshaller") diff --git a/project/plugins.sbt b/project/plugins.sbt index 90be21f6fc3..b0ec31ed8b7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ resolvers += Resolver.jcenterRepo addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.4.0") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.5.0+83-fc2b616c") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0") addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1") From ce8c601cee1ec5c5ebf95ce485fffd6cd4e0d6f5 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 23 Aug 2019 09:33:57 +0200 Subject: [PATCH 2/2] mima 0.6.0 is now released --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b0ec31ed8b7..7a2c3297213 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ resolvers += Resolver.jcenterRepo addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.5.0+83-fc2b616c") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.0") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0") addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")