Use Scalafix to clean up imports

.github/workflows/build.yml

@@ -17,6 +17,7 @@ jobs:
       with:
         java-version: 8
     - run: sbt scalafmtCheckAll
+    - run: sbt "scalafixAll --check"
     - run: sbt ^test
     - run: sbt ^publishLocal
     - run: sbt scripted

.scalafix.conf

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

build.sbt

@@ -17,6 +17,11 @@ val awsJavaSdkVersion = "1.12.772"
 libraryDependencies += "com.amazonaws" % "aws-java-sdk-elasticbeanstalk" % awsJavaSdkVersion
 libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % awsJavaSdkVersion
 
+// Scalafix
+semanticdbEnabled := true
+semanticdbVersion := scalafixSemanticdb.revision
+scalacOptions += "-Ywarn-unused-import"
+
 // Publish to Sonatype, https://www.scala-sbt.org/release/docs/Using-Sonatype.html
 credentials := List(
   Credentials(Path.userHome / ".sbt" / "sonatype_credentials")

project/plugins.sbt

@@ -1,3 +1,4 @@
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")

src/main/scala-sbt-1.0/com/earldouglas/xwp/Compat.scala

@@ -1,9 +1,10 @@
 package com.earldouglas.xwp
 
-import sbt._
 import sbt.Keys._
+import sbt._
 import sbt.internal.io.Source
 import sbt.util.CacheStoreFactory
+
 import FileInfo.Style
 import WebappPlugin.autoImport.webappPrepare
 

src/main/scala/com/earldouglas/xwp/ContainerPlugin.scala

@@ -1,10 +1,12 @@
 package com.earldouglas.xwp
 
-import java.util.concurrent.atomic.AtomicReference
-import sbt._
-import sbt.Def.taskKey
 import sbt.Def.settingKey
+import sbt.Def.taskKey
 import sbt.Keys._
+import sbt._
+
+import java.util.concurrent.atomic.AtomicReference
+
 import Compat.Process
 
 object ContainerPlugin extends AutoPlugin {

src/main/scala/com/earldouglas/xwp/ElasticBeanstalkDeploy.scala

@@ -1,25 +1,24 @@
 package com.earldouglas.xwp
 
 import com.amazonaws.auth.EnvironmentVariableCredentialsProvider
-import com.amazonaws.regions.Regions
 import com.amazonaws.services.elasticbeanstalk.AWSElasticBeanstalk
 import com.amazonaws.services.elasticbeanstalk.AWSElasticBeanstalkClientBuilder
 import com.amazonaws.services.elasticbeanstalk.model.CreateApplicationVersionRequest
 import com.amazonaws.services.elasticbeanstalk.model.DeleteApplicationVersionRequest
 import com.amazonaws.services.elasticbeanstalk.model.DescribeApplicationVersionsRequest
-import com.amazonaws.services.elasticbeanstalk.model.EnvironmentTier
 import com.amazonaws.services.elasticbeanstalk.model.S3Location
 import com.amazonaws.services.elasticbeanstalk.model.UpdateEnvironmentRequest
 import com.amazonaws.services.s3.AmazonS3
 import com.amazonaws.services.s3.AmazonS3ClientBuilder
-import java.io.File
-import java.net.URLEncoder
-import java.util.Arrays
-import sbt._
-import sbt.Def.taskKey
 import sbt.Def.settingKey
+import sbt.Def.taskKey
 import sbt.Keys._
 import sbt.Keys.{`package` => pkg}
+import sbt._
+
+import java.io.File
+import java.net.URLEncoder
+import java.util.Arrays
 
 object ElasticBeanstalkDeployPlugin extends AutoPlugin {
 

src/main/scala/com/earldouglas/xwp/HerokuDeploy.scala

@@ -1,10 +1,10 @@
 package com.earldouglas.xwp
 
-import sbt._
-import sbt.Def.taskKey
 import sbt.Def.settingKey
+import sbt.Def.taskKey
 import sbt.Keys._
 import sbt.Keys.{`package` => pkg}
+import sbt._
 
 object HerokuDeploy extends AutoPlugin {
 

src/main/scala/com/earldouglas/xwp/JettyPlugin.scala

@@ -1,8 +1,6 @@
 package com.earldouglas.xwp
 
 import sbt._
-import sbt.Def.taskKey
-import sbt.Def.settingKey
 
 object JettyPlugin extends AutoPlugin {
 

src/main/scala/com/earldouglas/xwp/TomcatPlugin.scala

@@ -1,8 +1,6 @@
 package com.earldouglas.xwp
 
 import sbt._
-import sbt.Def.taskKey
-import sbt.Def.settingKey
 
 object TomcatPlugin extends AutoPlugin {
 

src/main/scala/com/earldouglas/xwp/WarPlugin.scala

@@ -1,9 +1,8 @@
 package com.earldouglas.xwp
 
-import sbt._
-import sbt.Def.taskKey
 import sbt.Def.settingKey
 import sbt.Keys._
+import sbt._
 
 object WarPlugin extends AutoPlugin {
   import Keys.{`package` => pkg}

src/main/scala/com/earldouglas/xwp/WebappPlugin.scala

@@ -1,14 +1,13 @@
 package com.earldouglas.xwp
 
-import java.util.jar.Manifest
-
-import sbt._
-import sbt.Def.taskKey
 import sbt.Def.settingKey
-import sbt.Keys._
-import sbt.FilesInfo.lastModified
+import sbt.Def.taskKey
 import sbt.FilesInfo.exists
-import sbt.FileFunction.cached
+import sbt.FilesInfo.lastModified
+import sbt.Keys._
+import sbt._
+
+import java.util.jar.Manifest
 
 object WebappPlugin extends AutoPlugin {