Add -Xsource:3 (#675)

* Add -Xsource:3; fix compiler warnings; use wildcard for imports
evolution-gaming · Feb 5, 2025 · e0fce4d · e0fce4d
1 parent ccacfec
commit e0fce4d
Show file tree

Hide file tree

Showing 118 changed files with 246 additions and 244 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -2,7 +2,7 @@
 // https://scalameta.org/scalafmt/docs/configuration.html
 project.git = true
 
-runner.dialect = scala213
+runner.dialect = scala213source3
 
 version = 3.7.14
 

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-import Dependencies._
+import Dependencies.*
 
 ThisBuild / versionScheme := Some("early-semver")
 ThisBuild / evictionErrorLevel := Level.Warn
@@ -21,6 +21,7 @@ lazy val commonSettings = Seq(
     "org.scala-lang.modules" %% "scala-java8-compat" % "always"
   ),
   addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full),
+  scalacOptions ++= Seq("-Xsource:3"),
 )
 
 lazy val root = (project in file("."))

diff --git a/core-it-tests/src/test/scala/com/evolutiongaming/kafka/flow/ShutdownSpec.scala b/core-it-tests/src/test/scala/com/evolutiongaming/kafka/flow/ShutdownSpec.scala
@@ -3,7 +3,7 @@ package com.evolutiongaming.kafka.flow
 import cats.data.{NonEmptyList, NonEmptySet}
 import cats.effect.unsafe.IORuntime
 import cats.effect.{Deferred, IO, Ref, Resource}
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.catshelper.LogOf
 import com.evolutiongaming.retry.Retry
 import com.evolutiongaming.skafka.consumer.ConsumerRecords
@@ -12,7 +12,7 @@ import com.evolutiongaming.skafka.{CommonConfig, Offset, Partition}
 import com.evolutiongaming.sstream.Stream
 import scodec.bits.ByteVector
 
-import scala.concurrent.duration._
+import scala.concurrent.duration.*
 
 class ShutdownSpec extends ForAllKafkaSuite {
 

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/AdditionalStatePersist.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/AdditionalStatePersist.scala
@@ -1,9 +1,9 @@
 package com.evolutiongaming.kafka.flow
 
 import cats.Applicative
-import cats.effect.syntax.all._
+import cats.effect.syntax.all.*
 import cats.effect.{Clock, MonadCancel, MonadCancelThrow, Ref}
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.kafka.flow.kafka.OffsetToCommit
 import com.evolutiongaming.kafka.flow.persistence.Persistence
 import com.evolutiongaming.skafka.consumer.ConsumerRecord

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/ConsumerFlow.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/ConsumerFlow.scala
@@ -3,7 +3,7 @@ package com.evolutiongaming.kafka.flow
 import cats.MonadThrow
 import cats.data.NonEmptySet
 import cats.effect.Resource
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.catshelper.{Log, LogOf}
 import com.evolutiongaming.kafka.flow.kafka.Consumer
 import com.evolutiongaming.skafka.Topic

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/ConsumerFlowConfig.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/ConsumerFlowConfig.scala
@@ -1,6 +1,6 @@
 package com.evolutiongaming.kafka.flow
 
-import scala.concurrent.duration._
+import scala.concurrent.duration.*
 
 /** Configuration of `ConsumerFlow`.
   *

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/EnhancedFold.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/EnhancedFold.scala
@@ -1,6 +1,6 @@
 package com.evolutiongaming.kafka.flow
 
-import cats.syntax.all._
+import cats.syntax.all.*
 import cats.{Applicative, ApplicativeError, Monad}
 
 /** Given an optional state `S` and an incoming event `E`, produces a resulting optional state `S`. This is the main

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/Fold.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/Fold.scala
@@ -4,7 +4,7 @@ import cats.Applicative
 import cats.ApplicativeError
 import cats.Functor
 import cats.Monad
-import cats.syntax.all._
+import cats.syntax.all.*
 
 /** Reads a state and effectfully produces a new one.
   *

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/FoldOption.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/FoldOption.scala
@@ -4,7 +4,7 @@ import cats.Applicative
 import cats.ApplicativeError
 import cats.Functor
 import cats.Monad
-import cats.syntax.all._
+import cats.syntax.all.*
 
 /** Convenience methods for using `Fold` with optional state */
 final case class FoldOption[F[_], S, A](value: Fold[F, Option[S], A]) {

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/FoldToState.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/FoldToState.scala
@@ -4,8 +4,8 @@ import cats.Monad
 import cats.data.NonEmptyList
 import cats.effect.{Ref, Sync}
 import cats.mtl.Stateful
-import cats.syntax.all._
-import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances._
+import cats.syntax.all.*
+import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances.*
 import com.evolutiongaming.kafka.flow.persistence.Persistence
 
 /** Applies records to a state stored inside and informs the listeners about the changes */

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/KafkaFlow.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/KafkaFlow.scala
@@ -1,16 +1,16 @@
 package com.evolutiongaming.kafka.flow
 
 import cats.effect.{Concurrent, Resource}
-import cats.effect.implicits._
+import cats.effect.implicits.*
 import cats.effect.kernel.Outcome
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.catshelper.{BracketThrowable, LogOf}
 import com.evolutiongaming.kafka.flow.kafka.Consumer
 import com.evolutiongaming.random.Random
 import com.evolutiongaming.retry.{OnError, Retry, Sleep, Strategy}
 import com.evolutiongaming.sstream.Stream
 
-import scala.concurrent.duration._
+import scala.concurrent.duration.*
 import scodec.bits.ByteVector
 import com.evolutiongaming.skafka.consumer.ConsumerRecords
 

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/KeyContext.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/KeyContext.scala
@@ -2,10 +2,10 @@ package com.evolutiongaming.kafka.flow
 
 import cats.effect.{Ref, Resource}
 import cats.mtl.Stateful
-import cats.syntax.all._
+import cats.syntax.all.*
 import cats.{Applicative, Monad}
 import com.evolutiongaming.catshelper.Log
-import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances._
+import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances.*
 import com.evolutiongaming.skafka.Offset
 
 /** Key specific metainformation inside of parititon.

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/KeyFlow.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/KeyFlow.scala
@@ -2,12 +2,12 @@ package com.evolutiongaming.kafka.flow
 
 import cats.data.NonEmptyList
 import cats.effect.kernel.Resource
-import cats.effect.syntax.resource._
+import cats.effect.syntax.resource.*
 import cats.effect.{Ref, Sync}
 import cats.mtl.Stateful
-import cats.syntax.all._
+import cats.syntax.all.*
 import cats.{Applicative, Monad}
-import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances._
+import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances.*
 import com.evolutiongaming.kafka.flow.persistence.Persistence
 import com.evolutiongaming.kafka.flow.registry.EntityRegistry
 import com.evolutiongaming.kafka.flow.timer.{ReadTimestamps, TimerFlow}

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/KeyStateOf.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/KeyStateOf.scala
@@ -2,7 +2,7 @@ package com.evolutiongaming.kafka.flow
 
 import cats.Applicative
 import cats.effect.{Resource, Sync}
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.kafka.flow.key.KeysOf
 import com.evolutiongaming.kafka.flow.persistence.{PersistenceOf, SnapshotPersistenceOf}
 import com.evolutiongaming.kafka.flow.registry.EntityRegistry

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/LogResource.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/LogResource.scala
@@ -2,7 +2,7 @@ package com.evolutiongaming.kafka.flow
 
 import cats.FlatMap
 import cats.effect.Resource
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.catshelper.{Log, LogOf}
 
 object LogResource {

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/PartitionFlow.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/PartitionFlow.scala
@@ -2,14 +2,14 @@ package com.evolutiongaming.kafka.flow
 
 import cats.Applicative
 import cats.data.NonEmptyList
-import cats.effect._
-import cats.effect.implicits._
+import cats.effect.*
+import cats.effect.implicits.*
 import cats.kernel.CommutativeMonoid
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolution.scache.Cache
-import com.evolutiongaming.catshelper.ClockHelper._
+import com.evolutiongaming.catshelper.ClockHelper.*
 import com.evolutiongaming.catshelper.{Log, LogOf}
-import com.evolutiongaming.kafka.flow.PartitionFlowConfig.ParallelismMode._
+import com.evolutiongaming.kafka.flow.PartitionFlowConfig.ParallelismMode.*
 import com.evolutiongaming.kafka.flow.kafka.{OffsetToCommit, ScheduleCommit}
 import com.evolutiongaming.kafka.flow.timer.{TimerContext, Timestamp}
 import com.evolutiongaming.skafka.consumer.{ConsumerRecord, WithSize}

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/PartitionFlowConfig.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/PartitionFlowConfig.scala
@@ -2,7 +2,7 @@ package com.evolutiongaming.kafka.flow
 
 import com.evolutiongaming.kafka.flow.PartitionFlowConfig.ParallelismMode
 
-import scala.concurrent.duration._
+import scala.concurrent.duration.*
 
 /** Configuration of `PartitionFlow`.
   *

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/RebalanceListener.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/RebalanceListener.scala
@@ -2,11 +2,11 @@ package com.evolutiongaming.kafka.flow
 
 import cats.Monad
 import cats.data.NonEmptySet
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.catshelper.LogOf
 import com.evolutiongaming.kafka.flow.ConsumerFlow.log
-import com.evolutiongaming.skafka.consumer.RebalanceCallback._
-import com.evolutiongaming.skafka.consumer.RebalanceCallback.syntax._
+import com.evolutiongaming.skafka.consumer.RebalanceCallback.*
+import com.evolutiongaming.skafka.consumer.RebalanceCallback.syntax.*
 import com.evolutiongaming.skafka.consumer.{
   RebalanceCallback,
   RebalanceListener1 => SRebalanceListener1,

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/RemapKey.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/RemapKey.scala
@@ -1,7 +1,7 @@
 package com.evolutiongaming.kafka.flow
 
 import cats.Applicative
-import cats.syntax.applicative._
+import cats.syntax.applicative.*
 import com.evolutiongaming.skafka.consumer.ConsumerRecord
 import scodec.bits.ByteVector
 

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/Tick.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/Tick.scala
@@ -1,7 +1,7 @@
 package com.evolutiongaming.kafka.flow
 
 import cats.Applicative
-import cats.syntax.all._
+import cats.syntax.all.*
 import cats.Functor
 
 case class Tick[F[_], S](run: S => F[S]) {

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/TickToState.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/TickToState.scala
@@ -3,8 +3,8 @@ package com.evolutiongaming.kafka.flow
 import cats.Monad
 import cats.effect.Ref
 import cats.mtl.Stateful
-import cats.syntax.all._
-import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances._
+import cats.syntax.all.*
+import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances.*
 import com.evolutiongaming.kafka.flow.persistence.Persistence
 
 /** Calls the stateful routine stored inside */

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/TopicFlow.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/TopicFlow.scala
@@ -3,14 +3,14 @@ package com.evolutiongaming.kafka.flow
 import cats.Parallel
 import cats.data.NonEmptySet
 import cats.effect.std.Semaphore
-import cats.effect.syntax.all._
+import cats.effect.syntax.all.*
 import cats.effect.{Concurrent, Ref, Resource}
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolution.scache.Cache
-import com.evolutiongaming.catshelper.DataHelper._
+import com.evolutiongaming.catshelper.DataHelper.*
 import com.evolutiongaming.catshelper.{Log, LogOf, Runtime}
 import com.evolutiongaming.kafka.flow.kafka.{Consumer, PendingCommits}
-import com.evolutiongaming.skafka._
+import com.evolutiongaming.skafka.*
 import com.evolutiongaming.skafka.consumer.ConsumerRecords
 import scodec.bits.ByteVector
 

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/effect/CatsEffectMtlInstances.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/effect/CatsEffectMtlInstances.scala
@@ -3,7 +3,7 @@ package com.evolutiongaming.kafka.flow.effect
 import cats.Monad
 import cats.effect.Ref
 import cats.mtl.Stateful
-import cats.syntax.functor._
+import cats.syntax.functor.*
 
 /** meow-mtl library is not updated and supported anymore, this is just a straight copypasta from there */
 private[flow] object CatsEffectMtlInstances {

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/JournalDatabase.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/JournalDatabase.scala
@@ -2,10 +2,10 @@ package com.evolutiongaming.kafka.flow.journal
 
 import cats.effect.{Ref, Sync}
 import cats.mtl.Stateful
-import cats.syntax.all._
+import cats.syntax.all.*
 import cats.{Applicative, Monad}
 import com.evolutiongaming.catshelper.LogOf
-import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances._
+import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances.*
 import com.evolutiongaming.kafka.flow.kafka.ToOffset
 import com.evolutiongaming.skafka.Offset
 import com.evolutiongaming.sstream.Stream

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/JournalFold.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/JournalFold.scala
@@ -1,7 +1,7 @@
 package com.evolutiongaming.kafka.flow.journal
 
 import cats.Monad
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.catshelper.LogOf
 import com.evolutiongaming.kafka.flow.FoldOption
 import com.evolutiongaming.kafka.flow.snapshot.{KafkaSnapshot, SnapshotFold}

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/JournalParser.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/JournalParser.scala
@@ -2,8 +2,8 @@ package com.evolutiongaming.kafka.flow.journal
 
 import cats.MonadThrow
 import cats.arrow.FunctionK
-import cats.syntax.all._
-import com.evolutiongaming.kafka.journal._
+import cats.syntax.all.*
+import com.evolutiongaming.kafka.journal.*
 import com.evolutiongaming.kafka.journal.conversions.{ConsRecordToActionRecord, KafkaRead}
 import com.evolutiongaming.kafka.journal.util.Fail
 import com.evolutiongaming.skafka.consumer.ConsumerRecord

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/Journals.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/Journals.scala
@@ -3,9 +3,9 @@ package com.evolutiongaming.kafka.flow.journal
 import cats.{Applicative, Monad}
 import cats.effect.Ref
 import cats.mtl.Stateful
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.catshelper.Log
-import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances._
+import com.evolutiongaming.kafka.flow.effect.CatsEffectMtlInstances.*
 import com.evolutiongaming.sstream.Stream
 
 trait Journals[F[_], E] extends JournalReader[F, E] with JournalWriter[F, E]

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/JournalsOf.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/journal/JournalsOf.scala
@@ -1,7 +1,7 @@
 package com.evolutiongaming.kafka.flow.journal
 
 import cats.effect.Sync
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.catshelper.Log
 import com.evolutiongaming.kafka.flow.kafka.ToOffset
 

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/Codecs.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/Codecs.scala
@@ -1,7 +1,7 @@
 package com.evolutiongaming.kafka.flow.kafka
 
 import cats.Applicative
-import cats.syntax.all._
+import cats.syntax.all.*
 import com.evolutiongaming.skafka.{FromBytes, ToBytes, Topic}
 import scodec.bits.ByteVector
 

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/Consumer.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/Consumer.scala
@@ -3,8 +3,8 @@ package com.evolutiongaming.kafka.flow.kafka
 import cats.MonadThrow
 import cats.data.{NonEmptyList, NonEmptyMap, NonEmptySet}
 import cats.effect.Ref
-import cats.syntax.all._
-import com.evolutiongaming.skafka._
+import cats.syntax.all.*
+import com.evolutiongaming.skafka.*
 import com.evolutiongaming.skafka.consumer.{Consumer => KafkaConsumer, _}
 import scodec.bits.ByteVector
 

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/EmptyRebalanceConsumer.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/EmptyRebalanceConsumer.scala
@@ -4,7 +4,7 @@ import java.time.Instant
 
 import cats.data.{NonEmptyMap, NonEmptySet}
 import com.evolutiongaming.skafka.consumer.{ConsumerGroupMetadata, OffsetAndTimestamp, RebalanceConsumer}
-import com.evolutiongaming.skafka._
+import com.evolutiongaming.skafka.*
 
 import scala.concurrent.duration.FiniteDuration
 import scala.util.Try

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/KafkaModule.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/KafkaModule.scala
@@ -1,10 +1,10 @@
 package com.evolutiongaming.kafka.flow.kafka
 
 import cats.effect.{Async, Clock, Resource}
-import cats.syntax.all._
-import com.evolutiongaming.catshelper._
+import cats.syntax.all.*
+import com.evolutiongaming.catshelper.*
 import com.evolutiongaming.kafka.flow.LogResource
-import com.evolutiongaming.kafka.flow.kafka.Codecs._
+import com.evolutiongaming.kafka.flow.kafka.Codecs.*
 import com.evolutiongaming.skafka.KafkaHealthCheck
 import com.evolutiongaming.skafka.consumer.{
   AutoOffsetReset,
@@ -60,7 +60,7 @@ object KafkaModule {
 
       def healthCheck = _healthCheck
 
-      def consumerOf = { groupId: String =>
+      def consumerOf = { (groupId: String) =>
         LogResource[F](KafkaModule.getClass, s"Consumer($groupId)") *>
           _consumerOf[String, ByteVector](
             config.copy(

diff --git a/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/PendingCommits.scala b/core/src/main/scala/com/evolutiongaming/kafka/flow/kafka/PendingCommits.scala
@@ -1,6 +1,6 @@
 package com.evolutiongaming.kafka.flow.kafka
 
-import cats.syntax.all._
+import cats.syntax.all.*
 import cats.data.NonEmptySet
 import cats.effect.Ref
 import com.evolutiongaming.skafka.{OffsetAndMetadata, Partition, TopicPartition}