Skip to content

Commit

Permalink
Merge pull request #116 from guardian/update/non_aws
Browse files Browse the repository at this point in the history
chore(deps): Non-AWS dependency updates
  • Loading branch information
lindseydew authored Aug 14, 2024
2 parents 55b29e8 + 32ab215 commit fa775e7
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
- mobile-save-for-later-user-deletion/target/scala-2.13/mobile-save-for-later-user-deletion.jar
2 changes: 1 addition & 1 deletion .github/workflows/ci-mobile-save-for-later.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-2.13/mobile-save-for-later.jar
3 changes: 1 addition & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,12 @@ 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",
"UTF-8",
"-release:21",
"-Ypartial-unification",
"-Ywarn-dead-code"
)
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
8 changes: 4 additions & 4 deletions project/dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -22,9 +22,9 @@ object Dependencies {
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jacksonVersion
val jacksonCore = "com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion
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 commonsIo = "commons-io" % "commons-io" % "2.16.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 =
"org.specs2" %% "specs2-scalacheck" % specsVersion % "test"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

Expand Down

0 comments on commit fa775e7

Please sign in to comment.