From 4e702416738ec57a5e0d1999cbe2c7b5ada3829d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Oct 2023 00:43:17 +0000 Subject: [PATCH 1/4] typesafe:config 1.4.3 (was 1.4.2) (cherry picked from commit 248f59b9864a4ae32a06f00da8acf4e72c88ab60) --- documentation/build.sbt | 2 +- project/Dependencies.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/project/Dependencies.scala b/project/Dependencies.scala index c39adb01e4d..43b27a16b22 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) From f227ff5d7f98ecb6ea091e3c94860e40967e514f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Oct 2023 00:43:27 +0000 Subject: [PATCH 2/4] sbt 1.9.7 (was 1.9.6) (cherry picked from commit 19bd7191d883d7b557beb6bf7038fe29bd2c221f) --- documentation/project/build.properties | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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 From 5acbbf61a920d58b6de923b30e9d5b5e0a4a9218 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Oct 2023 00:43:40 +0000 Subject: [PATCH 3/4] sbt-dependency-tree 1.9.7 (was 1.9.6) (cherry picked from commit edb60221e9f23b7bd74b634e4e5675507778f389) --- .github/workflows/build-test.yml | 4 ++-- project/Versions.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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" } From d68a33e4eaabf512fbe83f7bedaf77f1c4b2ad2e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Oct 2023 00:43:57 +0000 Subject: [PATCH 4/4] scalafmt-core 3.7.15 (was 3.7.14) (cherry picked from commit efd066a54524f38ee57c84867a990caeec98bd81) --- .scalafmt.conf | 2 +- documentation/.scalafmt.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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