From b3c0eb08a5d8b14cd110384154e66601a42b8ad2 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 11 Mar 2024 16:35:39 +0100 Subject: [PATCH] Upgrade sbt, Scala, Play to latest versions --- .github/workflows/build-test.yml | 2 +- docs/build.sbt | 4 ++-- docs/project/build.properties | 2 +- docs/project/plugins.sbt | 2 +- project/Dependencies.scala | 8 ++++---- project/build.properties | 2 +- .../src/main/scala/play/ebean/sbt/PlayEbean.scala | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 84931f9..dcf172f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -53,7 +53,7 @@ jobs: uses: playframework/.github/.github/workflows/cmd.yml@v3 with: java: 17, 11 - scala: 2.13.12, 3.3.1 + scala: 2.13.13, 3.3.3 cmd: >- sbt " +publishLocal; diff --git a/docs/build.sbt b/docs/build.sbt index 678622d..386bfa2 100644 --- a/docs/build.sbt +++ b/docs/build.sbt @@ -21,8 +21,8 @@ lazy val docs = project // No resource directories shuts the ebean agent up about java sources in the classes directory Test / unmanagedResourceDirectories := Nil, Test / parallelExecution := false, - scalaVersion := "2.13.12", - crossScalaVersions := Seq("2.13.12", "3.3.1"), + scalaVersion := "2.13.13", + crossScalaVersions := Seq("2.13.13", "3.3.3"), ) .settings( Test / javafmt / sourceDirectories ++= (Test / unmanagedSourceDirectories).value, diff --git a/docs/project/build.properties b/docs/project/build.properties index 5b79d00..d4df6c9 100644 --- a/docs/project/build.properties +++ b/docs/project/build.properties @@ -1,3 +1,3 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index 91e88e3..37964c6 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.1")) +addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.2")) addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 219346d..196d93c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,13 +9,13 @@ import sbt._ object Dependencies { object ScalaVersions { - val scala212 = "2.12.18" - val scala213 = "2.13.12" - val scala3 = "3.3.1" + val scala212 = "2.12.19" + val scala213 = "2.13.13" + val scala3 = "3.3.3" } object Versions { - val play: String = "3.0.1" + val play: String = "3.0.2" val ebean = "15.0.1" val typesafeConfig = "1.4.3" } diff --git a/project/build.properties b/project/build.properties index 5b79d00..d4df6c9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,3 +1,3 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala b/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala index 6bb9621..6bdd264 100644 --- a/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala +++ b/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala @@ -57,7 +57,7 @@ object PlayEbean extends AutoPlugin { libraryDependencies ++= Seq( "org.playframework" %% "play-ebean" % playEbeanVersion.value, - "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.4" + "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.5" ) )