VirtusLab · Gedochao · May 16, 2025 · May 16, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -122,7 +122,7 @@ jobs:
         if: github.event_name == 'push'
 
   upload-launchers:
-    needs: [format, jvm-tests, native-tests, native-static-tests, native-mostly-static-tests]
+    needs: [format, scalafix, jvm-tests, native-tests, native-static-tests, native-mostly-static-tests]
     runs-on: ubuntu-24.04
     if: github.event_name == 'push'
     steps:
@@ -178,8 +178,23 @@ jobs:
       - uses: VirtusLab/scala-cli-setup@v1
       - run: scala-cli fmt . --check
 
+  scalafix:
+    timeout-minutes: 30
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+      - uses: coursier/cache-action@v6
+      - uses: coursier/setup-action@v1
+        with:
+          jvm: temurin:17
+      - name: Run scalafix
+        run: ./mill -i __.fix --check
+
   publish:
-    needs: [format, jvm-tests, native-tests, native-static-tests, native-mostly-static-tests]
+    needs: [format, scalafix, jvm-tests, native-tests, native-static-tests, native-mostly-static-tests]
     if: github.event_name == 'push'
     runs-on: ubuntu-24.04
     steps:

diff --git a/.scalafix.conf b/.scalafix.conf
@@ -0,0 +1,23 @@
+rules  = [
+  DisableSyntax,
+  RemoveUnused,
+  OrganizeImports,
+  NoValInForComprehension,
+  # ProcedureSyntax
+]
+DisableSyntax.noFinalize = true
+DisableSyntax.noIsInstanceOf = true
+DisableSyntax.noReturns = true
+
+// `rules` on compilation
+triggered.rules = [
+  DisableSyntax
+]
+
+OrganizeImports {
+  coalesceToWildcardImportThreshold = 6
+  expandRelative = true
+  groups = ["*", "re:javax?\\.", "scala."]
+  groupedImports = AggressiveMerge
+  targetDialect = Scala3
+}
diff --git a/build.mill.scala b/build.mill.scala
@@ -4,6 +4,7 @@ import $packages._
 
 import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.31-1`
 import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.31-1`
+import $ivy.`com.goyeau::mill-scalafix::0.5.1`
 import build.project.publish,
   build.project.publish.{finalPublishVersion, publishSonatype => publishSonatype0}
 import io.github.alexarchambault.millnativeimage.NativeImage
@@ -13,6 +14,7 @@ import scalalib._
 
 import java.io.File
 import scala.annotation.unused
+import com.goyeau.mill.scalafix.ScalafixModule
 
 object Deps {
   object Versions {
@@ -59,9 +61,14 @@ trait ScalaCliSigningPublish extends PublishModule {
   def publishVersion: Target[String] = finalPublishVersion()
 }
 
-object shared extends Shared
-trait Shared extends ScalaModule with ScalaCliSigningPublish {
+trait ScalaCliSigningModule extends ScalaModule with ScalafixModule {
+  override def scalacOptions: Target[Seq[String]] =
+    super.scalacOptions.map(_ ++ Seq("-Wunused:all"))
   override def scalaVersion: Target[String] = Scala.scala3
+}
+
+object shared extends Shared
+trait Shared extends ScalaCliSigningModule with ScalaCliSigningPublish {
   def ivyDeps: Target[Agg[Dep]] = super.ivyDeps() ++ Seq(
     Deps.jsoniterCore,
     Deps.osLib
@@ -100,9 +107,7 @@ trait CliNativeImage extends NativeImage {
 }
 
 object cli extends Cli
-trait Cli extends ScalaModule with ScalaCliSigningPublish {
-  self =>
-  override def scalaVersion: Target[String] = Scala.scala3
+trait Cli extends ScalaCliSigningModule with ScalaCliSigningPublish { self =>
   def ivyDeps: Target[Agg[Dep]] = super.ivyDeps() ++ Seq(
     Deps.bouncycastle,
     Deps.bouncycastleUtils,
@@ -123,10 +128,9 @@ trait Cli extends ScalaModule with ScalaCliSigningPublish {
     }
   }
 }
-object `native-cli` extends ScalaModule with ScalaCliSigningPublish { self =>
-  def scalaVersion: Target[String] = Task(Scala.scala3)
-  def ivyDeps: Target[Agg[Dep]]    = super.ivyDeps() ++ Seq(Deps.svm)
-  def moduleDeps: Seq[Cli]         = Seq(cli)
+object `native-cli` extends ScalaCliSigningModule with ScalaCliSigningPublish { self =>
+  def ivyDeps: Target[Agg[Dep]] = super.ivyDeps() ++ Seq(Deps.svm)
+  def moduleDeps: Seq[Cli]      = Seq(cli)
 
   def mainClass: Target[Option[String]] = cli.mainClass()
 
@@ -231,7 +235,7 @@ trait CliTests extends ScalaModule {
   }
 }
 
-object `jvm-integration` extends JvmIntegration
+object `jvm-integration` extends JvmIntegration with ScalafixModule
 trait JvmIntegration extends ScalaModule with CliTests { self =>
   override def scalaVersion: Target[String] = Scala.scala3
   def testLauncher: Target[PathRef]         = cli.launcher()

diff --git a/cli/src/scala/cli/signing/ScalaCliSigning.scala b/cli/src/scala/cli/signing/ScalaCliSigning.scala
@@ -1,6 +1,6 @@
 package scala.cli.signing
 
-import caseapp._
+import caseapp.*
 import caseapp.core.app.CommandsEntryPoint
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 

diff --git a/cli/src/scala/cli/signing/commands/PgpCreate.scala b/cli/src/scala/cli/signing/commands/PgpCreate.scala
@@ -4,8 +4,7 @@ import caseapp.core.RemainingArgs
 import caseapp.core.app.Command
 import org.bouncycastle.bcpg.ArmoredOutputStream
 
-import java.io.{BufferedOutputStream, ByteArrayOutputStream, File}
-import java.util.{Base64, HexFormat}
+import java.io.{ByteArrayOutputStream, File}
 
 import scala.cli.signing.util.PgpHelper
 

diff --git a/cli/src/scala/cli/signing/commands/PgpCreateOptions.scala b/cli/src/scala/cli/signing/commands/PgpCreateOptions.scala
@@ -1,9 +1,9 @@
 package scala.cli.signing.commands
 
-import caseapp._
+import caseapp.*
 
 import scala.cli.signing.shared.PasswordOption
-import scala.cli.signing.util.ArgParsers._
+import scala.cli.signing.util.ArgParsers.*
 
 @HelpMessage("Create PGP key pair")
 final case class PgpCreateOptions(

diff --git a/cli/src/scala/cli/signing/commands/PgpKeyId.scala b/cli/src/scala/cli/signing/commands/PgpKeyId.scala
@@ -2,14 +2,12 @@ package scala.cli.signing.commands
 
 import caseapp.core.RemainingArgs
 import caseapp.core.app.Command
-import org.bouncycastle.bcpg.PublicKeyAlgorithmTags
 import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator
 import org.bouncycastle.openpgp.{PGPPublicKeyRingCollection, PGPUtil}
 
 import java.io.ByteArrayInputStream
-import java.nio.charset.StandardCharsets
 
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 
 object PgpKeyId extends Command[PgpKeyIdOptions] {
 
@@ -18,7 +16,6 @@ object PgpKeyId extends Command[PgpKeyIdOptions] {
   )
 
   // from https://stackoverflow.com/questions/9655181/how-to-convert-a-byte-array-to-a-hex-string-in-java/9855338#9855338
-  private val hexChars = "0123456789abcdef".toCharArray
   private def bytesToHex(bytes: Array[Byte]): String = {
     val hexChars = Array.ofDim[Char](bytes.length * 2)
     for (j <- bytes.indices) {

diff --git a/cli/src/scala/cli/signing/commands/PgpKeyIdOptions.scala b/cli/src/scala/cli/signing/commands/PgpKeyIdOptions.scala
@@ -1,6 +1,6 @@
 package scala.cli.signing.commands
 
-import caseapp._
+import caseapp.*
 
 // format: off
 final case class PgpKeyIdOptions(

diff --git a/cli/src/scala/cli/signing/commands/PgpSignOptions.scala b/cli/src/scala/cli/signing/commands/PgpSignOptions.scala
@@ -1,9 +1,9 @@
 package scala.cli.signing.commands
 
-import caseapp._
+import caseapp.*
 
 import scala.cli.signing.shared.PasswordOption
-import scala.cli.signing.util.ArgParsers._
+import scala.cli.signing.util.ArgParsers.*
 
 // format: off
 @HelpMessage("Sign files with PGP")

diff --git a/cli/src/scala/cli/signing/commands/PgpVerify.scala b/cli/src/scala/cli/signing/commands/PgpVerify.scala
@@ -1,6 +1,6 @@
 package scala.cli.signing.commands
 
-import caseapp._
+import caseapp.*
 import caseapp.core.app.Command
 import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator
 import org.bouncycastle.openpgp.{PGPPublicKeyRingCollection, PGPUtil}

diff --git a/cli/src/scala/cli/signing/commands/PgpVerifyOptions.scala b/cli/src/scala/cli/signing/commands/PgpVerifyOptions.scala
@@ -1,6 +1,6 @@
 package scala.cli.signing.commands
 
-import caseapp._
+import caseapp.*
 
 @HelpMessage("Verify PGP signatures")
 final case class PgpVerifyOptions(

diff --git a/cli/src/scala/cli/signing/util/ArgParsers.scala b/cli/src/scala/cli/signing/util/ArgParsers.scala
@@ -1,7 +1,6 @@
 package scala.cli.signing.util
 
-import caseapp.core.argparser.ArgParser
-import caseapp.core.argparser.SimpleArgParser
+import caseapp.core.argparser.{ArgParser, SimpleArgParser}
 
 import scala.cli.signing.shared.PasswordOption
 

diff --git a/cli/src/scala/cli/signing/util/BouncycastleSigner.scala b/cli/src/scala/cli/signing/util/BouncycastleSigner.scala
@@ -10,7 +10,7 @@ import org.bouncycastle.bcpg.{
   HashAlgorithmTags,
   SymmetricKeyAlgorithmTags
 }
-import org.bouncycastle.openpgp.{Util => _, _}
+import org.bouncycastle.openpgp.*
 import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator
 import org.bouncycastle.openpgp.operator.jcajce.{
@@ -19,11 +19,12 @@ import org.bouncycastle.openpgp.operator.jcajce.{
   JcaPGPContentVerifierBuilderProvider,
   JcePBESecretKeyDecryptorBuilder
 }
-import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer
 
 import java.io.{ByteArrayInputStream, ByteArrayOutputStream, InputStream, PrintWriter, StringWriter}
+
 import scala.cli.signing.shared.Secret
-import scala.jdk.CollectionConverters._
+import scala.cli.signing.util.Util.maybeDecodeBase64
+import scala.jdk.CollectionConverters.*
 import scala.util.Try
 
 final case class BouncycastleSigner(
@@ -211,7 +212,7 @@ object BouncycastleSigner {
     secretKey: Secret[Array[Byte]],
     passwordOpt: Option[Secret[String]]
   ): BouncycastleSigner = {
-    val is         = new ByteArrayInputStream(Util.maybeDecodeBase64(secretKey.value))
+    val is         = new ByteArrayInputStream(maybeDecodeBase64(secretKey.value))
     val secretKey0 = readSecretKey(is)
     BouncycastleSigner(secretKey0, passwordOpt)
   }

diff --git a/cli/src/scala/cli/signing/util/Util.scala b/cli/src/scala/cli/signing/util/Util.scala
@@ -1,6 +1,4 @@
 package scala.cli.signing.util
-
-import java.nio.charset.StandardCharsets
 import java.util.Base64
 
 object Util {

diff --git a/shared/src/scala/cli/signing/shared/PasswordOption.scala b/shared/src/scala/cli/signing/shared/PasswordOption.scala
@@ -1,7 +1,7 @@
 package scala.cli.signing.shared
 
-import com.github.plokhotnyuk.jsoniter_scala.core._
-import com.github.plokhotnyuk.jsoniter_scala.macros._
+import com.github.plokhotnyuk.jsoniter_scala.core.*
+import com.github.plokhotnyuk.jsoniter_scala.macros.*
 
 import java.nio.charset.StandardCharsets