From c83b73864d040d1752cc5758c93b3a149d1834ec Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 26 Jan 2025 18:55:03 +0100 Subject: [PATCH 1/2] Play milestone that switches to jakarta --- docs/project/plugins.sbt | 2 +- .../src/main/java/play/db/ebean/DefaultEbeanConfig.java | 6 +++--- .../src/main/java/play/db/ebean/EbeanDynamicEvolutions.java | 4 ++-- project/Dependencies.scala | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index 6fe59f3..955fd02 100644 --- a/docs/project/plugins.sbt +++ b/docs/project/plugins.sbt @@ -6,7 +6,7 @@ lazy val sbtPlayEbean = ProjectRef(Path.fileProperty("user.dir").getParentFile, resolvers ++= DefaultOptions.resolvers(snapshot = true) -addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.6")) +addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.1.0-M1")) addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") diff --git a/play-ebean/src/main/java/play/db/ebean/DefaultEbeanConfig.java b/play-ebean/src/main/java/play/db/ebean/DefaultEbeanConfig.java index e7fe434..c3e32dd 100644 --- a/play-ebean/src/main/java/play/db/ebean/DefaultEbeanConfig.java +++ b/play-ebean/src/main/java/play/db/ebean/DefaultEbeanConfig.java @@ -7,10 +7,10 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigException; import io.ebean.config.DatabaseConfig; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import java.util.*; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; import org.reflections.Reflections; import org.reflections.scanners.Scanners; import org.reflections.scanners.TypeElementsScanner; 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 dcb47cc..62d3840 100644 --- a/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java +++ b/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java @@ -8,6 +8,8 @@ import io.ebean.DatabaseFactory; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.dbmigration.model.CurrentModel; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -15,8 +17,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.inject.Inject; -import javax.inject.Singleton; import play.Environment; import play.api.db.evolutions.DynamicEvolutions; import play.api.db.evolutions.Evolutions$; diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f485d93..8841c9b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { } object Versions { - val play: String = "3.0.6" + val play: String = "3.1.0-M1" val ebean = "15.8.1" val typesafeConfig = "1.4.3" } From 0e9a4fcb50d67de215fdae96d7197ca97fd80fce Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 26 Jan 2025 19:03:46 +0100 Subject: [PATCH 2/2] Adjust mima --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index e54ae63..7af5344 100644 --- a/build.sbt +++ b/build.sbt @@ -18,12 +18,12 @@ Global / onLoad := (Global / onLoad).value.andThen { s => s } -val previousVersion: Option[String] = Some("8.0.0") +val previousVersion: Option[String] = Some("8.3.0") lazy val mimaSettings = Seq( mimaPreviousArtifacts := previousVersion.map(organization.value %% moduleName.value % _).toSet, mimaBinaryIssueFilters ++= Seq( - ProblemFilters.exclude[ReversedMissingMethodProblem]("play.db.ebean.EbeanConfig.generateEvolutionsScripts"), + ProblemFilters.exclude[MissingTypesProblem]("play.db.ebean.DefaultEbeanConfig$EbeanConfigParser"), ) )