Update scala to 2.13.11

app/helper/MDLForms.scala

@@ -7,7 +7,7 @@ import views.html.helper.FieldConstructor
 
 /** Independent from the model. */
 object MDLForms {
-  implicit val inputFields = FieldConstructor(views.html.helpers.input.f)
+  implicit val inputFields: FieldConstructor = FieldConstructor(views.html.helpers.input.f)
 
   object repeatMap {
 

app/helper/MessageBirdApi.scala

@@ -23,7 +23,7 @@ object MessageBirdApi {
   case class SendSmsRequest(originator: String, body: String, recipients: List[String])
 
   object SendSmsRequest {
-    implicit val writes = Json.writes[SendSmsRequest]
+    implicit val writes: Writes[SendSmsRequest] = Json.writes[SendSmsRequest]
   }
 
   /** https://developers.messagebird.com/api/sms-messaging/#the-message-object */
@@ -40,8 +40,11 @@ object MessageBirdApi {
     case class Id(underlying: String)
 
     object Id {
-      implicit val reads = implicitly[Reads[String]].map(Id.apply)
-      implicit val writes = implicitly[Writes[String]].contramap((id: Sms.Id) => id.underlying)
+      implicit val reads: Reads[Id] = implicitly[Reads[String]].map(Id.apply)
+
+      implicit val writes: Writes[Id] =
+        implicitly[Writes[String]].contramap((id: Sms.Id) => id.underlying)
+
     }
 
     case class RecipientItem(
@@ -53,10 +56,10 @@ object MessageBirdApi {
 
     case class Recipients(items: List[RecipientItem])
 
-    implicit val itemFormats = Json.format[RecipientItem]
-    implicit val recipientFormats = Json.format[Recipients]
-    implicit val reads = Json.reads[Sms]
-    implicit val writes = Json.writes[Sms]
+    implicit val itemFormats: Format[RecipientItem] = Json.format[RecipientItem]
+    implicit val recipientFormats: Format[Recipients] = Json.format[Recipients]
+    implicit val reads: Reads[Sms] = Json.reads[Sms]
+    implicit val writes: Writes[Sms] = Json.writes[Sms]
 
   }
 

app/helper/OvhApi.scala

@@ -20,8 +20,11 @@ object OvhApi {
   case class SmsId(underlying: Long)
 
   object SmsId {
-    implicit val reads = implicitly[Reads[Long]].map(SmsId.apply)
-    implicit val writes = implicitly[Writes[Long]].contramap((id: SmsId) => id.underlying)
+    implicit val reads: Reads[SmsId] = implicitly[Reads[Long]].map(SmsId.apply)
+
+    implicit val writes: Writes[SmsId] =
+      implicitly[Writes[Long]].contramap((id: SmsId) => id.underlying)
+
   }
 
   /** https://eu.api.ovh.com/console/#/sms/{serviceName}/jobs#POST */
@@ -35,8 +38,8 @@ object OvhApi {
   )
 
   object SmsJob {
-    implicit val reads = Json.reads[SmsJob]
-    implicit val writes = Json.writes[SmsJob]
+    implicit val reads: Reads[SmsJob] = Json.reads[SmsJob]
+    implicit val writes: Writes[SmsJob] = Json.writes[SmsJob]
   }
 
   case class SmsSendingReport(
@@ -47,8 +50,8 @@ object OvhApi {
   )
 
   object SmsSendingReport {
-    implicit val reads = Json.reads[SmsSendingReport]
-    implicit val writes = Json.writes[SmsSendingReport]
+    implicit val reads: Reads[SmsSendingReport] = Json.reads[SmsSendingReport]
+    implicit val writes: Writes[SmsSendingReport] = Json.writes[SmsSendingReport]
   }
 
   case class IncomingSms(
@@ -60,8 +63,8 @@ object OvhApi {
   )
 
   object IncomingSms {
-    implicit val reads = Json.reads[IncomingSms]
-    implicit val writes = Json.writes[IncomingSms]
+    implicit val reads: Reads[IncomingSms] = Json.reads[IncomingSms]
+    implicit val writes: Writes[IncomingSms] = Json.writes[IncomingSms]
   }
 
 }

app/helper/Time.scala

@@ -71,7 +71,7 @@ object Time {
     recursion(toDate).toList
   }
 
-  implicit final val zonedDateTimeInstance =
+  implicit final val zonedDateTimeInstance: Order[ZonedDateTime] =
     new Order[ZonedDateTime] {
       override def compare(x: ZonedDateTime, y: ZonedDateTime): Int = x.compareTo(y)
     }

app/models/Application.scala

@@ -277,7 +277,7 @@ object Application {
     @SuppressWarnings(Array("scalafix:DisableSyntax.=="))
     implicit val Eq: Eq[Status] = (x: Status, y: Status) => x == y
 
-    implicit val Show = new Show[Status] {
+    implicit val Show: Show[Status] = new Show[Status] {
 
       override def show(status: Status) = status match {
         case Archived   => "Archivée"

app/models/dataModels.scala

@@ -21,10 +21,12 @@ object dataModels {
 
     object AnswerType {
 
-      implicit val answerTypeReads =
+      implicit val answerTypeReads: Reads[AnswerType] =
         implicitly[Reads[String]].map(models.Answer.AnswerType.fromString)
 
-      implicit val answerTypeWrites = implicitly[Writes[String]].contramap[AnswerType](_.name)
+      implicit val answerTypeWrites: Writes[AnswerType] =
+        implicitly[Writes[String]].contramap[AnswerType](_.name)
+
     }
 
     import AnswerType.{answerTypeReads, answerTypeWrites}
@@ -124,7 +126,7 @@ object dataModels {
         .read[UUID]
         .and((__ \ "last_seen_date").read[Instant])(models.Application.SeenByUser.apply _)
 
-      implicit val seenByUserWrites = (__ \ "user_id")
+      implicit val seenByUserWrites: Writes[SeenByUser] = (__ \ "user_id")
         .write[UUID]
         .and((__ \ "last_seen_date").write[Instant])(unlift(models.Application.SeenByUser.unapply))
 
@@ -213,14 +215,15 @@ object dataModels {
 
   object SmsFormats {
     import models.Sms
-    implicit val smsIdReads = implicitly[Reads[String]].map(Sms.ApiId.apply)
+    implicit val smsIdReads: Reads[Sms.ApiId] = implicitly[Reads[String]].map(Sms.ApiId.apply)
 
-    implicit val smsIdWrites =
+    implicit val smsIdWrites: Writes[Sms.ApiId] =
       implicitly[Writes[String]].contramap((id: Sms.ApiId) => id.underlying)
 
-    implicit val smsPhoneNumberReads = implicitly[Reads[String]].map(Sms.PhoneNumber.apply)
+    implicit val smsPhoneNumberReads: Reads[Sms.PhoneNumber] =
+      implicitly[Reads[String]].map(Sms.PhoneNumber.apply)
 
-    implicit val smsPhoneNumberWrites =
+    implicit val smsPhoneNumberWrites: Writes[Sms.PhoneNumber] =
       implicitly[Writes[String]].contramap((id: Sms.PhoneNumber) => id.internationalPhoneNumber)
 
     // Not implicits, so they are not picked as serializers/deserializers of `Sms`

app/serializers/ApiModel.scala

@@ -10,21 +10,21 @@ import play.api.libs.json._
 object ApiModel {
 
   object implicits {
-    implicit val areaFormat = Json.format[Area]
+    implicit val areaFormat: Format[Area] = Json.format[Area]
 
-    implicit val organisationIdReads =
+    implicit val organisationIdReads: Reads[Organisation.Id] =
       implicitly[Reads[String]].map(Organisation.Id.apply)
 
-    implicit val organisationIdWrites =
+    implicit val organisationIdWrites: Writes[Organisation.Id] =
       implicitly[Writes[String]].contramap[Organisation.Id](_.id)
 
-    implicit val organisationFormat = Json.format[Organisation]
+    implicit val organisationFormat: Format[Organisation] = Json.format[Organisation]
   }
 
   case class ApiError(message: String)
 
   object ApiError {
-    implicit val apiErrorWrites = Json.writes[ApiError]
+    implicit val apiErrorWrites: Writes[ApiError] = Json.writes[ApiError]
   }
 
   // API model for the admin deploiement
@@ -40,7 +40,8 @@ object ApiModel {
       phone: Option[String]
   )
 
-  implicit val franceServiceInstanceLineFormat = Json.format[FranceServiceInstanceLine]
+  implicit val franceServiceInstanceLineFormat: Format[FranceServiceInstanceLine] =
+    Json.format[FranceServiceInstanceLine]
 
   case class FranceServices(franceServices: List[FranceServices.Line])
 
@@ -90,20 +91,28 @@ object ApiModel {
     case class InsertsResult(inserts: List[InsertResult])
 
     object NewMatricules {
-      implicit val franceServicesNewMatriculeReads = Json.reads[NewMatricule]
-      implicit val franceServicesNewMatriculesReads = Json.reads[NewMatricules]
+      implicit val franceServicesNewMatriculeReads: Reads[NewMatricule] = Json.reads[NewMatricule]
+
+      implicit val franceServicesNewMatriculesReads: Reads[NewMatricules] =
+        Json.reads[NewMatricules]
+
     }
 
     object Update {
-      implicit val franceServicesMatriculeUpdateReads = Json.reads[MatriculeUpdate]
-      implicit val franceServicesGroupUpdateReads = Json.reads[GroupUpdate]
-      implicit val franceServicesUpdateReads = Json.reads[Update]
+
+      implicit val franceServicesMatriculeUpdateReads: Reads[MatriculeUpdate] =
+        Json.reads[MatriculeUpdate]
+
+      implicit val franceServicesGroupUpdateReads: Reads[GroupUpdate] = Json.reads[GroupUpdate]
+      implicit val franceServicesUpdateReads: Reads[Update] = Json.reads[Update]
     }
 
-    implicit val franceServicesLineWrites = Json.writes[FranceServices.Line]
-    implicit val franceServicesWrites = Json.writes[FranceServices]
-    implicit val franceServicesInsertResult = Json.writes[InsertResult]
-    implicit val franceServicesInsertsResult = Json.writes[InsertsResult]
+    implicit val franceServicesLineWrites: Writes[FranceServices.Line] =
+      Json.writes[FranceServices.Line]
+
+    implicit val franceServicesWrites: Writes[FranceServices] = Json.writes[FranceServices]
+    implicit val franceServicesInsertResult: Writes[InsertResult] = Json.writes[InsertResult]
+    implicit val franceServicesInsertsResult: Writes[InsertsResult] = Json.writes[InsertsResult]
   }
 
   object DeploymentData {
@@ -121,9 +130,9 @@ object ApiModel {
         numOfOrganisationSetWithOneInstructor: Int
     )
 
-    implicit val organisationSetFormat = Json.format[OrganisationSet]
-    implicit val areaDataFormat = Json.format[AreaData]
-    implicit val deploymentDataFormat = Json.format[DeploymentData]
+    implicit val organisationSetFormat: Format[OrganisationSet] = Json.format[OrganisationSet]
+    implicit val areaDataFormat: Format[AreaData] = Json.format[AreaData]
+    implicit val deploymentDataFormat: Format[DeploymentData] = Json.format[DeploymentData]
 
   }
 
@@ -137,14 +146,14 @@ object ApiModel {
   case class SelectableGroup(id: UUID, name: String, organisationId: String, areaId: UUID)
 
   object SelectableGroup {
-    implicit val format = Json.format[SelectableGroup]
+    implicit val format: Format[SelectableGroup] = Json.format[SelectableGroup]
   }
 
   object UserInfos {
     case class Group(id: UUID, name: String)
 
-    implicit val userInfosGroupFormat = Json.format[UserInfos.Group]
-    implicit val userInfosFormat = Json.format[UserInfos]
+    implicit val userInfosGroupFormat: Format[UserInfos.Group] = Json.format[UserInfos.Group]
+    implicit val userInfosFormat: Format[UserInfos] = Json.format[UserInfos]
 
     def fromUser(user: User, idToGroup: Map[UUID, UserGroup]): UserInfos = {
       val completeName = {
@@ -207,7 +216,7 @@ object ApiModel {
   object UserGroupInfos {
     import implicits._
 
-    implicit val userGroupInfosFormat = Json.format[UserGroupInfos]
+    implicit val userGroupInfosFormat: Format[UserGroupInfos] = Json.format[UserGroupInfos]
 
     def fromUserGroup(group: UserGroup): UserGroupInfos =
       UserGroupInfos(
@@ -237,7 +246,7 @@ object ApiModel {
   case class SearchResult(users: List[UserInfos], groups: List[UserGroupInfos])
 
   object SearchResult {
-    implicit val searchResultFormat = Json.format[SearchResult]
+    implicit val searchResultFormat: Format[SearchResult] = Json.format[SearchResult]
   }
 
   // Embedded classes are here to avoid the 22 fields limit in Play Json
@@ -279,9 +288,14 @@ object ApiModel {
         groupNamesInvitedOnAnswers: String,
     )
 
-    implicit val applicationMetadataStatsWrites = Json.writes[ApplicationMetadata.Stats]
-    implicit val applicationMetadataGroupsWrites = Json.writes[ApplicationMetadata.Groups]
-    implicit val applicationMetadataWrites = Json.writes[ApplicationMetadata]
+    implicit val applicationMetadataStatsWrites: Writes[ApplicationMetadata.Stats] =
+      Json.writes[ApplicationMetadata.Stats]
+
+    implicit val applicationMetadataGroupsWrites: Writes[ApplicationMetadata.Groups] =
+      Json.writes[ApplicationMetadata.Groups]
+
+    implicit val applicationMetadataWrites: Writes[ApplicationMetadata] =
+      Json.writes[ApplicationMetadata]
 
     // Groups needed: creator groups + invited groups at creation + invited groups on answers
     def fromApplication(
@@ -362,7 +376,10 @@ object ApiModel {
   case class ApplicationMetadataResult(applications: List[ApplicationMetadata])
 
   object ApplicationMetadataResult {
-    implicit val applicationMetadataResultWrites = Json.writes[ApplicationMetadataResult]
+
+    implicit val applicationMetadataResultWrites: Writes[ApplicationMetadataResult] =
+      Json.writes[ApplicationMetadataResult]
+
   }
 
 }

app/serializers/JsonFormats.scala

@@ -7,9 +7,11 @@ import play.api.libs.json._
 import play.api.libs.functional.syntax._
 
 object JsonFormats {
-  implicit val jsonConfiguration = JsonConfiguration(naming = JsonNaming.SnakeCase)
 
-  implicit val mapUUIDReads = new Reads[Map[UUID, String]] {
+  implicit val jsonConfiguration: JsonConfiguration =
+    JsonConfiguration(naming = JsonNaming.SnakeCase)
+
+  implicit val mapUUIDReads: Reads[Map[UUID, String]] = new Reads[Map[UUID, String]] {
 
     def reads(jv: JsValue): JsResult[Map[UUID, String]] =
       JsSuccess(jv.as[Map[String, String]].map { case (k, v) =>
@@ -18,7 +20,7 @@ object JsonFormats {
 
   }
 
-  implicit val mapUUIDWrites = new Writes[Map[UUID, String]] {
+  implicit val mapUUIDWrites: Writes[Map[UUID, String]] = new Writes[Map[UUID, String]] {
 
     def writes(map: Map[UUID, String]): JsValue =
       Json.obj(map.map { case (s, o) =>
@@ -28,6 +30,6 @@ object JsonFormats {
 
   }
 
-  implicit val mapUUIDFormat = Format(mapUUIDReads, mapUUIDWrites)
+  implicit val mapUUIDFormat: Format[Map[UUID, String]] = Format(mapUUIDReads, mapUUIDWrites)
 
 }

app/services/FileService.scala

@@ -1,6 +1,7 @@
 package services
 
 import akka.Done
+import akka.actor.ActorSystem
 import akka.stream.scaladsl._
 import anorm._
 import aplus.macros.Macros
@@ -29,7 +30,7 @@ class FileService @Inject() (
     notificationsService: NotificationService,
     system: ActorSystemProvider
 )(implicit ec: ExecutionContext) {
-  implicit val actorSystem = system.get
+  implicit val actorSystem: ActorSystem = system.get
 
   // Play is supposed to give us temporary files here
   def saveFiles(

app/services/OrganisationService.scala

@@ -28,8 +28,8 @@ object OrganisationService {
 
     }
 
-    implicit val subjectFormat = yamlFormat2(Subject.apply)
-    implicit val categoryFormat = yamlFormat4(Category.apply)
+    implicit val subjectFormat: YamlFormat[Subject] = yamlFormat2(Subject.apply)
+    implicit val categoryFormat: YamlFormat[Category] = yamlFormat4(Category.apply)
   }
 
   implicit private object fsCsvFormat extends DefaultCSVFormat {

build.sbt

@@ -20,7 +20,7 @@ lazy val root = (project in file("."))
 
 inThisBuild(
   List(
-    scalaVersion := "2.13.10",
+    scalaVersion := "2.13.11",
     semanticdbEnabled := true, // enable SemanticDB
     semanticdbVersion := scalafixSemanticdb.revision // use Scalafix compatible version
   )