From 51841d0469b7b49775c68466ae1965ebf423c3c9 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 8 May 2024 13:53:16 +0200 Subject: [PATCH 1/6] Scala 2.13.14 --- project/ProjectSettings.scala | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala index dbd33e549c3f..1ece52305a89 100644 --- a/project/ProjectSettings.scala +++ b/project/ProjectSettings.scala @@ -32,7 +32,14 @@ object ProjectSettings { Compile / packageDoc / publishArtifact := false, Compile / doc / sources := Seq.empty, Compile / doc := target.map(_ / "none").value, - scalaVersion := "2.13.13", + scalaVersion := "2.13.14", + initialize := { + val _ = initialize.value + assert( + sys.props("java.specification.version") == "11", + "Java 11 is required for this project.", + ) + }, cleanAll := Def.taskDyn { val allProjects = ScopeFilter(inAnyProject) clean.all(allProjects) From 9b00c1abe40ef28ca0c479838c12a75ca37fa70a Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 8 May 2024 13:53:41 +0200 Subject: [PATCH 2/6] sbt 1.10.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 04267b14af69..081fdbbc7625 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 From 22f78515ea251b1fff24617993454f9eb106fd1e Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 8 May 2024 13:53:50 +0200 Subject: [PATCH 3/6] Play 3.0.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5891d6340cf0..68ac8028192e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,7 +9,7 @@ libraryDependencies ++= Seq( resolvers ++= Resolver.sonatypeOssRepos("releases") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.2") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") From 3218c83e54dc7c73c1a51a16fba1c55f64c0f006 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 8 May 2024 13:54:03 +0200 Subject: [PATCH 4/6] Play JSON 3.0.3 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4d287ba7de8a..dbac15d5ece0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val dispatchVersion = "0.13.1" val romeVersion = "1.0" val jerseyVersion = "1.19.4" - val playJsonVersion = "3.0.2" + val playJsonVersion = "3.0.3" val apacheCommonsLang = "org.apache.commons" % "commons-lang3" % "3.11" val awsCore = "com.amazonaws" % "aws-java-sdk-core" % awsVersion val awsCloudwatch = "com.amazonaws" % "aws-java-sdk-cloudwatch" % awsVersion From 83ad7ee5f26b4caddaa7bc83c9a3460564b53b34 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 8 May 2024 13:54:22 +0200 Subject: [PATCH 5/6] sbt native packager 1.10.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 68ac8028192e..8c8867aa9724 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -11,7 +11,7 @@ resolvers ++= Resolver.sonatypeOssRepos("releases") addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") From ffd86d8d87e2b1f532d34f5eb2fe2f0850527840 Mon Sep 17 00:00:00 2001 From: Ioanna Kokkini Date: Fri, 17 May 2024 15:57:56 +0100 Subject: [PATCH 6/6] Remove Java 11 assertion from Project Settings It was removed in https://github.com/guardian/frontend/pull/27158 but I messed up when resolving conflicts. --- project/ProjectSettings.scala | 7 ------- 1 file changed, 7 deletions(-) diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala index 1ece52305a89..8b82e46c8b34 100644 --- a/project/ProjectSettings.scala +++ b/project/ProjectSettings.scala @@ -33,13 +33,6 @@ object ProjectSettings { Compile / doc / sources := Seq.empty, Compile / doc := target.map(_ / "none").value, scalaVersion := "2.13.14", - initialize := { - val _ = initialize.value - assert( - sys.props("java.specification.version") == "11", - "Java 11 is required for this project.", - ) - }, cleanAll := Def.taskDyn { val allProjects = ScopeFilter(inAnyProject) clean.all(allProjects)