Merge branch 'main' into refactor-contacts-to-common

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "anghammarad-client-node/" # Location of package manifests
+    schedule:
+      interval: "monthly"

.github/workflows/sbt-dependency-graph.yaml

@@ -0,0 +1,14 @@
+name: Update Dependency Graph for SBT
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch: 
+jobs:
+  dependency-graph:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: scalacenter/sbt-dependency-submission@7ebd561e5280336d3d5b445a59013810ff79325e # v3.0.1
+    permissions:
+      contents: write

anghammarad-client-node/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @guardian/anghammarad
 
+## 1.8.3
+
+### Patch Changes
+
+- b19c952: Update `ws` dependency to 7.5.10
+
 ## 1.8.2
 
 ### Patch Changes

anghammarad-client-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guardian/anghammarad",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "Notification service for the Guardian's dev teams",
   "main": "dist/src/main.js",
   "types": "dist/src/main.d.ts",

anghammarad/src/main/scala/com/gu/anghammarad/messages/Messages.scala

@@ -57,7 +57,7 @@ object Messages {
     val markdownWithNotice = markdown + anghammaradNotice(notification)
     val plaintextWithNotice = plaintext + anghammaradNotice(notification)
 
-    val html = mdRenderer.render(mdParser.parse(markdownWithNotice))
+    val html = mdRenderer.render(mdParser.parse(markdownWithNotice)).replace("\n", "<br>")
 
     EmailMessage(
       notification.subject,

anghammarad/src/test/scala/com/gu/anghammarad/MessagesTest.scala

@@ -62,6 +62,14 @@ class MessagesTest extends AnyFreeSpec with Matchers with EitherValues {
     }
 
     "html" - {
+      "for all messages" - {
+        val notification = testNotification("subject", "message line 1\nmessage line 2")
+
+        "replaces newlines with <br> tags" in {
+          emailMessage(notification).html should include("message line 1<br>message line 2")
+        }
+      }
+
       "if actions are present" - {
         val notification = testNotification("subject", "message", Action("cta1", "url1"), Action("cta2", "url2"))
 

build.sbt

@@ -24,10 +24,10 @@ inThisBuild(Seq(
   licenses := Seq(License.Apache2),
 ))
 
-val awsSdkVersion = "1.12.742"
-val circeVersion = "0.14.7"
+val awsSdkVersion = "1.12.759"
+val circeVersion = "0.14.9"
 val flexmarkVersion = "0.64.8"
-val scalaTestVersion = "3.2.18"
+val scalaTestVersion = "3.2.19"
 val scalaLoggingVersion = "3.9.5"
 
 //Projects
@@ -82,7 +82,7 @@ lazy val anghammarad = project
     name := "anghammarad",
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0",
-      "com.amazonaws" % "aws-lambda-java-events" % "3.11.5",
+      "com.amazonaws" % "aws-lambda-java-events" % "3.12.0",
       "com.amazonaws" % "aws-lambda-java-core" % "1.2.3",
       "com.amazonaws" % "aws-java-sdk-lambda" % awsSdkVersion,
       "com.amazonaws" % "aws-java-sdk-ses" % awsSdkVersion,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.1

project/plugins.sbt

@@ -6,5 +6,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
 
 // for publishing the scala client
 addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")