Changes II

.scalafmt.conf

@@ -77,7 +77,7 @@ rewrite.redundantBraces.maxLines = 1
 rewrite.redundantBraces.stringInterpolation = true
 
 # Ensure consistent ordering for imports
-rewrite.imports.sort = ascii
+rewrite.imports.sort = original
 rewrite.imports.groups = [
   ["java\\..*"],
   ["scala\\..*"],

modules/core/src/main/scala/fs2/kafka/CommitRecovery.scala

@@ -8,11 +8,11 @@ package fs2.kafka
 
 import scala.concurrent.duration.*
 
-import cats.Functor
 import cats.effect.Temporal
 import cats.syntax.applicativeError.*
 import cats.syntax.flatMap.*
 import cats.syntax.functor.*
+import cats.Functor
 
 import org.apache.kafka.clients.consumer.{OffsetAndMetadata, RetriableCommitFailedException}
 import org.apache.kafka.common.TopicPartition

modules/core/src/main/scala/fs2/kafka/CommittableConsumerRecord.scala

@@ -6,14 +6,14 @@
 
 package fs2.kafka
 
+import cats.{Applicative, Bitraverse, Eq, Eval, Show, Traverse}
 import cats.syntax.bifoldable.*
 import cats.syntax.bitraverse.*
 import cats.syntax.eq.*
 import cats.syntax.foldable.*
 import cats.syntax.functor.*
 import cats.syntax.show.*
 import cats.syntax.traverse.*
-import cats.{Applicative, Bitraverse, Eq, Eval, Show, Traverse}
 
 /**
   * [[CommittableConsumerRecord]] is a Kafka record along with an instance of [[CommittableOffset]],

modules/core/src/main/scala/fs2/kafka/CommittableOffset.scala

@@ -6,9 +6,9 @@
 
 package fs2.kafka
 
+import cats.{ApplicativeError, Eq, Show}
 import cats.instances.string.*
 import cats.syntax.show.*
-import cats.{ApplicativeError, Eq, Show}
 import fs2.kafka.instances.*
 
 import org.apache.kafka.clients.consumer.OffsetAndMetadata

modules/core/src/main/scala/fs2/kafka/CommittableOffsetBatch.scala

@@ -6,11 +6,11 @@
 
 package fs2.kafka
 
-import cats.ApplicativeError
+import cats.{Applicative, Foldable, Show}
 import cats.instances.list.*
 import cats.syntax.foldable.*
 import cats.syntax.show.*
-import cats.{Applicative, Foldable, Show}
+import cats.ApplicativeError
 import fs2.kafka.instances.*
 import fs2.kafka.internal.syntax.*
 

modules/core/src/main/scala/fs2/kafka/CommittableProducerRecords.scala

@@ -6,16 +6,16 @@
 
 package fs2.kafka
 
+import cats.{Applicative, Bitraverse, Eq, Eval, Foldable, Show, Traverse}
 import cats.syntax.bifoldable.*
 import cats.syntax.bitraverse.*
 import cats.syntax.eq.*
 import cats.syntax.foldable.*
 import cats.syntax.functor.*
 import cats.syntax.show.*
 import cats.syntax.traverse.*
-import cats.{Applicative, Bitraverse, Eq, Eval, Foldable, Show, Traverse}
-import fs2.Chunk
 import fs2.kafka.internal.syntax.*
+import fs2.Chunk
 
 /**
   * [[CommittableProducerRecords]] represents zero or more [[ProducerRecord]]s and a

modules/core/src/main/scala/fs2/kafka/ConsumerRecord.scala

@@ -6,8 +6,8 @@
 
 package fs2.kafka
 
-import cats.syntax.all.*
 import cats.{Applicative, Apply, Bitraverse, Eq, Eval, Show, Traverse}
+import cats.syntax.all.*
 import fs2.kafka.internal.syntax.*
 
 import org.apache.kafka.clients.consumer.ConsumerRecord.{NO_TIMESTAMP, NULL_SIZE}

modules/core/src/main/scala/fs2/kafka/ConsumerSettings.scala

@@ -6,11 +6,11 @@
 
 package fs2.kafka
 
-import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.*
+import scala.concurrent.ExecutionContext
 
-import cats.Show
 import cats.effect.Resource
+import cats.Show
 import fs2.kafka.security.KafkaCredentialStore
 
 import org.apache.kafka.clients.consumer.ConsumerConfig

modules/core/src/main/scala/fs2/kafka/Deserializer.scala

@@ -9,9 +9,9 @@ package fs2.kafka
 import java.nio.charset.{Charset, StandardCharsets}
 import java.util.UUID
 
-import cats.MonadError
 import cats.effect.{Resource, Sync}
 import cats.syntax.all.*
+import cats.MonadError
 
 /**
   * Functional composable Kafka key- and record deserializer with support for effect types.
@@ -96,9 +96,7 @@ object GenericDeserializer {
     * Creates a new [[Deserializer]] which always fails deserialization with the specified exception
     * `e`.
     */
-  def fail[F[_], A](e: Throwable)(implicit
-    F: Sync[F]
-  ): Deserializer[F, A] =
+  def fail[F[_], A](e: Throwable)(implicit F: Sync[F]): Deserializer[F, A] =
     Deserializer.lift(_ => F.raiseError(e))
 
   /**

modules/core/src/main/scala/fs2/kafka/Header.scala

@@ -6,9 +6,9 @@
 
 package fs2.kafka
 
+import cats.{Eq, Show}
 import cats.instances.string.*
 import cats.syntax.eq.*
-import cats.{Eq, Show}
 
 /**
   * [[Header]] represents a `String` key and `Array[Byte]` value which can be included as part of
@@ -61,9 +61,7 @@ object Header {
     * Creates a new [[Header]] instance using the specified `String` key and value of type `V`,
     * which is going to be serialized with the implicit `HeaderSerializer`.
     */
-  def apply[V](key: String, value: V)(implicit
-    serializer: HeaderSerializer[V]
-  ): Header =
+  def apply[V](key: String, value: V)(implicit serializer: HeaderSerializer[V]): Header =
     new HeaderImpl(
       key = key,
       value = serializer.serialize(value)

modules/core/src/main/scala/fs2/kafka/HeaderDeserializer.scala

@@ -11,8 +11,8 @@ import java.util.UUID
 
 import scala.annotation.tailrec
 
-import cats.syntax.either.*
 import cats.{Eval, Monad}
+import cats.syntax.either.*
 
 /**
   * [[HeaderDeserializer]] is a functional deserializer for Kafka record header values. It's similar

modules/core/src/main/scala/fs2/kafka/Headers.scala

@@ -6,8 +6,8 @@
 
 package fs2.kafka
 
-import cats.data.{Chain, NonEmptyChain}
 import cats.{Eq, Show}
+import cats.data.{Chain, NonEmptyChain}
 import fs2.kafka.internal.converters.collection.*
 import fs2.kafka.internal.syntax.*
 

modules/core/src/main/scala/fs2/kafka/Jitter.scala

@@ -6,9 +6,9 @@
 
 package fs2.kafka
 
-import cats.Applicative
 import cats.effect.Sync
 import cats.syntax.functor.*
+import cats.Applicative
 
 /**
   * [[Jitter]] represents the ability to apply jitter to an existing value `n`, effectively

modules/core/src/main/scala/fs2/kafka/KafkaAdminClient.scala

@@ -8,21 +8,21 @@ package fs2.kafka
 
 import scala.annotation.nowarn
 
+import cats.{Foldable, Functor}
 import cats.effect.*
 import cats.syntax.all.*
-import cats.{Foldable, Functor}
-import fs2.Stream
-import fs2.kafka.KafkaAdminClient.*
 import fs2.kafka.admin.MkAdminClient
-import fs2.kafka.internal.WithAdminClient
 import fs2.kafka.internal.converters.collection.*
 import fs2.kafka.internal.syntax.*
+import fs2.kafka.internal.WithAdminClient
+import fs2.kafka.KafkaAdminClient.*
+import fs2.Stream
 
 import org.apache.kafka.clients.admin.*
 import org.apache.kafka.clients.consumer.OffsetAndMetadata
+import org.apache.kafka.common.{Node, TopicPartition}
 import org.apache.kafka.common.acl.{AclBinding, AclBindingFilter}
 import org.apache.kafka.common.config.ConfigResource
-import org.apache.kafka.common.{Node, TopicPartition}
 
 /**
   * [[KafkaAdminClient]] represents an admin client for Kafka, which is able to describe queries

modules/core/src/main/scala/fs2/kafka/KafkaConsumer.scala

@@ -13,20 +13,20 @@ import scala.collection.immutable.SortedSet
 import scala.concurrent.duration.FiniteDuration
 import scala.util.matching.Regex
 
+import cats.{Foldable, Functor, Reducible}
 import cats.data.{NonEmptySet, OptionT}
 import cats.effect.*
 import cats.effect.implicits.*
 import cats.effect.std.*
 import cats.syntax.all.*
-import cats.{Foldable, Functor, Reducible}
+import fs2.{Chunk, Stream}
 import fs2.kafka.consumer.*
 import fs2.kafka.instances.*
 import fs2.kafka.internal.*
-import fs2.kafka.internal.KafkaConsumerActor.*
-import fs2.kafka.internal.LogEntry.{RevokedPreviousFetch, StoredFetch}
 import fs2.kafka.internal.converters.collection.*
 import fs2.kafka.internal.syntax.*
-import fs2.{Chunk, Stream}
+import fs2.kafka.internal.KafkaConsumerActor.*
+import fs2.kafka.internal.LogEntry.{RevokedPreviousFetch, StoredFetch}
 
 import org.apache.kafka.clients.consumer.OffsetAndMetadata
 import org.apache.kafka.common.{Metric, MetricName, PartitionInfo, TopicPartition}

modules/core/src/main/scala/fs2/kafka/KafkaProducer.scala

@@ -9,9 +9,9 @@ package fs2.kafka
 import scala.annotation.nowarn
 import scala.concurrent.Promise
 
+import cats.{Apply, Functor}
 import cats.effect.*
 import cats.syntax.all.*
-import cats.{Apply, Functor}
 import fs2.*
 import fs2.kafka.internal.*
 import fs2.kafka.producer.MkProducer

modules/core/src/main/scala/fs2/kafka/ProducerRecord.scala

@@ -6,14 +6,14 @@
 
 package fs2.kafka
 
+import cats.{Applicative, Bitraverse, Eq, Eval, Show, Traverse}
 import cats.instances.int.*
 import cats.instances.long.*
 import cats.instances.option.*
 import cats.instances.string.*
 import cats.syntax.eq.*
 import cats.syntax.functor.*
 import cats.syntax.show.*
-import cats.{Applicative, Bitraverse, Eq, Eval, Show, Traverse}
 
 /**
   * [[ProducerRecord]] represents a record which can be produced to Kafka. At the very least, this

modules/core/src/main/scala/fs2/kafka/ProducerSettings.scala

@@ -6,11 +6,11 @@
 
 package fs2.kafka
 
-import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.*
+import scala.concurrent.ExecutionContext
 
-import cats.Show
 import cats.effect.Resource
+import cats.Show
 import fs2.kafka.security.KafkaCredentialStore
 
 import org.apache.kafka.clients.producer.ProducerConfig

modules/core/src/main/scala/fs2/kafka/Serializer.scala

@@ -9,9 +9,9 @@ package fs2.kafka
 import java.nio.charset.{Charset, StandardCharsets}
 import java.util.UUID
 
-import cats.Contravariant
 import cats.effect.{Resource, Sync}
 import cats.syntax.all.*
+import cats.Contravariant
 
 sealed abstract class GenericSerializer[-T <: KeyOrValue, F[_], A] {
 

modules/core/src/main/scala/fs2/kafka/Timestamp.scala

@@ -6,11 +6,11 @@
 
 package fs2.kafka
 
+import cats.{Eq, Show}
 import cats.instances.boolean.*
 import cats.instances.long.*
 import cats.instances.option.*
 import cats.syntax.eq.*
-import cats.{Eq, Show}
 
 /**
   * [[Timestamp]] is an optional timestamp value representing a [[createTime]], [[logAppendTime]],

modules/core/src/main/scala/fs2/kafka/TransactionalKafkaProducer.scala

@@ -8,13 +8,13 @@ package fs2.kafka
 
 import scala.annotation.nowarn
 
-import cats.effect.syntax.all.*
 import cats.effect.{Async, Outcome, Resource}
+import cats.effect.syntax.all.*
 import cats.syntax.all.*
+import fs2.{Chunk, Stream}
 import fs2.kafka.internal.*
 import fs2.kafka.internal.converters.collection.*
 import fs2.kafka.producer.MkProducer
-import fs2.{Chunk, Stream}
 
 import org.apache.kafka.clients.consumer.ConsumerGroupMetadata
 import org.apache.kafka.clients.producer.RecordMetadata

modules/core/src/main/scala/fs2/kafka/admin/MkAdminClient.scala

@@ -7,8 +7,8 @@
 package fs2.kafka.admin
 
 import cats.effect.Sync
-import fs2.kafka.AdminClientSettings
 import fs2.kafka.internal.converters.collection.*
+import fs2.kafka.AdminClientSettings
 
 import org.apache.kafka.clients.admin.AdminClient
 

modules/core/src/main/scala/fs2/kafka/consumer/KafkaSubscription.scala

@@ -8,8 +8,8 @@ package fs2.kafka.consumer
 
 import scala.util.matching.Regex
 
-import cats.Reducible
 import cats.data.NonEmptyList
+import cats.Reducible
 
 trait KafkaSubscription[F[_]] {
 

modules/core/src/main/scala/fs2/kafka/consumer/MkConsumer.scala

@@ -7,8 +7,8 @@
 package fs2.kafka.consumer
 
 import cats.effect.Sync
-import fs2.kafka.internal.converters.collection.*
 import fs2.kafka.{ConsumerSettings, KafkaByteConsumer}
+import fs2.kafka.internal.converters.collection.*
 
 import org.apache.kafka.common.serialization.ByteArrayDeserializer
 

modules/core/src/main/scala/fs2/kafka/instances.scala

@@ -6,12 +6,12 @@
 
 package fs2.kafka
 
+import cats.{Order, Show}
 import cats.instances.int.*
 import cats.instances.long.*
 import cats.instances.string.*
 import cats.instances.tuple.*
 import cats.syntax.show.*
-import cats.{Order, Show}
 
 import org.apache.kafka.clients.consumer.OffsetAndMetadata
 import org.apache.kafka.clients.producer.RecordMetadata

modules/core/src/main/scala/fs2/kafka/internal/Blocking.scala

@@ -10,8 +10,8 @@ import java.util.concurrent.Executors
 
 import scala.concurrent.ExecutionContext
 
-import cats.effect.syntax.async.*
 import cats.effect.{Async, Resource, Sync}
+import cats.effect.syntax.async.*
 
 private[kafka] trait Blocking[F[_]] {
   def apply[A](a: => A): F[A]

modules/core/src/main/scala/fs2/kafka/internal/KafkaConsumerActor.scala

@@ -16,13 +16,13 @@ import cats.effect.*
 import cats.effect.std.*
 import cats.effect.syntax.all.*
 import cats.syntax.all.*
-import fs2.Chunk
 import fs2.kafka.*
 import fs2.kafka.instances.*
-import fs2.kafka.internal.KafkaConsumerActor.*
-import fs2.kafka.internal.LogEntry.*
 import fs2.kafka.internal.converters.collection.*
 import fs2.kafka.internal.syntax.*
+import fs2.kafka.internal.KafkaConsumerActor.*
+import fs2.kafka.internal.LogEntry.*
+import fs2.Chunk
 
 import org.apache.kafka.clients.consumer.{
   ConsumerConfig,