From ae45c5393c85030baadb1d392f39d029ede38753 Mon Sep 17 00:00:00 2001 From: Roman Parshikov Date: Thu, 12 May 2022 00:22:43 +0800 Subject: [PATCH] Remove deprecated method --- build.sbt | 6 +++++- .../play/db/ebean/EbeanDynamicEvolutions.java | 15 --------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/build.sbt b/build.sbt index 389d0b94..7dbaee4c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import Dependencies.ScalaVersions.scala212 - import Dependencies.ScalaVersions.scala213 import Dependencies.Versions +import com.typesafe.tools.mima.core._ import sbt.Append.appendSeq import xsbti.compile.CompileAnalysis @@ -20,6 +20,10 @@ lazy val mimaSettings = Seq( organization.value %% name.value % "6.0.0" // previousStableVersion.value // .getOrElse(throw new Error("Unable to determine previous version")) ), + mimaBinaryIssueFilters ++= Seq( + // https://github.com/playframework/play-ebean/pull/281 - Removed io.ebean.EbeanServer in Ebean 13.6.0 + ProblemFilters.exclude[IncompatibleMethTypeProblem]("play.db.ebean.EbeanDynamicEvolutions.generateEvolutionScript") + ) ) lazy val root = project diff --git a/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java b/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java index 517ea937..f3b2d2e7 100644 --- a/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java +++ b/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java @@ -92,21 +92,6 @@ public static String generateEvolutionScript(Database database) { return generateScript((SpiEbeanServer) database); } - /** - * Helper method that generates the required evolution to properly run Ebean/DB. - * - * @deprecated - * Use {@link EbeanDynamicEvolutions#generateEvolutionScript(Database)} instead. - * - * @param server the EbeanServer. - * @return the complete migration generated by Ebean/DB. - * - */ - @Deprecated - public static String generateEvolutionScript(EbeanServer server) { - return generateScript((SpiEbeanServer) server); - } - private static String generateScript(SpiEbeanServer spiServer) { CurrentModel ddl = new CurrentModel(spiServer);