From 5371a7028151f87dc8a239a4a66af3abb0fd9a0a Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:27:42 +0000 Subject: [PATCH 01/11] Update sbt-assembly to 2.2.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ff491a3d..b35e2c30 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") addSbtPlugin("com.michaelpollmeier" % "sbt-assembly-log4j2" % "1.1.3") From 1694a3226174e5d59f7226f6f5d372caaa5cc20e Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:27:42 +0000 Subject: [PATCH 02/11] Update jackson-dataformat-cbor to 2.17.2 --- project/dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/dependencies.scala b/project/dependencies.scala index c2c78353..f4a35ea0 100644 --- a/project/dependencies.scala +++ b/project/dependencies.scala @@ -3,7 +3,7 @@ import sbt._ object Dependencies { val awsSdkVersion = "1.12.767" val log4j2Version = "2.17.2" - val jacksonVersion = "2.14.3" + val jacksonVersion = "2.17.2" val specsVersion = "4.20.5" val http4sVersion = "0.23.26" From 21d3207f7692362b1430e11fe69dd292471f9099 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:27:42 +0000 Subject: [PATCH 03/11] Update okhttp to 4.12.0 --- project/dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/dependencies.scala b/project/dependencies.scala index f4a35ea0..39ec78cb 100644 --- a/project/dependencies.scala +++ b/project/dependencies.scala @@ -23,7 +23,7 @@ object Dependencies { val log4j = "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4j2Version val commonsIo = "commons-io" % "commons-io" % "2.15.1" val scanamo = "org.scanamo" %% "scanamo" % "1.0.1" - val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.9.3" + val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.12.0" val specsCore = "org.specs2" %% "specs2-core" % specsVersion % "test" val specsScalaCheck = "org.specs2" %% "specs2-scalacheck" % specsVersion % "test" From 94b2c82c285a4b9a82d2add096c7a7216c4ebc13 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:27:42 +0000 Subject: [PATCH 04/11] Update commons-io to 2.16.1 --- project/dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/dependencies.scala b/project/dependencies.scala index 39ec78cb..b235d338 100644 --- a/project/dependencies.scala +++ b/project/dependencies.scala @@ -21,7 +21,7 @@ object Dependencies { val jacksonJsrDataType = "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jacksonVersion val log4j = "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4j2Version - val commonsIo = "commons-io" % "commons-io" % "2.15.1" + val commonsIo = "commons-io" % "commons-io" % "2.16.1" val scanamo = "org.scanamo" %% "scanamo" % "1.0.1" val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.12.0" val specsCore = "org.specs2" %% "specs2-core" % specsVersion % "test" From 26d45f560e4063d0bd4ea33d33006063df3ee6eb Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:28:29 +0000 Subject: [PATCH 05/11] Update scala-library to 2.13.14 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f3a20bbd..c0bf6020 100644 --- a/build.sbt +++ b/build.sbt @@ -56,7 +56,7 @@ val commonSettings: immutable.Seq[Def.Setting[_]] = List( }, organization := "com.gu", version := "1.0", - scalaVersion := "2.12.19", + scalaVersion := "2.13.14", scalacOptions ++= Seq( "-deprecation", "-encoding", From 595280f3cd3edd4bdfea439055280998f4b96b71 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:28:29 +0000 Subject: [PATCH 06/11] Update sbt to 1.10.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 04267b14..ee4c672c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.1 From c48a0b4d723718ac87093fff447e9fa47ae6a6d7 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:28:29 +0000 Subject: [PATCH 07/11] Update scanamo to 1.0.4 --- project/dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/dependencies.scala b/project/dependencies.scala index b235d338..e9a6e7b9 100644 --- a/project/dependencies.scala +++ b/project/dependencies.scala @@ -22,7 +22,7 @@ object Dependencies { "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jacksonVersion val log4j = "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4j2Version val commonsIo = "commons-io" % "commons-io" % "2.16.1" - val scanamo = "org.scanamo" %% "scanamo" % "1.0.1" + val scanamo = "org.scanamo" %% "scanamo" % "1.0.4" val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.12.0" val specsCore = "org.specs2" %% "specs2-core" % specsVersion % "test" val specsScalaCheck = From e3bd7fab711fc00bf0e6b8e60a3a9b434e616abf Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:28:29 +0000 Subject: [PATCH 08/11] Update specs2-core to 4.20.8 --- project/dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/dependencies.scala b/project/dependencies.scala index e9a6e7b9..645a8fa8 100644 --- a/project/dependencies.scala +++ b/project/dependencies.scala @@ -4,7 +4,7 @@ object Dependencies { val awsSdkVersion = "1.12.767" val log4j2Version = "2.17.2" val jacksonVersion = "2.17.2" - val specsVersion = "4.20.5" + val specsVersion = "4.20.8" val http4sVersion = "0.23.26" val awsLambda = "com.amazonaws" % "aws-lambda-java-core" % "1.2.3" From b68aba7b8400c06e8893aa4be2f3b56cd45b4cb2 Mon Sep 17 00:00:00 2001 From: Lindsey Dew <1202622+lindseydew@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:18:26 +0100 Subject: [PATCH 09/11] Remove -Ypartial-unification flag in compiler --- build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sbt b/build.sbt index c0bf6020..52b39f62 100644 --- a/build.sbt +++ b/build.sbt @@ -62,7 +62,6 @@ val commonSettings: immutable.Seq[Def.Setting[_]] = List( "-encoding", "UTF-8", "-release:21", - "-Ypartial-unification", "-Ywarn-dead-code" ) ) From 2ab3d144a362f3ac553ae5b416ab2545e3bf05cb Mon Sep 17 00:00:00 2001 From: Lindsey Dew <1202622+lindseydew@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:21:11 +0100 Subject: [PATCH 10/11] Make the dist upload agnostic of scala version --- .github/workflows/ci-mobile-save-for-later-user-deletion.yaml | 2 +- .github/workflows/ci-mobile-save-for-later.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml b/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml index c7885ab5..b5cb8793 100644 --- a/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml +++ b/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml @@ -32,4 +32,4 @@ jobs: mobile-save-for-later-user-deletion-cfn: - ./mobile-save-for-later-user-deletion/conf/cfn.yaml mobile-save-for-later-user-deletion: - - mobile-save-for-later-user-deletion/target/scala-2.12/mobile-save-for-later-user-deletion.jar \ No newline at end of file + - mobile-save-for-later-user-deletion/target/scala-*/mobile-save-for-later-user-deletion.jar \ No newline at end of file diff --git a/.github/workflows/ci-mobile-save-for-later.yaml b/.github/workflows/ci-mobile-save-for-later.yaml index 2b00fa54..7c4ee50c 100644 --- a/.github/workflows/ci-mobile-save-for-later.yaml +++ b/.github/workflows/ci-mobile-save-for-later.yaml @@ -41,4 +41,4 @@ jobs: - cdk/cdk.out/MobileSaveForLater-CODE.template.json - cdk/cdk.out/MobileSaveForLater-PROD.template.json mobile-save-for-later: - - mobile-save-for-later/target/scala-2.12/mobile-save-for-later.jar + - mobile-save-for-later/target/scala-*/mobile-save-for-later.jar From 32ab215ce5a1849778b8836d1f513292255f4f34 Mon Sep 17 00:00:00 2001 From: Lindsey Dew <1202622+lindseydew@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:23:45 +0100 Subject: [PATCH 11/11] Set the correct scala version for dist upload --- .github/workflows/ci-mobile-save-for-later-user-deletion.yaml | 2 +- .github/workflows/ci-mobile-save-for-later.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml b/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml index b5cb8793..5295446c 100644 --- a/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml +++ b/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml @@ -32,4 +32,4 @@ jobs: mobile-save-for-later-user-deletion-cfn: - ./mobile-save-for-later-user-deletion/conf/cfn.yaml mobile-save-for-later-user-deletion: - - mobile-save-for-later-user-deletion/target/scala-*/mobile-save-for-later-user-deletion.jar \ No newline at end of file + - mobile-save-for-later-user-deletion/target/scala-2.13/mobile-save-for-later-user-deletion.jar \ No newline at end of file diff --git a/.github/workflows/ci-mobile-save-for-later.yaml b/.github/workflows/ci-mobile-save-for-later.yaml index 7c4ee50c..c46c572f 100644 --- a/.github/workflows/ci-mobile-save-for-later.yaml +++ b/.github/workflows/ci-mobile-save-for-later.yaml @@ -41,4 +41,4 @@ jobs: - cdk/cdk.out/MobileSaveForLater-CODE.template.json - cdk/cdk.out/MobileSaveForLater-PROD.template.json mobile-save-for-later: - - mobile-save-for-later/target/scala-*/mobile-save-for-later.jar + - mobile-save-for-later/target/scala-2.13/mobile-save-for-later.jar