Set up Scala import ordering

Author: emlun

build.gradle

@@ -5,6 +5,7 @@ buildscript {
   dependencies {
     classpath 'com.cinnober.gradle:semver-git:2.5.0'
     classpath 'com.diffplug.spotless:spotless-plugin-gradle:5.11.0'
+    classpath 'io.github.cosmicsilence:gradle-scalafix:0.1.8'
   }
 }
 plugins {
@@ -127,6 +128,17 @@ String getGitCommit() {
 
 subprojects { project ->
 
+  if (project.plugins.hasPlugin('scala')) {
+    project.scalafix {
+      configFile = rootProject.file('scalafix.conf')
+    }
+    dependencies.scalafix('com.github.liancheng:organize-imports_2.13:0.5.0')
+    project.tasks.scalafix.dependsOn(project.tasks.spotlessApply)
+    project.tasks.checkScalafix.dependsOn(project.tasks.spotlessCheck)
+    project.tasks.spotlessApply.finalizedBy(project.tasks.scalafix)
+    project.tasks.spotlessCheck.finalizedBy(project.tasks.checkScalafix)
+  }
+
   if (project.hasProperty('sourceCompatibility')) {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -135,6 +147,9 @@ subprojects { project ->
   tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
   }
+  tasks.withType(ScalaCompile) {
+    scalaCompileOptions.additionalParameters = ['-Wunused']
+  }
 
   tasks.withType(AbstractArchiveTask) {
     from(rootProject.file('COPYING'))

scalafix.conf

@@ -0,0 +1,8 @@
+rules = [
+  OrganizeImports
+]
+
+OrganizeImports {
+  expandRelative = true
+  removeUnused = true
+}

webauthn-server-attestation/build.gradle

@@ -1,6 +1,7 @@
 plugins {
   id 'java-library'
   id 'scala'
+  id 'io.github.cosmicsilence.scalafix'
 }
 
 description = 'Yubico WebAuthn attestation subsystem'

webauthn-server-core/build.gradle

@@ -2,6 +2,7 @@ plugins {
   id 'java-library'
   id 'scala'
   id 'info.solidsoft.pitest'
+  id 'io.github.cosmicsilence.scalafix'
 }
 
 description = 'Yubico WebAuthn server core API (fewer dependencies)'
@@ -46,7 +47,6 @@ dependencies {
   )
 }
 
-
 jar {
   manifest {
     attributes([

webauthn-server-core/src/test/scala/com/yubico/webauthn/RelyingPartyRegistrationSpec.scala

@@ -34,7 +34,6 @@ import java.security.cert.X509Certificate
 import java.security.interfaces.RSAPublicKey
 import javax.security.auth.x500.X500Principal
 import scala.jdk.CollectionConverters._
-import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
 
@@ -54,19 +53,20 @@ import com.yubico.webauthn.data.AuthenticatorData
 import com.yubico.webauthn.data.AuthenticatorSelectionCriteria
 import com.yubico.webauthn.data.ByteArray
 import com.yubico.webauthn.data.COSEAlgorithmIdentifier
+import scala.util.Failure
 import com.yubico.webauthn.data.CollectedClientData
 import com.yubico.webauthn.data.Generators._
 import com.yubico.webauthn.data.PublicKeyCredentialParameters
-import com.yubico.webauthn.data.RegistrationExtensionInputs
+import org.mockito.Mockito
 import com.yubico.webauthn.data.RelyingPartyIdentity
 import com.yubico.webauthn.data.UserIdentity
 import com.yubico.webauthn.data.UserVerificationRequirement
+import com.yubico.webauthn.data.RegistrationExtensionInputs
 import com.yubico.webauthn.test.Helpers
 import com.yubico.webauthn.test.Util.toStepWithUtilities
 import org.bouncycastle.asn1.DEROctetString
 import org.bouncycastle.asn1.x500.X500Name
 import org.junit.runner.RunWith
-import org.mockito.Mockito
 import org.scalacheck.Gen
 import org.scalatest.FunSpec
 import org.scalatest.Matchers

webauthn-server-demo/build.gradle

@@ -3,6 +3,7 @@ plugins {
   id 'war'
   id 'application'
   id 'scala'
+  id 'io.github.cosmicsilence.scalafix'
 }
 
 description = 'WebAuthn demo'

yubico-util-scala/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'scala'
+  id 'io.github.cosmicsilence.scalafix'
 }
 
 description = 'Yubico internal Scala utilities'

yubico-util/build.gradle

@@ -1,6 +1,7 @@
 plugins {
   id 'java-library'
   id 'scala'
+  id 'io.github.cosmicsilence.scalafix'
 }
 
 description = 'Yubico internal utilities'