Merge pull request #1528 from disneystreaming/organize-imports-0.6.0

Organize imports 0.6.0
disneystreaming · May 17, 2024 · b96f736 · b96f736
2 parents a2c1ba5 + bcdff30
commit b96f736
Show file tree

Hide file tree

Showing 22 changed files with 58 additions and 45 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reorganize imports with OrganizeImports 0.6.0
+1f527e81b3b594ece4bc46ca2f8e8c845fdf1fff
diff --git a/build.sbt b/build.sbt
@@ -11,7 +11,7 @@ import java.io.File
 import sys.process._
 
 ThisBuild / commands ++= createBuildCommands(allModules)
-ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.5.0"
+ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0"
 ThisBuild / dynverSeparator := "-"
 ThisBuild / versionScheme := Some("early-semver")
 ThisBuild / mimaBaseVersion := "0.18.0"

diff --git a/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala b/modules/codegen/src/smithy4s/codegen/SmithyBuildJson.scala
@@ -16,10 +16,11 @@
 
 package smithy4s.codegen
 
+import io.circe.Json
+import io.circe.parser
 import smithy4s.codegen.internals.SmithyBuild
 import smithy4s.codegen.internals.SmithyBuildMaven
 import smithy4s.codegen.internals.SmithyBuildMavenRepository
-import io.circe.{Json, parser}
 
 import scala.collection.immutable.ListSet
 

diff --git a/modules/codegen/src/smithy4s/codegen/internals/CodegenImpl.scala b/modules/codegen/src/smithy4s/codegen/internals/CodegenImpl.scala
@@ -24,10 +24,10 @@ import smithy4s.codegen.transformers._
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.node.Node
 import software.amazon.smithy.model.shapes.ModelSerializer
+import software.amazon.smithy.model.transform.ModelTransformer
 import software.amazon.smithy.openapi.OpenApiConfig
 
 import scala.jdk.CollectionConverters._
-import software.amazon.smithy.model.transform.ModelTransformer
 
 private[codegen] object CodegenImpl { self =>
 

diff --git a/modules/codegen/src/smithy4s/codegen/internals/CollisionAvoidance.scala b/modules/codegen/src/smithy4s/codegen/internals/CollisionAvoidance.scala
@@ -17,13 +17,13 @@
 package smithy4s.codegen.internals
 
 import cats.~>
+import smithy4s.codegen.internals.Type.Nullable
 
 import Type.Alias
 import Type.PrimitiveType
 import TypedNode._
 import Type.ExternalType
 import LineSegment._
-import smithy4s.codegen.internals.Type.Nullable
 
 private[internals] object CollisionAvoidance {
   def apply(compilationUnit: CompilationUnit): CompilationUnit = {

diff --git a/modules/codegen/src/smithy4s/codegen/internals/ModelLoader.scala b/modules/codegen/src/smithy4s/codegen/internals/ModelLoader.scala
@@ -30,10 +30,10 @@ import software.amazon.smithy.model.loader.ModelManifestException
 
 import java.io.File
 import java.net.URLClassLoader
-import scala.jdk.CollectionConverters._
 import java.nio.file.FileSystems
-import scala.util.Using
 import java.nio.file.Files
+import scala.jdk.CollectionConverters._
+import scala.util.Using
 
 private[codegen] object ModelLoader {
 

diff --git a/modules/codegen/src/smithy4s/codegen/internals/SmithyBuild.scala b/modules/codegen/src/smithy4s/codegen/internals/SmithyBuild.scala
@@ -19,8 +19,8 @@ package internals
 
 import cats.syntax.all._
 import io.circe._
-import io.circe.syntax._
 import io.circe.generic.semiauto._
+import io.circe.syntax._
 import software.amazon.smithy.model.node.Node
 import software.amazon.smithy.openapi.OpenApiConfig
 

diff --git a/modules/codegen/src/smithy4s/codegen/internals/SmithyToIR.scala b/modules/codegen/src/smithy4s/codegen/internals/SmithyToIR.scala
@@ -16,33 +16,34 @@
 
 package smithy4s.codegen.internals
 
+import alloy.StructurePatternTrait
 import cats.data.NonEmptyList
 import cats.implicits._
 import smithy4s.meta.AdtMemberTrait
+import smithy4s.meta.AdtTrait
 import smithy4s.meta.ErrorMessageTrait
+import smithy4s.meta.GenerateOpticsTrait
+import smithy4s.meta.GenerateServiceProductTrait
 import smithy4s.meta.IndexedSeqTrait
 import smithy4s.meta.NoStackTraceTrait
 import smithy4s.meta.PackedInputsTrait
 import smithy4s.meta.RefinementTrait
+import smithy4s.meta.TypeclassTrait
 import smithy4s.meta.VectorTrait
-import smithy4s.meta.AdtTrait
-import smithy4s.meta.GenerateServiceProductTrait
-import smithy4s.meta.GenerateOpticsTrait
-import alloy.StructurePatternTrait
 import software.amazon.smithy.aws.traits.ServiceTrait
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.node._
 import software.amazon.smithy.model.selector.PathFinder
 import software.amazon.smithy.model.shapes._
 import software.amazon.smithy.model.traits.DefaultTrait
-import software.amazon.smithy.model.traits.{RequiredTrait, TimestampFormatTrait}
+import software.amazon.smithy.model.traits.RequiredTrait
+import software.amazon.smithy.model.traits.TimestampFormatTrait
 import software.amazon.smithy.model.traits._
 
 import scala.annotation.nowarn
 import scala.jdk.CollectionConverters._
 
 import Type.Alias
-import smithy4s.meta.TypeclassTrait
 
 private[codegen] object SmithyToIR {
 

diff --git a/modules/codegen/src/smithy4s/codegen/internals/ToLines.scala b/modules/codegen/src/smithy4s/codegen/internals/ToLines.scala
@@ -16,11 +16,12 @@
 
 package smithy4s.codegen.internals
 
+import cats.Foldable
 import cats.kernel.Monoid
 import cats.syntax.all._
 
-import LineSegment.{Literal, NameRef}
-import cats.Foldable
+import LineSegment.Literal
+import LineSegment.NameRef
 
 /**
   * Construct allowing to flatten arbitrary levels of nested lists

diff --git a/modules/codegen/src/smithy4s/codegen/transformers/KeepOnlyMarkedShapes.scala b/modules/codegen/src/smithy4s/codegen/transformers/KeepOnlyMarkedShapes.scala
@@ -19,10 +19,11 @@ package smithy4s.codegen.transformers
 import software.amazon.smithy.build.ProjectionTransformer
 import software.amazon.smithy.build.TransformContext
 import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.neighbor._
 import software.amazon.smithy.model.shapes._
+
 import scala.jdk.CollectionConverters._
 import scala.jdk.OptionConverters._
-import software.amazon.smithy.model.neighbor._
 
 class KeepOnlyMarkedShapes extends ProjectionTransformer {
 

diff --git a/modules/codegen/src/smithy4s/codegen/transformers/OpenEnumTransformer.scala b/modules/codegen/src/smithy4s/codegen/transformers/OpenEnumTransformer.scala
@@ -17,10 +17,12 @@
 package smithy4s.codegen.transformers
 
 import alloy.OpenEnumTrait
-import software.amazon.smithy.build.{ProjectionTransformer, TransformContext}
+import software.amazon.smithy.build.ProjectionTransformer
+import software.amazon.smithy.build.TransformContext
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes._
 import software.amazon.smithy.model.traits._
+
 import java.util.function.Function
 
 @annotation.nowarn("msg=class EnumTrait in package traits is deprecated")

diff --git a/modules/codegen/test/src/smithy4s/codegen/internals/ModelLoaderSpec.scala b/modules/codegen/test/src/smithy4s/codegen/internals/ModelLoaderSpec.scala
@@ -16,9 +16,10 @@
 
 package smithy4s.codegen.internals
 import munit._
+import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.ShapeId
+
 import java.util.stream.Collectors
-import software.amazon.smithy.model.Model
 import scala.jdk.CollectionConverters._
 
 class ModelLoaderSpec extends FunSuite {

diff --git a/modules/codegen/test/src/smithy4s/codegen/internals/RendererSpec.scala b/modules/codegen/test/src/smithy4s/codegen/internals/RendererSpec.scala
@@ -18,8 +18,8 @@ package smithy4s.codegen.internals
 
 import org.scalacheck.Gen
 import org.scalacheck.Prop
-import software.amazon.smithy.model.shapes.EnumShape
 import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.shapes.EnumShape
 import software.amazon.smithy.model.shapes.StructureShape
 
 final class RendererSpec extends munit.ScalaCheckSuite {

diff --git a/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala b/modules/codegen/test/src/smithy4s/codegen/internals/SmithyBuildSpec.scala
@@ -19,6 +19,7 @@ package smithy4s.codegen.internals
 import smithy4s.codegen.SmithyBuildJson
 import software.amazon.smithy.model.shapes.ShapeId
 import software.amazon.smithy.openapi.OpenApiVersion
+
 import scala.collection.immutable.ListSet
 
 final class SmithyBuildSpec extends munit.FunSuite {

diff --git a/modules/codegen/test/src/smithy4s/codegen/transformers/AwsStandardTypesTransformerSpec.scala b/modules/codegen/test/src/smithy4s/codegen/transformers/AwsStandardTypesTransformerSpec.scala
@@ -19,7 +19,8 @@ package smithy4s.codegen.transformers
 import software.amazon.smithy.build.TransformContext
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.node.Node
-import software.amazon.smithy.model.shapes.{ModelSerializer, ShapeId}
+import software.amazon.smithy.model.shapes.ModelSerializer
+import software.amazon.smithy.model.shapes.ShapeId
 
 final class AwsStandardTypesTransformerSpec extends munit.FunSuite {
 

diff --git a/modules/codegen/test/src/smithy4s/codegen/transformers/KeepOnlyMarkedShapesSpec.scala b/modules/codegen/test/src/smithy4s/codegen/transformers/KeepOnlyMarkedShapesSpec.scala
@@ -17,9 +17,9 @@
 package smithy4s.codegen.transformers
 
 import software.amazon.smithy.build.TransformContext
+import software.amazon.smithy.model.shapes.ShapeId
 
 import scala.jdk.CollectionConverters._
-import software.amazon.smithy.model.shapes.ShapeId
 
 final class KeepOnlyMarkedShapesSpec extends munit.FunSuite {
   import smithy4s.codegen.internals.TestUtils._

diff --git a/modules/codegen/test/src/smithy4s/codegen/transformers/OpenEnumTransformerSpec.scala b/modules/codegen/test/src/smithy4s/codegen/transformers/OpenEnumTransformerSpec.scala
@@ -16,10 +16,10 @@
 
 package smithy4s.codegen.transformers
 
+import alloy.OpenEnumTrait
 import software.amazon.smithy.build.TransformContext
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.ShapeId
-import alloy.OpenEnumTrait
 
 final class OpenEnumTransformerSpec extends munit.FunSuite {
 

diff --git a/modules/mill-codegen-plugin/src/smithy4s/codegen/mill/Smithy4sModule.scala b/modules/mill-codegen-plugin/src/smithy4s/codegen/mill/Smithy4sModule.scala
@@ -17,23 +17,23 @@
 package smithy4s.codegen.mill
 
 import coursier.maven.MavenRepository
-import scala.util.{Success, Try}
 import mill._
+import mill.api.JarManifest
 import mill.api.PathRef
 import mill.define.Target
-import mill.scalalib._
-import smithy4s.codegen.{
-  CodegenArgs,
-  Codegen => Smithy4s,
-  FileType,
-  BuildInfo,
-  JarUtils,
-  SMITHY4S_DEPENDENCIES
-}
-import mill.api.JarManifest
 import mill.scalalib.CrossVersion.Binary
 import mill.scalalib.CrossVersion.Constant
 import mill.scalalib.CrossVersion.Full
+import mill.scalalib._
+import smithy4s.codegen.BuildInfo
+import smithy4s.codegen.CodegenArgs
+import smithy4s.codegen.FileType
+import smithy4s.codegen.JarUtils
+import smithy4s.codegen.SMITHY4S_DEPENDENCIES
+import smithy4s.codegen.{Codegen => Smithy4s}
+
+import scala.util.Success
+import scala.util.Try
 
 trait Smithy4sModule extends ScalaModule {
 

diff --git a/modules/protocol-tests/test/src/smithy4s/api/validation/AdtMemberTraitValidatorSpec.scala b/modules/protocol-tests/test/src/smithy4s/api/validation/AdtMemberTraitValidatorSpec.scala
@@ -16,14 +16,15 @@
 
 package smithy4s.api.validation
 
-import weaver._
 import smithy4s.meta.AdtMemberTrait
+import smithy4s.meta.validation.AdtMemberTraitValidator
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes._
-import software.amazon.smithy.model.validation.{Severity, ValidationEvent}
+import software.amazon.smithy.model.validation.Severity
+import software.amazon.smithy.model.validation.ValidationEvent
+import weaver._
 
 import scala.jdk.CollectionConverters._
-import smithy4s.meta.validation.AdtMemberTraitValidator
 
 object AdtMemberTraitValidatorSpec extends FunSuite {
   private val validator = new AdtMemberTraitValidator()

diff --git a/modules/protocol-tests/test/src/smithy4s/api/validation/AdtTraitValidatorSpec.scala b/modules/protocol-tests/test/src/smithy4s/api/validation/AdtTraitValidatorSpec.scala
@@ -16,14 +16,15 @@
 
 package smithy4s.api.validation
 
-import weaver._
 import smithy4s.meta.AdtTrait
+import smithy4s.meta.validation.AdtTraitValidator
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes._
-import software.amazon.smithy.model.validation.{Severity, ValidationEvent}
+import software.amazon.smithy.model.validation.Severity
+import software.amazon.smithy.model.validation.ValidationEvent
+import weaver._
 
 import scala.jdk.CollectionConverters._
-import smithy4s.meta.validation.AdtTraitValidator
 
 object AdtTraitValidatorSpec extends FunSuite {
   private val validator = new AdtTraitValidator()

diff --git a/modules/protocol-tests/test/src/smithy4s/api/validation/ErrorMessageTraitValidatorSpec.scala b/modules/protocol-tests/test/src/smithy4s/api/validation/ErrorMessageTraitValidatorSpec.scala
@@ -16,16 +16,16 @@
 
 package smithy4s.api.validation
 
-import weaver._
 import smithy4s.meta.ErrorMessageTrait
+import smithy4s.meta.validation.ErrorMessageTraitValidator
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes._
+import software.amazon.smithy.model.traits.ErrorTrait
+import software.amazon.smithy.model.validation.Severity
+import software.amazon.smithy.model.validation.ValidationEvent
+import weaver._
 
 import scala.jdk.CollectionConverters._
-import smithy4s.meta.validation.ErrorMessageTraitValidator
-import software.amazon.smithy.model.validation.ValidationEvent
-import software.amazon.smithy.model.validation.Severity
-import software.amazon.smithy.model.traits.ErrorTrait
 
 object ErrorMessageTraitValidatorSpec extends FunSuite {
   private val validator = new ErrorMessageTraitValidator()

diff --git a/modules/protocol-tests/test/src/smithy4s/api/validation/RefinementTraitValidatorSpec.scala b/modules/protocol-tests/test/src/smithy4s/api/validation/RefinementTraitValidatorSpec.scala
@@ -18,8 +18,8 @@ package smithy4s.api.validation
 
 import smithy4s.meta.validation.RefinementTraitValidator
 import software.amazon.smithy.model.Model
-import software.amazon.smithy.model.shapes._
 import software.amazon.smithy.model.SourceLocation
+import software.amazon.smithy.model.shapes._
 import software.amazon.smithy.model.traits.DefaultTrait
 import software.amazon.smithy.model.validation._