chore: Upgrade to Scala 3 (#594)

* chore: Upgrade to Scala 3

* build: Cross-compile configTools for Scala 3 and Scala 2.13

* chore: Update scalafmt configuration to use Scala 3 dialect

Author: kelvin-chappell

.scalafmt.conf

@@ -1,2 +1,2 @@
 version = 3.9.3
-runner.dialect = scala213
+runner.dialect = scala3

app/controllers/Audit.scala

@@ -4,8 +4,13 @@ import aws.AuditTrailDB
 import com.gu.googleauth.AuthAction
 import com.gu.janus.model.JanusData
 import logic.Date
+import play.api.mvc.{
+  AbstractController,
+  Action,
+  AnyContent,
+  ControllerComponents
+}
 import play.api.{Logging, Mode}
-import play.api.mvc.{AbstractController, AnyContent, ControllerComponents}
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient
 
 class Audit(
@@ -16,63 +21,67 @@ class Audit(
     extends AbstractController(controllerComponents)
     with Logging {
 
-  def byAccount(account: String) = authAction { implicit request =>
-    val date = request.getQueryString(
-      "date"
-    ) flatMap Date.parseUtcDateStr getOrElse Date.todayUtc
-    val (startDate, endDate) = Date.weekAround(date)
-    logger.info(s"Getting logs for $account from $startDate to $endDate")
-    val auditLogs = AuditTrailDB.getAccountLogs(account, startDate, endDate)
-    val prevNextWeeks = Date.prevNextAuditWeeks(date)
-    Ok(
-      views.html.audit(
-        auditLogs,
-        Right(account),
-        startDate,
-        prevNextWeeks,
-        request.user,
-        janusData
+  def byAccount(account: String): Action[AnyContent] = authAction {
+    implicit request =>
+      val date = request.getQueryString(
+        "date"
+      ) flatMap Date.parseUtcDateStr getOrElse Date.todayUtc
+      val (startDate, endDate) = Date.weekAround(date)
+      logger.info(s"Getting logs for $account from $startDate to $endDate")
+      val auditLogs = AuditTrailDB.getAccountLogs(account, startDate, endDate)
+      val prevNextWeeks = Date.prevNextAuditWeeks(date)
+      Ok(
+        views.html.audit(
+          auditLogs,
+          Right(account),
+          startDate,
+          prevNextWeeks,
+          request.user,
+          janusData
+        )
       )
-    )
   }
 
-  def byUser(username: String) = authAction { implicit request =>
-    val date = request.getQueryString(
-      "date"
-    ) flatMap Date.parseUtcDateStr getOrElse Date.todayUtc
-    val (startDate, endDate) = Date.weekAround(date)
-    logger.info(s"Getting logs for $username from $startDate to $endDate")
-    val auditLogs = AuditTrailDB.getUserLogs(username, startDate, endDate)
-    val prevNextWeeks = Date.prevNextAuditWeeks(date)
-    Ok(
-      views.html.audit(
-        auditLogs,
-        Left(username),
-        startDate,
-        prevNextWeeks,
-        request.user,
-        janusData
+  def byUser(username: String): Action[AnyContent] = authAction {
+    implicit request =>
+      val date = request.getQueryString(
+        "date"
+      ) flatMap Date.parseUtcDateStr getOrElse Date.todayUtc
+      val (startDate, endDate) = Date.weekAround(date)
+      logger.info(s"Getting logs for $username from $startDate to $endDate")
+      val auditLogs = AuditTrailDB.getUserLogs(username, startDate, endDate)
+      val prevNextWeeks = Date.prevNextAuditWeeks(date)
+      Ok(
+        views.html.audit(
+          auditLogs,
+          Left(username),
+          startDate,
+          prevNextWeeks,
+          request.user,
+          janusData
+        )
       )
-    )
   }
 
-  def changeUserDate(username: String) = authAction { implicit request =>
-    val logDateStrOpt = for {
-      submission <- request.body.asFormUrlEncoded
-      logDateSubmission <- submission.get("audit-date")
-      logDateStr <- logDateSubmission.headOption
-    } yield logDateStr
-    val param = logDateStrOpt.fold("")(s => s"?date=$s")
-    SeeOther(s"/audit/user/$username$param")
+  def changeUserDate(username: String): Action[AnyContent] = authAction {
+    implicit request =>
+      val logDateStrOpt = for {
+        submission <- request.body.asFormUrlEncoded
+        logDateSubmission <- submission.get("audit-date")
+        logDateStr <- logDateSubmission.headOption
+      } yield logDateStr
+      val param = logDateStrOpt.fold("")(s => s"?date=$s")
+      SeeOther(s"/audit/user/$username$param")
   }
 
-  def changeAccountDate(account: String) = authAction { implicit request =>
-    val logDateStrOpt = for {
-      submission <- request.body.asFormUrlEncoded
-      logDateSubmission <- submission.get("audit-date")
-      logDateStr <- logDateSubmission.headOption
-    } yield logDateStr
-    val param = logDateStrOpt.fold("")(s => s"?date=$s")
-    SeeOther(s"/audit/account/$account$param")
+  def changeAccountDate(account: String): Action[AnyContent] = authAction {
+    implicit request =>
+      val logDateStrOpt = for {
+        submission <- request.body.asFormUrlEncoded
+        logDateSubmission <- submission.get("audit-date")
+        logDateStr <- logDateSubmission.headOption
+      } yield logDateStr
+      val param = logDateStrOpt.fold("")(s => s"?date=$s")
+      SeeOther(s"/audit/account/$account$param")
   }
 }

app/controllers/AuthController.scala

@@ -4,7 +4,7 @@ import com.gu.googleauth.{GoogleAuthConfig, GoogleGroupChecker, LoginSupport}
 import com.gu.janus.model.JanusData
 import play.api.Mode
 import play.api.libs.ws.WSClient
-import play.api.mvc._
+import play.api.mvc.*
 
 import scala.concurrent.ExecutionContext
 
@@ -25,21 +25,21 @@ class AuthController(
   override val failureRedirectTarget: Call = routes.AuthController.loginError
   override val defaultRedirectTarget: Call = routes.Janus.index
 
-  def login = Action.async { implicit request =>
+  def login: Action[AnyContent] = Action.async { implicit request =>
     startGoogleLogin()
   }
 
-  def loginError = Action { implicit request =>
+  def loginError: Action[AnyContent] = Action { implicit request =>
     val error =
       request.flash.get("error").getOrElse("There was an error logging in")
     Ok(views.html.error(error, None, janusData))
   }
 
-  def logout = Action { implicit request =>
+  def logout: Action[AnyContent] = Action { implicit request =>
     Redirect(routes.Janus.index).withNewSession
   }
 
-  def oauthCallback = Action.async { implicit request =>
+  def oauthCallback: Action[AnyContent] = Action.async { implicit request =>
     processOauth2Callback(requiredGoogleGroups, googleGroupChecker)
   }
 }