Skip to content

Commit 942563f

Browse files
Merge branch 'main' into update/aws
2 parents 08cace6 + 1c7da74 commit 942563f

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

.github/workflows/check-labels.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ on:
66
types: [opened, labeled, unlabeled, synchronize, reopened, edited]
77
jobs:
88
require-label:
9-
uses: guardian/.github/.github/workflows/require-label.yaml@4cb5024736632ffcc564b7f4b772c38b8e5ce739 # v2.0.0
9+
uses: guardian/.github/.github/workflows/require-label.yaml@6dbd851a2512260c2ad854b62c170e2919b7005c # v3.1.1

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
stale:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
18+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
1919
id: stale
2020
# Read about options here: https://github.com/actions/stale#all-options
2121
with:

.scala-steward.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
pullRequests.grouping = [
2+
{ name = "patches", "title" = "Patch updates", "filter" = [{"version" = "patch"}] },
3+
]

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ organization := "com.gu"
33
version := "3.8.1"
44

55
// be sure to also update this in the `generate-executable.sh` script
6-
scalaVersion := "3.7.4"
6+
scalaVersion := "3.3.7"
77

88
// Enable BuildInfo plugin to generate version information
99
enablePlugins(BuildInfoPlugin)
@@ -19,9 +19,9 @@ libraryDependencies ++= Seq(
1919
"software.amazon.awssdk" % "rds" % awsSdkVersion,
2020
"com.github.scopt" %% "scopt" % "4.1.0",
2121
"com.googlecode.lanterna" % "lanterna" % "3.1.3",
22-
"ch.qos.logback" % "logback-classic" % "1.5.27",
22+
"ch.qos.logback" % "logback-classic" % "1.5.32",
2323
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.6",
24-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.21.0",
24+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.21.1",
2525
"org.bouncycastle" % "bcpkix-jdk18on" % "1.83",
2626
"org.scalatest" %% "scalatest" % "3.2.19" % Test
2727
)

generate-executable.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
3-
SCALA_FOLDER="scala-3.7.2"
3+
SCALA_FOLDER="scala-3.3.7"
44
cd $DIR
55
sbt assembly
66
cat "$DIR/generate-executable-prefix" "$DIR/target/$SCALA_FOLDER/ssm.jar" > "$DIR/target/$SCALA_FOLDER/ssm"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.12.2
1+
sbt.version=1.12.5

0 commit comments

Comments
 (0)