Switch to Scala 2.13

admin/app/controllers/admin/TroubleshooterController.scala

@@ -11,7 +11,7 @@ import play.api.libs.ws.WSClient
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import tools.LoadBalancer
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.util.Random

admin/app/dfp/DfpApi.scala

@@ -4,6 +4,7 @@ package dfp
 // https://developers.google.com/ad-manager/api/pqlreference
 import com.google.api.ads.admanager.axis.utils.v202108.StatementBuilder
 import com.google.api.ads.admanager.axis.v202108._
+import com.madgag.scala.collection.decorators.MapDecorator
 import common.GuLogging
 import common.dfp._
 import org.joda.time.DateTime
@@ -31,7 +32,7 @@ class DfpApi(dataMapper: DataMapper, dataValidation: DataValidation) extends GuL
     // item, potentially making one API call per lineitem.
     val validatedLineItems = lineItems
       .groupBy(Function.tupled(dataValidation.isGuLineItemValid))
-      .mapValues(_.map(_._1))
+      .mapV(_.map(_._1))
 
     DfpLineItems(
       validItems = validatedLineItems.getOrElse(true, Nil),

admin/app/dfp/SessionWrapper.scala

@@ -10,7 +10,7 @@ import common.GuLogging
 import conf.{AdminConfiguration, Configuration}
 import dfp.Reader.read
 import dfp.SessionLogger.{logAroundCreate, logAroundPerform, logAroundRead, logAroundReadSingle}
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import scala.util.control.NonFatal
 

admin/app/football/model/PA.scala

@@ -1,11 +1,10 @@
 package football.model
 
 import pa.{Season, Team}
-import implicits.Collections
 
 import java.time.ZoneId
 
-object PA extends Collections {
+object PA {
 
   val competitionNames = Map[String, String](
     ("100", "Premier League"),

admin/app/jobs/AnalyticsSanityCheckJob.scala

@@ -9,7 +9,7 @@ import model.diagnostics.CloudWatch
 import java.time.{LocalDateTime, ZoneId}
 import services.{CloudWatchStats, OphanApi}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.{ExecutionContext, Future}
 
 class AnalyticsSanityCheckJob(ophanApi: OphanApi) extends GuLogging {

admin/app/jobs/FastlyCloudwatchLoadJob.scala

@@ -1,6 +1,7 @@
 package jobs
 
 import com.amazonaws.services.cloudwatch.model.StandardUnit
+import com.madgag.scala.collection.decorators.MapDecorator
 import common.GuLogging
 import metrics.SamplerMetric
 import model.diagnostics.CloudWatch
@@ -61,8 +62,8 @@ class FastlyCloudwatchLoadJob(fastlyStatisticService: FastlyStatisticService) ex
       }
 
       val groups = fresh groupBy { _.key }
-      val timestampsSent = groups mapValues { _ map { _.timestamp } }
-      timestampsSent mapValues { _.max } foreach {
+      val timestampsSent = groups mapV { _ map { _.timestamp } }
+      timestampsSent mapV { _.max } foreach {
         case (key, value) =>
           latestTimestampsSent.update(key, value)
       }

admin/app/model/abtests/AbTestJob.scala

@@ -4,7 +4,7 @@ import common.GuLogging
 import tools.CloudWatch
 import views.support.CamelCase
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.ExecutionContext
 
 object AbTestJob extends GuLogging {

admin/app/services/EmailService.scala

@@ -8,7 +8,7 @@ import com.amazonaws.services.simpleemail.model.{Destination => EmailDestination
 import common.{AkkaAsync, GuLogging}
 import conf.Configuration.aws.mandatoryCredentials
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.duration._
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.util.control.NonFatal

admin/app/tools/AssetMetrics.scala

@@ -6,7 +6,7 @@ import common.{Box, GuLogging}
 import org.joda.time.DateTime
 import tools.CloudWatch._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.{ExecutionContext, Future}
 import scala.math.BigDecimal
 import scala.util.control.NonFatal

admin/app/tools/CloudWatch.scala

@@ -12,7 +12,7 @@ import conf.Configuration
 import conf.Configuration._
 import org.joda.time.DateTime
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.{ExecutionContext, Future}
 
 case class MaximumMetric(metric: GetMetricStatisticsResult) {

admin/app/tools/LoadBalancer.scala

@@ -3,7 +3,7 @@ package tools
 import common.{Box, GuLogging}
 import com.amazonaws.services.elasticloadbalancing.AmazonElasticLoadBalancingClient
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class LoadBalancer(
     id: String,

admin/app/tools/charts/charts.scala

@@ -7,7 +7,7 @@ import common.editions.Uk
 import org.joda.time.{DateTime, DateTimeZone}
 import play.api.libs.json._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.mutable.{Map => MutableMap}
 
 case class ChartRow[K](rowKey: K, values: Seq[Double])
@@ -118,9 +118,11 @@ class AwsLineChart(
     val dataColumns = labels.tail
     val table = new ChartTable(dataColumns)
 
-    (dataColumns, charts.toList).zipped.map((column, chart) => {
-      table.addColumn(column, ChartColumn(chart.getDatapoints.asScala))
-    })
+    dataColumns
+      .lazyZip(charts.toList)
+      .map((column, chart) => {
+        table.addColumn(column, ChartColumn(chart.getDatapoints.asScala.toSeq))
+      })
 
     table.asChartRow(toLabel, toValue)
   }
@@ -158,8 +160,9 @@ class ABDataChart(name: String, ablabels: Seq[String], format: ChartFormat, char
   private val dataColumns: Seq[(String, ChartColumn)] = {
 
     // Do not consider any metrics that have less than three data points.
-    (ablabels.tail, charts.toList).zipped
-      .map((column, chart) => (column, ChartColumn(chart.getDatapoints.asScala)))
+    ablabels.tail
+      .lazyZip(charts.toList)
+      .map((column, chart) => (column, ChartColumn(chart.getDatapoints.asScala.toSeq)))
       .filter { case (label, column) => column.values.length > 3 }
   }
 

applications/test/GalleryTemplateTest.scala

@@ -5,7 +5,7 @@ import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.DoNotDiscover
 import org.scalatest.matchers.should.Matchers
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @DoNotDiscover class GalleryTemplateTest extends AnyFlatSpec with Matchers with ConfiguredTestSuite {
 

applications/test/IndexFeatureTest.scala

@@ -5,7 +5,7 @@ import org.scalatest._
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalatest.matchers.should.Matchers
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @DoNotDiscover class IndexFeatureTest extends AnyFeatureSpec with GivenWhenThen with Matchers with ConfiguredTestSuite {
 

applications/test/InteractiveTemplateTest.scala

@@ -4,7 +4,7 @@ import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.DoNotDiscover
 import org.scalatest.matchers.should.Matchers
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @DoNotDiscover class InteractiveTemplateTest extends AnyFlatSpec with Matchers with ConfiguredTestSuite {
 

applications/test/SectionTemplateTest.scala

@@ -7,7 +7,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.DoNotDiscover
 import play.api.test.TestBrowser
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @DoNotDiscover class SectionTemplateTest extends AnyFlatSpec with Matchers with ConfiguredTestSuite {
 

applications/test/TagFeatureTest.scala

@@ -3,7 +3,7 @@ package test
 import org.scalatest.{DoNotDiscover, GivenWhenThen}
 import services.IndexPagePagination
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import conf.switches.Switches
 import org.fluentlenium.core.domain.{FluentList, FluentWebElement}
 import org.scalatest.featurespec.AnyFeatureSpec

applications/test/common/CombinerFeatureTest.scala

@@ -5,7 +5,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.{DoNotDiscover, GivenWhenThen}
 import test.ConfiguredTestSuite
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @DoNotDiscover class CombinerFeatureTest
     extends AnyFeatureSpec

applications/test/package.scala

@@ -4,7 +4,7 @@ import java.util.{List => JList}
 import org.scalatest.Suites
 import services.{FacebookGraphApiTest, IndexPageTest, InteractivePickerTest, NewspaperControllerTest}
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object `package` {
 

archive/test/package.scala

@@ -3,7 +3,7 @@ package test
 import java.util.{List => JList}
 import org.scalatest.Suites
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object `package` {
 

article/app/services/dotcomponents/ArticlePicker.scala

@@ -1,5 +1,6 @@
 package services.dotcomponents
 
+import com.madgag.scala.collection.decorators.MapDecorator
 import implicits.Requests._
 import model.{ArticlePage, PageWithStoryPackage}
 import play.api.mvc.RequestHeader
@@ -37,7 +38,7 @@ object ArticlePicker {
 
   private[this] def dcrArticle100PercentPage(page: PageWithStoryPackage, request: RequestHeader): Boolean = {
     val allowListFeatures = dcrChecks(page, request)
-    val article100PercentPageFeatures = allowListFeatures.filterKeys(
+    val article100PercentPageFeatures = allowListFeatures.view.filterKeys(
       Set(
         "isSupportedType",
         "isNotAGallery",
@@ -63,7 +64,7 @@ object ArticlePicker {
     val pageTones = page.article.tags.tones.map(_.id).mkString(", ")
 
     // include features that we wish to log but not allow-list against
-    val features = checks.mapValues(_.toString) +
+    val features = checks.mapV(_.toString) +
       ("isArticle100PercentPage" -> isArticle100PercentPage.toString) +
       ("dcrCouldRender" -> dcrCanRender.toString) +
       ("pageTones" -> pageTones)

article/app/topics/TopicS3Client.scala

@@ -11,7 +11,7 @@ import services.S3
 import topics.S3ObjectImplicits.RichS3Object
 import model.TopicsApiResponse._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.Future
 import scala.util.{Failure, Success, Try}
 

article/test/AnalyticsFeatureTest.scala

@@ -2,7 +2,7 @@ package test
 
 import org.scalatest.{DoNotDiscover, GivenWhenThen}
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import org.fluentlenium.core.domain.FluentWebElement
 import conf.Configuration
 import org.scalatest.featurespec.AnyFeatureSpec

build.sbt

@@ -35,6 +35,7 @@ val common = library("common")
       rome,
       romeModules,
       scalaCheck,
+      scalaCollectionPlus,
       nScalaTime,
       ws,
       faciaFapiScalaClient,

commercial/app/controllers/BookOffersController.scala

@@ -17,7 +17,6 @@ class BookOffersController(
 ) extends BaseController
     with ImplicitControllerExecutionContext
     with GuLogging
-    with implicits.Collections
     with implicits.Requests {
 
   private def booksSample(isbns: Seq[String], segment: Segment): Seq[Book] =

commercial/app/model/hosted/HostedAmp.scala

@@ -3,7 +3,7 @@ package model.hosted
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object HostedAmp {
 

common/app/common/Assets/DiscussionAssets.scala

@@ -1,6 +1,7 @@
 package common.Assets
 
 import app.LifecycleComponent
+import com.madgag.scala.collection.decorators.MapDecorator
 import common.{Box, GuLogging, GuardianConfiguration, JobScheduler}
 import conf.switches.Switches
 import play.api.libs.ws.{WSClient, WSResponse}
@@ -106,7 +107,7 @@ object DiscussionAssetsMap {
   private lazy val agent = Box[Map[String, String]](Map.empty)
 
   def alter(map: Map[String, String], baseURI: URI): Future[Map[String, String]] = {
-    agent.alter(map.mapValues(value => baseURI.resolve(value).toString))
+    agent.alter(map.mapV(value => baseURI.resolve(value).toString))
   }
 
   def getURL(assetName: String): String = {

common/app/common/GuLogging.scala

@@ -5,7 +5,7 @@ import play.api.Logger
 import org.apache.commons.lang.exception.ExceptionUtils
 import net.logstash.logback.marker.LogstashMarker
 import net.logstash.logback.marker.Markers._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.{ExecutionContext, Future}
 import scala.language.implicitConversions
 import scala.util.{Failure, Success, Try}

common/app/common/InlineStyles.scala

@@ -9,7 +9,7 @@ import org.w3c.css.sac.InputSource
 import org.w3c.dom.css.{CSSRuleList, CSSRule => W3CSSRule}
 import play.twirl.api.Html
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.immutable.ListMap
 import scala.util.{Failure, Success}
 

common/app/common/LinkTo.scala

@@ -6,7 +6,7 @@ import model.Trail
 import org.jsoup.Jsoup
 import play.api.mvc.{AnyContent, Request, RequestHeader, Result}
 import play.twirl.api.Html
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /*
  * Builds absolute links to the core site (www.theguardian.com)

common/app/common/Properties.scala

@@ -2,7 +2,7 @@ package common
 
 import java.io.{File, FileInputStream, InputStream}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.net.URL
 import java.nio.charset.Charset
 

common/app/common/RequestLogger.scala

@@ -34,8 +34,8 @@ case class RequestLoggerFields(request: Option[RequestHeader], response: Option[
       }
       .getOrElse(Map.empty[String, String])
 
-    val allowListedHeaders = allHeadersFields.filterKeys(allowListedHeaderNames.contains)
-    val guardianSpecificHeaders = allHeadersFields.filterKeys(_.toUpperCase.startsWith("X-GU-"))
+    val allowListedHeaders = allHeadersFields.view.filterKeys(allowListedHeaderNames.contains).toMap
+    val guardianSpecificHeaders = allHeadersFields.view.filterKeys(_.toUpperCase.startsWith("X-GU-")).toMap
 
     (allowListedHeaders ++ guardianSpecificHeaders).toList.map {
       case (headerName, headerValue) =>

common/app/common/SQSQueues.scala

@@ -7,7 +7,7 @@ import com.amazonaws.services.sqs.AmazonSQSAsync
 import com.amazonaws.services.sqs.model.{Message => AWSMessage, _}
 import play.api.libs.json.{Json, Reads, Writes}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.mutable
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.util.{Failure, Success}

common/app/common/Seqs.scala

@@ -1,8 +1,10 @@
 package common
 
+import com.madgag.scala.collection.decorators.MapDecorator
+
 object Seqs {
   implicit class RichSeq[A](as: Seq[A]) {
-    def frequencies: Map[A, Int] = as.groupBy(identity).mapValues(_.length)
+    def frequencies: Map[A, Int] = as.groupBy(identity).mapV(_.length)
 
     def isDescending(implicit ordering: Ordering[A]): Boolean = as == reverseSorted
 

common/app/common/ShowcaseRSSModules.scala

@@ -11,7 +11,7 @@ import org.joda.time.DateTime
 import org.joda.time.format.ISODateTimeFormat
 
 import java.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class RssAtomModule extends com.sun.syndication.feed.module.Module with Serializable {
   override def getUri: String = RssAtomModule.URI