Merge pull request #332 from ua-parser/remove-scalafix

Drop scalafix

Author: thyandrecardoso

.github/workflows/scala.yml

@@ -24,6 +24,6 @@ jobs:
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
       - name: Check formatting
-        run: sbt -v "scalafixAll --check; scalafmtCheck"
+        run: sbt -v "scalafmtCheck"
       - name: Run tests
         run: sbt -v "++${{ matrix.scala-version }} clean; test;"

.scalafix.conf

@@ -1,13 +1,30 @@
 version = 3.10.2
 
 runner.dialect = scala3
+
 maxColumn = 120
+
 newlines.topLevelStatementBlankLines = [
   { blanks: { after: 0 } }
 ]
+
 fileOverride {
   "glob:**/*.sbt" {
     runner.dialect = sbt1
     align.preset = most
   }
 }
+
+rewrite {
+  rules = [AvoidInfix, Imports, RedundantBraces, RedundantParens, RemoveSemicolons]
+  redundantBraces.maxBreaks = 0
+  scala3.convertToNewSyntax = true
+  scala3.newSyntax.control = false
+
+  imports {
+    # 1) javax?/java, 2) scala, 3) everything else _not_ adstax, 4) adstax
+    groups = [["javax?\\..*"], ["scala\\..*"], [".*"], ["org\\.uaparser\\..*"]]
+    sort = ascii
+    selectors = fold
+  }
+}

.scalafmt.conf

@@ -29,10 +29,7 @@ lazy val commonSettings = Seq(
       case _            =>
         commonScalacOptions
     }
-  },
-  // Enable scalafix
-  semanticdbEnabled  := true,
-  semanticdbVersion  := scalafixSemanticdb.revision
+  }
 )
 
 lazy val lib = project
@@ -63,7 +60,7 @@ lazy val lib = project
     publishMavenStyle                            := true,
     publishTo                                    := {
       val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
-      if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
+      if (isSnapshot.value) Some("central-snapshots".at(centralSnapshots))
       else localStaging.value
     }
   )

build.sbt

@@ -23,10 +23,10 @@ private[scala] case class DevicePattern(
 
   private def replace(replacement: String, matcher: Matcher): String = {
     (if (replacement.contains("$") && matcher.groupCount() >= 1) {
-       (1 to matcher.groupCount()).foldLeft(replacement)((rep, i) => {
+       (1 to matcher.groupCount()).foldLeft(replacement) { (rep, i) =>
          val toInsert = if (matcher.group(i) ne null) matcher.group(i) else ""
          rep.replaceFirst("\\$" + i, Matcher.quoteReplacement(toInsert))
-       })
+       }
      } else replacement).trim
   }
 }

modules/lib/src/main/scala/org/uaparser/scala/DevicePattern.scala

@@ -39,7 +39,7 @@ private object OSPattern {
   private[this] def getBackreferenceGroup(replacement: String): Option[Int] =
     for {
       ref <- Option(replacement).filter(_.contains("$"))
-      groupOpt = allCatch opt ref.substring(1).toInt
+      groupOpt = allCatch.opt(ref.substring(1).toInt)
       group <- groupOpt
     } yield group
 

modules/lib/src/main/scala/org/uaparser/scala/OSPattern.scala

@@ -16,7 +16,6 @@ private[scala] object YamlUtil {
     }.toMap
   }
 
-  def loadYamlAsMap(yamlStream: InputStream): Map[String, List[Map[String, String]]] = {
+  def loadYamlAsMap(yamlStream: InputStream): Map[String, List[Map[String, String]]] =
     loadYamlAsMap(yamlStream, new Yaml(new SafeConstructor(new LoaderOptions)))
-  }
 }

modules/lib/src/main/scala/org/uaparser/scala/YamlUtil.scala

@@ -1,4 +1,3 @@
-addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"    % "0.14.4")
 addSbtPlugin("com.github.sbt"     % "sbt-pgp"         % "2.3.1")
 addSbtPlugin("com.github.sbt"     % "sbt-release"     % "1.4.0")
 addSbtPlugin("com.typesafe"       % "sbt-mima-plugin" % "1.1.4")