Update versions of Scala and drop organize-imports

sideeffffect · Feb 2, 2024 · c274f32 · c274f32
1 parent a209bb3
commit c274f32
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/build.sbt b/build.sbt
@@ -35,7 +35,6 @@ lazy val commonSettings: List[Def.Setting[_]] = List(
   semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version
   ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value),
   ThisBuild / scalafixDependencies ++= List(
-    Dependencies.organizeImports,
     Dependencies.scaluzzi,
   ),
   scalacOptions ++= List(
@@ -132,9 +131,9 @@ addCommandAlias(
 
 addCommandAlias(
   "lint",
-  "; scalafmtSbtCheck; scalafmtCheckAll; Compile/scalafix --check; Test/scalafix --check",
+  "; scalafmtSbtCheck; scalafmtCheckAll; scalafixAll --check",
 )
 addCommandAlias(
   "fix",
-  "; Compile/scalafix; Test/scalafix; scalafmtSbt; scalafmtAll",
+  "; scalafixAll; scalafmtSbt; scalafmtAll",
 )
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -7,7 +7,6 @@ object Dependencies {
     val betterMonadicFor = "0.3.1"
     val kindProjector = "0.13.2"
     val missinglink = "0.2.9"
-    val organizeImports = "0.6.0"
     val sbtBuildinfo = "0.11.0"
     val sbtDynver = "5.0.1"
     val sbtMissinglink = "0.3.6"
@@ -25,7 +24,6 @@ object Dependencies {
   val betterMonadicFor = "com.olegpy" %% "better-monadic-for" % Versions.betterMonadicFor
   val kindProjector = "org.typelevel" %% "kind-projector" % Versions.kindProjector cross CrossVersion.full
   val missinglink = "com.spotify" % "missinglink-core" % Versions.missinglink
-  val organizeImports = "com.github.liancheng" %% "organize-imports" % Versions.organizeImports
   val sbtBuildinfo = "com.eed3si9n" % "sbt-buildinfo" % Versions.sbtBuildinfo
   val sbtDynver = "com.github.sbt" % "sbt-dynver" % Versions.sbtDynver
   val sbtMissinglink = "ch.epfl.scala" % "sbt-missinglink" % Versions.sbtMissinglink

diff --git a/src/main/scala/com/github/sideeffffect/sbtdecentscala/DecentScalaPlugin.scala b/src/main/scala/com/github/sideeffffect/sbtdecentscala/DecentScalaPlugin.scala
@@ -28,9 +28,9 @@ object DecentScalaPlugin extends AutoPlugin {
   }
 
   trait DecentScala {
-    def decentScalaVersion3 = "3.2.1"
-    def decentScalaVersion213 = "2.13.10"
-    def decentScalaVersion212 = "2.12.17" // scala-steward:off
+    def decentScalaVersion3 = "3.3.1"
+    def decentScalaVersion213 = "2.13.12"
+    def decentScalaVersion212 = "2.12.18" // scala-steward:off
     def decentScalaVersion211 = "2.11.12"
     def decentScalaSettings: List[Def.Setting[_]] =
       List(
@@ -74,7 +74,6 @@ object DecentScalaPlugin extends AutoPlugin {
         semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version
         ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value),
         ThisBuild / scalafixDependencies ++= List(
-          Dependencies.organizeImports,
           Dependencies.scaluzzi,
         ),
         scalacOptions ++= {
@@ -126,8 +125,8 @@ object DecentScalaPlugin extends AutoPlugin {
         addCommandAlias("check", "; lint; +missinglinkCheck; +versionPolicyCheck; +test") ++
         addCommandAlias(
           "lint",
-          "; scalafmtSbtCheck; scalafmtCheckAll; Compile/scalafix --check; Test/scalafix --check",
+          "; scalafmtSbtCheck; scalafmtCheckAll; scalafixAll --check",
         ) ++
-        addCommandAlias("fix", "; Compile/scalafix; Test/scalafix; scalafmtSbt; scalafmtAll")
+        addCommandAlias("fix", "; scalafixAll; scalafmtSbt; scalafmtAll")
   }
 }
diff --git a/src/main/scala/com/github/sideeffffect/sbtdecentscala/Dependencies.scala b/src/main/scala/com/github/sideeffffect/sbtdecentscala/Dependencies.scala
@@ -8,7 +8,6 @@ object Dependencies {
 
     val betterMonadicFor: String = "0.3.1"
     val kindProjector: String = "0.13.2"
-    val organizeImports: String = "0.6.0"
     val scaluzzi: String = "0.1.23"
     val silencer: String = "1.17.13"
     val zerowaste = "0.2.15"
@@ -18,7 +17,6 @@ object Dependencies {
   val betterMonadicFor: ModuleID = "com.olegpy" %% "better-monadic-for" % Versions.betterMonadicFor
   val kindProjector: ModuleID =
     "org.typelevel" %% "kind-projector" % Versions.kindProjector cross CrossVersion.full
-  val organizeImports: ModuleID = "com.github.liancheng" %% "organize-imports" % Versions.organizeImports
   val scaluzzi: ModuleID = "com.github.vovapolu" %% "scaluzzi" % Versions.scaluzzi
   val silencer: ModuleID = "com.github.ghik" % "silencer-plugin" % Versions.silencer cross CrossVersion.full
   val silencerLib: ModuleID =