diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 4ed534c1cd7..e0cb267d549 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -45,7 +45,7 @@ jobs: cmd: | if [ "$CACHE_HIT_COURSIER" = "false" ]; then sbt +update # Runs with adoptium:8 (default) - # sbt --sbt-version 1.9.6 +update # If we run scripted tests with multiple sbt versions, we could init that sbt installs here + # sbt --sbt-version 1.9.7 +update # If we run scripted tests with multiple sbt versions, we could init that sbt installs here sbt +mimaPreviousClassfiles # Fetches previous artifacts cd documentation && sbt +update && cd .. # Fetches dependencies of the documentation project sbt -java-home `cs java-home --jvm adoptium:11` exit # Init sbt with new JVM that will be downloaded @@ -153,7 +153,7 @@ jobs: scala: 2.13.x, 3.x add-dimensions: >- { - "sbt": [ "1.9.6" ], + "sbt": [ "1.9.7" ], "sbt_steps": [ "*1of3", "*2of3", "*3of3" ] } exclude: >- diff --git a/.scalafmt.conf b/.scalafmt.conf index e32411dea6b..fef60e3fa1a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -2,7 +2,7 @@ # Keep this in sync with documentation/.scalafmt.conf # Version https://scalameta.org/scalafmt/docs/configuration.html#version -version = 3.7.14 +version = 3.7.15 # Dialect https://scalameta.org/scalafmt/docs/configuration.html#scala-dialects runner.dialect = scala213 diff --git a/documentation/.scalafmt.conf b/documentation/.scalafmt.conf index 4943a02f2a1..e0b42f7a226 100644 --- a/documentation/.scalafmt.conf +++ b/documentation/.scalafmt.conf @@ -3,7 +3,7 @@ # TODO remove when making documentation a subproject # Version https://scalameta.org/scalafmt/docs/configuration.html#version -version = 3.7.14 +version = 3.7.15 # Dialect https://scalameta.org/scalafmt/docs/configuration.html#scala-dialects runner.dialect = scala213 diff --git a/documentation/build.sbt b/documentation/build.sbt index ad5536d52f9..72a43014ba2 100644 --- a/documentation/build.sbt +++ b/documentation/build.sbt @@ -40,7 +40,7 @@ lazy val main = Project("Play-Documentation", file(".")) ), // TODO: Delete this eventually, just needed for lag between deploying to sonatype and getting on maven central version := PlayVersion.current, libraryDependencies ++= Seq( - "com.typesafe" % "config" % "1.4.2" % Test, + "com.typesafe" % "config" % "1.4.3" % Test, "com.h2database" % "h2" % "2.2.224" % Test, "org.mockito" % "mockito-core" % "5.6.0" % Test, // https://github.com/logstash/logstash-logback-encoder/tree/logstash-logback-encoder-4.9#including diff --git a/documentation/project/build.properties b/documentation/project/build.properties index 49b31e464a2..030acccf5b0 100644 --- a/documentation/project/build.properties +++ b/documentation/project/build.properties @@ -1,4 +1,4 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # sync with project/build.properties -sbt.version=1.9.6 +sbt.version=1.9.7 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 771e3c4f357..27ea95d9a49 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -203,7 +203,7 @@ object Dependencies { Seq(playFileWatch, logback % Test) ++ specs2Deps.map(_ % Test) } - val typesafeConfig = "com.typesafe" % "config" % "1.4.2" + val typesafeConfig = "com.typesafe" % "config" % "1.4.3" def sbtDependencies(sbtVersion: String, scalaVersion: String) = { def sbtDep(moduleId: ModuleID) = sbtPluginDep(moduleId, sbtVersion, scalaVersion) diff --git a/project/Versions.scala b/project/Versions.scala index 214b33dec42..3e5ad99a726 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -9,5 +9,5 @@ object ScalaVersions { } object SbtVersions { - val sbt19 = "1.9.6" + val sbt19 = "1.9.7" } diff --git a/project/build.properties b/project/build.properties index a731eefbe4a..5774496e245 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # sync with documentation/project/build.properties -sbt.version=1.9.6 +sbt.version=1.9.7