Ajoute les règles scalafix de cats (#881)

betagouv · Dec 2, 2020 · 54f0697 · 54f0697
1 parent 331f6f7
commit 54f0697
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 12 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -1,5 +1,6 @@
 rules = [
   DisableSyntax
+  "github:typelevel/cats/Cats_v2_2_0"
 ]
 DisableSyntax.noUniversalEquality = true
 DisableSyntax.noUniversalEqualityMessage = "use === instead of == and =!= instead of !="
diff --git a/app/helper/StringHelper.scala b/app/helper/StringHelper.scala
@@ -1,8 +1,7 @@
 package helper
 
+import cats.syntax.all._
 import java.text.Normalizer
-
-import cats.implicits.catsSyntaxOptionId
 import org.apache.commons.lang3.StringUtils
 
 object StringHelper {

diff --git a/app/serializers/UserAndGroupCsvSerializer.scala b/app/serializers/UserAndGroupCsvSerializer.scala
@@ -3,7 +3,7 @@ package serializers
 import java.time.ZonedDateTime
 import java.util.UUID
 
-import cats.implicits.catsSyntaxOptionId
+import cats.syntax.all._
 import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat}
 import models.formModels.{UserFormData, UserGroupFormData}
 import helper.{PlayFormHelper, UUIDHelper}

diff --git a/app/views/emails/common.scala b/app/views/emails/common.scala
@@ -1,10 +1,9 @@
 package views.emails
 
+import cats.syntax.all._
 import constants.Constants
 import helper.Time
 import java.time.ZonedDateTime
-
-import cats.implicits.catsSyntaxOptionId
 import models._
 import scalatags.Text.all._
 

diff --git a/build.sbt b/build.sbt
@@ -14,7 +14,13 @@ lazy val root = (project in file("."))
     buildInfoPackage := "constants"
   )
 
-scalaVersion := "2.13.3"
+inThisBuild(
+  List(
+    scalaVersion := "2.13.3",
+    semanticdbEnabled := true, // enable SemanticDB
+    semanticdbVersion := scalafixSemanticdb.revision // use Scalafix compatible version
+  )
+)
 
 // https://docs.scala-lang.org/overviews/compiler-options/index.html
 scalacOptions ++= Seq(

diff --git a/test/browser/AnswerSpec.scala b/test/browser/AnswerSpec.scala
@@ -1,9 +1,8 @@
 package browser
 
+import cats.syntax.all._
 import helper.{Time, UUIDHelper}
 import java.util.UUID
-
-import cats.implicits.catsSyntaxOptionId
 import models.{Application, Area, LoginToken, User, UserGroup}
 import org.junit.runner._
 import org.specs2.mutable._

diff --git a/test/browser/ApplicationAccessSpec.scala b/test/browser/ApplicationAccessSpec.scala
@@ -1,6 +1,6 @@
 package browser
 
-import cats.implicits.catsSyntaxOptionId
+import cats.syntax.all._
 import helper.{Time, UUIDHelper}
 import models.{Application, Area, LoginToken, User, UserGroup}
 import org.junit.runner._

diff --git a/test/browser/ApplicationSpec.scala b/test/browser/ApplicationSpec.scala
@@ -1,6 +1,6 @@
 package browser
 
-import cats.implicits.catsSyntaxOptionId
+import cats.syntax.all._
 import helper.{Time, UUIDHelper}
 import models.{Area, LoginToken, User, UserGroup}
 import org.junit.runner._

diff --git a/test/browser/LoginSpec.scala b/test/browser/LoginSpec.scala
@@ -1,9 +1,8 @@
 package browser
 
+import cats.syntax.all._
 import helper.{Hash, Time, UUIDHelper}
 import java.time.ZonedDateTime
-
-import cats.implicits.catsSyntaxOptionId
 import models.{Area, LoginToken, User}
 import org.specs2.mutable._
 import org.specs2.runner._