Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mima #2656

Merged
merged 2 commits into from
Aug 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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")

####
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.http.scaladsl.TimeoutAccess.getTimeout")
16 changes: 8 additions & 8 deletions akka-http-core/src/main/mima-filters/10.1.8.backwards.excludes
Original file line number Diff line number Diff line change
Expand Up @@ -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")
jrudolph marked this conversation as resolved.
Show resolved Hide resolved

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")

Expand Down
8 changes: 4 additions & 4 deletions akka-http/src/main/mima-filters/10.0.11.backwards.excludes
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.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")
Expand Down