Get scalafix working, mostly

.github/workflows/build.yml

@@ -12,4 +12,4 @@ jobs:
     - uses: actions/setup-java@v1
       with:
         java-version: 11
-    - run: sbt scalafmtCheckAll test scripted
+    - run: sbt scalafmtCheckAll "scalafixAll --check" test scripted

.scalafix.conf

@@ -1,3 +1,4 @@
 rules = [
   OrganizeImports
+  RemoveUnused
 ]

build.sbt

@@ -22,26 +22,12 @@ scriptedBatchExecution := true
 scriptedParallelInstances := 8
 
 // Scalafix
-/*
 semanticdbEnabled := true
 semanticdbVersion := scalafixSemanticdb.revision
 scalacOptions ++= {
   scalaBinaryVersion.value match {
-    case "2.12" =>
-      Seq(
-        "-Ywarn-unused-import",
-        s"-P:semanticdb:sourceroot:${baseDirectory.value}"
-      )
-    case _      =>
-      Seq("-Wunused:imports")
-  }
-}
-*/
-
-scalacOptions ++= {
-  scalaBinaryVersion.value match {
-    case "2.12" => Nil
-    case _      => Seq("-language:implicitConversions")
+    case "2.12" => Seq("-Ywarn-unused-import")
+    case _      => Seq.empty // ("-Wunused:imports")
   }
 }
 

src/main/scala-2/com/earldouglas/sbt/war/Compat.scala

@@ -0,0 +1,13 @@
+package com.earldouglas.sbt.war
+
+import sbt.Keys._
+import sbt.Keys.{`package` => pkg}
+import sbt._
+
+object Compat {
+  val Compile_pkg_artifact = Compile / pkg / artifact
+  val Compile_sourceDirectory = Compile / sourceDirectory
+  val Compile_target = Compile / target
+  val Global_onLoad = Global / onLoad
+  val pkg_artifact = pkg / artifact
+}

src/main/scala-3/com/earldouglas/sbt/war/Compat.scala

@@ -0,0 +1,16 @@
+package com.earldouglas.sbt.war
+
+import sbt.Keys._
+import sbt.Keys.{`package` => pkg}
+import sbt._
+import sbt.given
+
+import scala.language.implicitConversions
+
+object Compat {
+  val Compile_pkg_artifact = Compile / pkg / artifact
+  val Compile_sourceDirectory = Compile / sourceDirectory
+  val Compile_target = Compile / target
+  val Global_onLoad = Global / onLoad
+  val pkg_artifact = pkg / artifact
+}

src/main/scala/com/earldouglas/sbt/war/WarPackagePlugin.scala

@@ -1,9 +1,8 @@
 package com.earldouglas.sbt.war
 
-import sbt.Keys.artifact
-import sbt.Keys.moduleName
+import sbt.Keys._
 import sbt.Keys.{`package` => pkg}
-import sbt.{given, _}
+import sbt._
 
 /** Identifies the files that compose the .war file (resources, .class
   * files in the classes/ directory, and .jar files in the lib/
@@ -15,7 +14,6 @@ import sbt.{given, _}
   */
 object WarPackagePlugin extends AutoPlugin {
 
-
   override def requires = WebappComponentsPlugin
 
   override lazy val projectSettings: Seq[Setting[_]] = {
@@ -27,10 +25,10 @@ object WarPackagePlugin extends AutoPlugin {
       )
 
     val packageArtifactSetting: Setting[_] =
-      pkg / artifact := Artifact(moduleName.value, "war", "war")
+      Compat.pkg_artifact := Artifact(moduleName.value, "war", "war")
 
     val artifactSettings: Seq[Setting[_]] =
-      addArtifact(Compile / pkg / artifact, pkg)
+      addArtifact(Compat.Compile_pkg_artifact, pkg)
 
     Seq(
       packageTaskSettings,

src/main/scala/com/earldouglas/sbt/war/WarPackageRunnerPlugin.scala

@@ -1,10 +1,9 @@
 package com.earldouglas.sbt.war
 
 import sbt.Def.Initialize
-import sbt.Def.settingKey
 import sbt.Keys._
 import sbt.Keys.{`package` => pkg}
-import sbt.{given, _}
+import sbt._
 
 import java.util.concurrent.atomic.AtomicReference
 import scala.sys.process.{Process => ScalaProcess}
@@ -58,7 +57,7 @@ object WarPackageRunnerPlugin extends AutoPlugin {
                 warForkOptions.value,
                 Seq(
                   "-jar",
-                  runner.file.getPath(),
+                  runner.getPath(),
                   "--port",
                   warPort.value.toString(),
                   WarPackageRunnerPluginCompat
@@ -88,7 +87,7 @@ object WarPackageRunnerPlugin extends AutoPlugin {
 
     val onLoadSetting: Initialize[State => State] =
       Def.setting {
-        (Global / onLoad).value
+        Compat.Global_onLoad.value
           .compose(_.addExitHook(stopContainerInstance()))
       }
 
@@ -100,8 +99,11 @@ object WarPackageRunnerPlugin extends AutoPlugin {
 
     val runnerLibrary: Initialize[ModuleID] =
       Def.setting {
-        ("com.heroku" % "webapp-runner" % webappRunnerVersion.value)
-          .intransitive() % War
+        ModuleID(
+          organization = "com.heroku",
+          name = "webapp-runner",
+          revision = webappRunnerVersion.value
+        ).intransitive() % War
       }
 
     Seq(
@@ -110,7 +112,7 @@ object WarPackageRunnerPlugin extends AutoPlugin {
       warJoin := joinWar.value,
       warStop := stopWar.value,
       warForkOptions := forkOptions.value,
-      Global / onLoad := onLoadSetting.value,
+      Compat.Global_onLoad := onLoadSetting.value,
       libraryDependencies += runnerLibrary.value
     )
   }

src/main/scala/com/earldouglas/sbt/war/WebappComponentsPlugin.scala

@@ -2,8 +2,7 @@ package com.earldouglas.sbt.war
 
 import sbt.Def.Initialize
 import sbt.Def.taskKey
-import sbt.Keys._
-import sbt.{given, _}
+import sbt._
 
 /** Identifies the files that compose the webapp (resources, .class
   * files, and .jar files). This is used by user-facing plugins
@@ -52,7 +51,7 @@ object WebappComponentsPlugin extends AutoPlugin {
   override val projectSettings: Seq[Setting[_]] = {
 
     val webappResourcesTask: Initialize[Task[Map[String, File]]] =
-      (Compile / sourceDirectory)
+      (Compat.Compile_sourceDirectory)
         .map(_ / "webapp")
         .map(WebappComponents.getResources(_))
 

src/main/scala/com/earldouglas/sbt/war/WebappComponentsRunnerPlugin.scala

@@ -3,7 +3,7 @@ package com.earldouglas.sbt.war
 import sbt.Def.Initialize
 import sbt.Def.settingKey
 import sbt.Keys._
-import sbt.{given, _}
+import sbt._
 
 import java.nio.file.Files
 import java.nio.file.Paths
@@ -50,7 +50,7 @@ object WebappComponentsRunnerPlugin extends AutoPlugin {
     val runnerConfigFile: Initialize[Task[File]] =
       Def.task {
 
-        val emptyDir: File = (Compile / target).value / "empty"
+        val emptyDir: File = Compat.Compile_target.value / "empty"
 
         val resourceMapString =
           WebappComponentsPlugin.webappContents.value
@@ -60,7 +60,7 @@ object WebappComponentsRunnerPlugin extends AutoPlugin {
             .mkString(",")
 
         val configurationFile: File =
-          (Compile / target).value / "webapp-components.properties"
+          Compat.Compile_target.value / "webapp-components.properties"
 
         Files
           .writeString(
@@ -111,7 +111,7 @@ object WebappComponentsRunnerPlugin extends AutoPlugin {
 
     val onLoadSetting: Initialize[State => State] =
       Def.setting {
-        (Global / onLoad).value
+        (Compat.Global_onLoad).value
           .compose(_.addExitHook(stopContainerInstance()))
       }
 
@@ -129,7 +129,7 @@ object WebappComponentsRunnerPlugin extends AutoPlugin {
       webappJoin := joinWebapp.value,
       webappStop := stopWebapp.value,
       webappForkOptions := forkOptions.value,
-      Global / onLoad := onLoadSetting.value,
+      Compat.Global_onLoad := onLoadSetting.value,
       webappComponentsRunnerVersion := BuildInfo.webappComponentsRunnerVersion,
       libraryDependencies ++= runnerLibraries.value
     )

src/main/scala/com/earldouglas/sbt/war/WebappRunnerPlugin.scala

@@ -1,7 +1,7 @@
 package com.earldouglas.sbt.war
 
 import sbt.Def.settingKey
-import sbt.{given, _}
+import sbt._
 
 /** Launches a webapp composed of in-place resources, classes, and
   * libraries.