From 0cdc2fc7af55b7de0052648bd6d8bebceb8366d3 Mon Sep 17 00:00:00 2001 From: Mark Canlas Date: Mon, 5 Dec 2022 09:14:58 -0500 Subject: [PATCH] sort imports --- .github/workflows/ci.yml | 2 +- .scalafix.conf | 1 + .../scala/com/htmlism/firepower/demo/PrintPrograms.scala | 6 +++--- project/GitHubActionsSettings.scala | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c266a6..86b9030 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,4 +53,4 @@ jobs: - name: Check that workflows are up to date run: sbt ++${{ matrix.scala }} githubWorkflowCheck - - run: sbt ++${{ matrix.scala }} scalafmtCheck test + - run: sbt ++${{ matrix.scala }} 'scalafixAll --check' scalafmtCheck test diff --git a/.scalafix.conf b/.scalafix.conf index f4c2701..f270d4c 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -3,6 +3,7 @@ rules = [ ] OrganizeImports { + removeUnused = false expandRelative = true groups = [ "java", diff --git a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala index 417f40a..94f5521 100644 --- a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala +++ b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala @@ -1,14 +1,14 @@ package com.htmlism.firepower.demo +import java.io.IOException + import scala.util.chaining._ import cats.syntax.all._ +import zio.* import com.htmlism.firepower.demo.asm._ import com.htmlism.firepower.demo.str._ -import zio.* - -import java.io.IOException import com.htmlism.rufio.withzio.* object PrintPrograms extends ZIOAppDefault: diff --git a/project/GitHubActionsSettings.scala b/project/GitHubActionsSettings.scala index 6a2a9bb..4989993 100644 --- a/project/GitHubActionsSettings.scala +++ b/project/GitHubActionsSettings.scala @@ -17,7 +17,7 @@ object GitHubActionsSettings extends AutoPlugin { GitHubActionsPlugin override val buildSettings: Seq[Setting[_]] = Seq( - githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("scalafmtCheck", "test"))), + githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("scalafixAll --check", "scalafmtCheck", "test"))), githubWorkflowEnv := Map("GH_PACKAGES_TOKEN" -> "${{ secrets.GH_PACKAGES_TOKEN }}"), githubWorkflowPublishTargetBranches := Nil, githubWorkflowIncludeClean := false