build: Prepare Scala 3 build

cassandra-datastax-driver-pureconfig/src/main/scala/com/avast/sst/datastax/pureconfig/ConfigReaders.scala

@@ -2,71 +2,84 @@ package com.avast.sst.datastax.pureconfig
 
 import com.avast.sst.datastax.config._
 import pureconfig.generic.ProductHint
-import pureconfig.generic.semiauto.{deriveEnumerationReader, deriveReader}
+import pureconfig.generic.semiauto._
 import pureconfig.{ConfigFieldMapping, ConfigReader, PascalCase}
 
 trait ConfigReaders {
 
   implicit protected def hint[T]: ProductHint[T] = ProductHint.default
 
-  implicit val cassandraDatastaxDriverDatastaxConfigReader: ConfigReader[CassandraDatastaxDriverConfig] = deriveReader
+  implicit val cassandraDatastaxDriverDatastaxConfigReader: ConfigReader[CassandraDatastaxDriverConfig] =
+    deriveReader[CassandraDatastaxDriverConfig]
 
   // Basic driver config
-  implicit val cassandraDatastaxDriverBasicConfigReader: ConfigReader[BasicConfig] = deriveReader
+  implicit val cassandraDatastaxDriverBasicConfigReader: ConfigReader[BasicConfig] = deriveReader[BasicConfig]
   implicit val cassandraDatastaxDriverConsistencyLevelReader: ConfigReader[ConsistencyLevel] =
     deriveEnumerationReader[ConsistencyLevel](ConfigFieldMapping(PascalCase, PascalCase))
-  implicit val cassandraDatastaxDriverBasicRequestConfigReader: ConfigReader[BasicRequestConfig] = deriveReader
-  implicit val cassandraDatastaxDriverLoadBalancingConfigReader: ConfigReader[LoadBalancingPolicyConfig] = deriveReader
-  implicit val cassandraDatastaxDriverFilterConfigReader: ConfigReader[FilterConfig] = deriveReader
+  implicit val cassandraDatastaxDriverBasicRequestConfigReader: ConfigReader[BasicRequestConfig] = deriveReader[BasicRequestConfig]
+  implicit val cassandraDatastaxDriverLoadBalancingConfigReader: ConfigReader[LoadBalancingPolicyConfig] =
+    deriveReader[LoadBalancingPolicyConfig]
+  implicit val cassandraDatastaxDriverFilterConfigReader: ConfigReader[FilterConfig] = deriveReader[FilterConfig]
 
   // Advanced driver config
-  implicit val cassandraDatastaxDriverAdvancedConfigReader: ConfigReader[AdvancedConfig] = deriveReader
-  implicit val cassandraDatastaxDriverRetryPolicyConfigReader: ConfigReader[RetryPolicyConfig] = deriveReader
-  implicit val cassandraDatastaxDriverSpeculativeExecutionPolicyConfigReader: ConfigReader[SpeculativeExecutionPolicyConfig] = deriveReader
-  implicit val cassandraDatastaxDriverTimestampGeneratorConfigReader: ConfigReader[TimestampGeneratorConfig] = deriveReader
-  implicit val cassandraDatastaxDriverTraceConfigReader: ConfigReader[TraceConfig] = deriveReader
-  implicit val cassandraDatastaxDriverDriftWarningConfigReader: ConfigReader[DriftWarningConfig] = deriveReader
-  implicit val cassandraDatastaxDriverConnectionConfigReader: ConfigReader[ConnectionConfig] = deriveReader
-  implicit val cassandraDatastaxDriverPoolConfigReader: ConfigReader[PoolConfig] = deriveReader
-  implicit val cassandraDatastaxDriverReconnectionPolicyConfigReader: ConfigReader[ReconnectionPolicyConfig] = deriveReader
-  implicit val cassandraDatastaxDriverAuthProviderConfigReader: ConfigReader[AuthProviderConfig] = deriveReader
-  implicit val cassandraDatastaxDriverRequestTrackerConfigReader: ConfigReader[RequestTrackerConfig] = deriveReader
-  implicit val cassandraDatastaxDriverLogsConfigReader: ConfigReader[LogsConfig] = deriveReader
-  implicit val cassandraDatastaxDriverSlowConfigReader: ConfigReader[SlowConfig] = deriveReader
-  implicit val cassandraDatastaxDriverThrottlerConfigReader: ConfigReader[ThrottlerConfig] = deriveReader
-  implicit val cassandraDatastaxDriverNodeStateListenerConfigReader: ConfigReader[NodeStateListenerConfig] = deriveReader
-  implicit val cassandraDatastaxDriverSchemaChangeListenerConfigReader: ConfigReader[SchemaChangeListenerConfig] = deriveReader
-  implicit val cassandraDatastaxDriverAddressTranslatorConfigReader: ConfigReader[AddressTranslatorConfig] = deriveReader
-  implicit val cassandraDatastaxDriverProtocolConfigReader: ConfigReader[ProtocolConfig] = deriveReader
-  implicit val cassandraDatastaxDriverMetricsConfigReader: ConfigReader[MetricsConfig] = deriveReader
-  implicit val cassandraDatastaxDriverSessionConfigReader: ConfigReader[SessionConfig] = deriveReader
-  implicit val cassandraDatastaxDriverCqlRequestsConfigReader: ConfigReader[CqlRequestsConfig] = deriveReader
-  implicit val cassandraDatastaxDriverThrottlingConfigReader: ConfigReader[ThrottlingConfig] = deriveReader
-  implicit val cassandraDatastaxDriverDelayConfigReader: ConfigReader[DelayConfig] = deriveReader
-  implicit val cassandraDatastaxDriverNodeConfigReader: ConfigReader[NodeConfig] = deriveReader
-  implicit val cassandraDatastaxDriverCqlMessagesConfigReader: ConfigReader[CqlMessagesConfig] = deriveReader
-  implicit val cassandraDatastaxDriverSocketConfigReader: ConfigReader[SocketConfig] = deriveReader
-  implicit val cassandraDatastaxDriverHeartbeatConfigReader: ConfigReader[HeartbeatConfig] = deriveReader
-  implicit val cassandraDatastaxDriverMetadataConfigReader: ConfigReader[MetadataConfig] = deriveReader
-  implicit val cassandraDatastaxDriverTopologyEventDebouncerConfigReader: ConfigReader[TopologyEventDebouncerConfig] = deriveReader
-  implicit val cassandraDatastaxDriverSchemaConfigReader: ConfigReader[SchemaConfig] = deriveReader
-  implicit val cassandraDatastaxDriverDebouncerConfigReader: ConfigReader[DebouncerConfig] = deriveReader
-  implicit val cassandraDatastaxDriverTokenMapConfigReader: ConfigReader[TokenMapConfig] = deriveReader
-  implicit val cassandraDatastaxDriverControlConnectionConfigReader: ConfigReader[ControlConnectionConfig] = deriveReader
-  implicit val cassandraDatastaxDriverSchemaAgreementConfigReader: ConfigReader[SchemaAgreementConfig] = deriveReader
-  implicit val cassandraDatastaxDriverPreparedStatementsConfigReader: ConfigReader[PreparedStatementsConfig] = deriveReader
-  implicit val cassandraDatastaxDriverReprepareOnUpConfigReader: ConfigReader[ReprepareOnUpConfig] = deriveReader
-  implicit val cassandraDatastaxDriverNettyConfigReader: ConfigReader[NettyConfig] = deriveReader
-  implicit val cassandraDatastaxDriverGroupConfigReader: ConfigReader[GroupConfig] = deriveReader
-  implicit val cassandraDatastaxDriverShutdownConfigReader: ConfigReader[ShutdownConfig] = deriveReader
-  implicit val cassandraDatastaxDriverTimerConfigReader: ConfigReader[TimerConfig] = deriveReader
-  implicit val cassandraDatastaxDriverCoalescerConfigReader: ConfigReader[CoalescerConfig] = deriveReader
-  implicit val cassandraDatastaxDriverAdvancedRequestConfigReader: ConfigReader[AdvancedRequestConfig] = deriveReader
+  implicit val cassandraDatastaxDriverAdvancedConfigReader: ConfigReader[AdvancedConfig] = deriveReader[AdvancedConfig]
+  implicit val cassandraDatastaxDriverRetryPolicyConfigReader: ConfigReader[RetryPolicyConfig] = deriveReader[RetryPolicyConfig]
+  implicit val cassandraDatastaxDriverSpeculativeExecutionPolicyConfigReader: ConfigReader[SpeculativeExecutionPolicyConfig] =
+    deriveReader[SpeculativeExecutionPolicyConfig]
+  implicit val cassandraDatastaxDriverTimestampGeneratorConfigReader: ConfigReader[TimestampGeneratorConfig] =
+    deriveReader[TimestampGeneratorConfig]
+  implicit val cassandraDatastaxDriverTraceConfigReader: ConfigReader[TraceConfig] = deriveReader[TraceConfig]
+  implicit val cassandraDatastaxDriverDriftWarningConfigReader: ConfigReader[DriftWarningConfig] = deriveReader[DriftWarningConfig]
+  implicit val cassandraDatastaxDriverConnectionConfigReader: ConfigReader[ConnectionConfig] = deriveReader[ConnectionConfig]
+  implicit val cassandraDatastaxDriverPoolConfigReader: ConfigReader[PoolConfig] = deriveReader[PoolConfig]
+  implicit val cassandraDatastaxDriverReconnectionPolicyConfigReader: ConfigReader[ReconnectionPolicyConfig] =
+    deriveReader[ReconnectionPolicyConfig]
+  implicit val cassandraDatastaxDriverAuthProviderConfigReader: ConfigReader[AuthProviderConfig] = deriveReader[AuthProviderConfig]
+  implicit val cassandraDatastaxDriverRequestTrackerConfigReader: ConfigReader[RequestTrackerConfig] = deriveReader[RequestTrackerConfig]
+  implicit val cassandraDatastaxDriverLogsConfigReader: ConfigReader[LogsConfig] = deriveReader[LogsConfig]
+  implicit val cassandraDatastaxDriverSlowConfigReader: ConfigReader[SlowConfig] = deriveReader[SlowConfig]
+  implicit val cassandraDatastaxDriverThrottlerConfigReader: ConfigReader[ThrottlerConfig] = deriveReader[ThrottlerConfig]
+  implicit val cassandraDatastaxDriverNodeStateListenerConfigReader: ConfigReader[NodeStateListenerConfig] =
+    deriveReader[NodeStateListenerConfig]
+  implicit val cassandraDatastaxDriverSchemaChangeListenerConfigReader: ConfigReader[SchemaChangeListenerConfig] =
+    deriveReader[SchemaChangeListenerConfig]
+  implicit val cassandraDatastaxDriverAddressTranslatorConfigReader: ConfigReader[AddressTranslatorConfig] =
+    deriveReader[AddressTranslatorConfig]
+  implicit val cassandraDatastaxDriverProtocolConfigReader: ConfigReader[ProtocolConfig] = deriveReader[ProtocolConfig]
+  implicit val cassandraDatastaxDriverMetricsConfigReader: ConfigReader[MetricsConfig] = deriveReader[MetricsConfig]
+  implicit val cassandraDatastaxDriverSessionConfigReader: ConfigReader[SessionConfig] = deriveReader[SessionConfig]
+  implicit val cassandraDatastaxDriverCqlRequestsConfigReader: ConfigReader[CqlRequestsConfig] = deriveReader[CqlRequestsConfig]
+  implicit val cassandraDatastaxDriverThrottlingConfigReader: ConfigReader[ThrottlingConfig] = deriveReader[ThrottlingConfig]
+  implicit val cassandraDatastaxDriverDelayConfigReader: ConfigReader[DelayConfig] = deriveReader[DelayConfig]
+  implicit val cassandraDatastaxDriverNodeConfigReader: ConfigReader[NodeConfig] = deriveReader[NodeConfig]
+  implicit val cassandraDatastaxDriverCqlMessagesConfigReader: ConfigReader[CqlMessagesConfig] = deriveReader[CqlMessagesConfig]
+  implicit val cassandraDatastaxDriverSocketConfigReader: ConfigReader[SocketConfig] = deriveReader[SocketConfig]
+  implicit val cassandraDatastaxDriverHeartbeatConfigReader: ConfigReader[HeartbeatConfig] = deriveReader[HeartbeatConfig]
+  implicit val cassandraDatastaxDriverMetadataConfigReader: ConfigReader[MetadataConfig] = deriveReader[MetadataConfig]
+  implicit val cassandraDatastaxDriverTopologyEventDebouncerConfigReader: ConfigReader[TopologyEventDebouncerConfig] =
+    deriveReader[TopologyEventDebouncerConfig]
+  implicit val cassandraDatastaxDriverSchemaConfigReader: ConfigReader[SchemaConfig] = deriveReader[SchemaConfig]
+  implicit val cassandraDatastaxDriverDebouncerConfigReader: ConfigReader[DebouncerConfig] = deriveReader[DebouncerConfig]
+  implicit val cassandraDatastaxDriverTokenMapConfigReader: ConfigReader[TokenMapConfig] = deriveReader[TokenMapConfig]
+  implicit val cassandraDatastaxDriverControlConnectionConfigReader: ConfigReader[ControlConnectionConfig] =
+    deriveReader[ControlConnectionConfig]
+  implicit val cassandraDatastaxDriverSchemaAgreementConfigReader: ConfigReader[SchemaAgreementConfig] = deriveReader[SchemaAgreementConfig]
+  implicit val cassandraDatastaxDriverPreparedStatementsConfigReader: ConfigReader[PreparedStatementsConfig] =
+    deriveReader[PreparedStatementsConfig]
+  implicit val cassandraDatastaxDriverReprepareOnUpConfigReader: ConfigReader[ReprepareOnUpConfig] = deriveReader[ReprepareOnUpConfig]
+  implicit val cassandraDatastaxDriverNettyConfigReader: ConfigReader[NettyConfig] = deriveReader[NettyConfig]
+  implicit val cassandraDatastaxDriverGroupConfigReader: ConfigReader[GroupConfig] = deriveReader[GroupConfig]
+  implicit val cassandraDatastaxDriverShutdownConfigReader: ConfigReader[ShutdownConfig] = deriveReader[ShutdownConfig]
+  implicit val cassandraDatastaxDriverTimerConfigReader: ConfigReader[TimerConfig] = deriveReader[TimerConfig]
+  implicit val cassandraDatastaxDriverCoalescerConfigReader: ConfigReader[CoalescerConfig] = deriveReader[CoalescerConfig]
+  implicit val cassandraDatastaxDriverAdvancedRequestConfigReader: ConfigReader[AdvancedRequestConfig] = deriveReader[AdvancedRequestConfig]
 
   // Profile overridable config
-  implicit val cassandraDatastaxDriverProfileConfigReader: ConfigReader[ProfileConfig] = deriveReader
-  implicit val cassandraDatastaxDriverProfileBasicConfigReader: ConfigReader[ProfileBasicConfig] = deriveReader
-  implicit val cassandraDatastaxDriverProfileAdvancedConfigReader: ConfigReader[ProfileAdvancedConfig] = deriveReader
-  implicit val cassandraDatastaxDriverProfilePreparedStatementsConfigReader: ConfigReader[ProfilePreparedStatementsConfig] = deriveReader
-  implicit val cassandraDatastaxDriverProfileProfileAdvancedRequestConfigReader: ConfigReader[ProfileAdvancedRequestConfig] = deriveReader
+  implicit val cassandraDatastaxDriverProfileConfigReader: ConfigReader[ProfileConfig] = deriveReader[ProfileConfig]
+  implicit val cassandraDatastaxDriverProfileBasicConfigReader: ConfigReader[ProfileBasicConfig] = deriveReader[ProfileBasicConfig]
+  implicit val cassandraDatastaxDriverProfileAdvancedConfigReader: ConfigReader[ProfileAdvancedConfig] = deriveReader[ProfileAdvancedConfig]
+  implicit val cassandraDatastaxDriverProfilePreparedStatementsConfigReader: ConfigReader[ProfilePreparedStatementsConfig] =
+    deriveReader[ProfilePreparedStatementsConfig]
+  implicit val cassandraDatastaxDriverProfileProfileAdvancedRequestConfigReader: ConfigReader[ProfileAdvancedRequestConfig] =
+    deriveReader[ProfileAdvancedRequestConfig]
 }

cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala

@@ -177,7 +177,7 @@ object CassandraDatastaxDriverModule {
       }
     }
 
-    val release = { session: CqlSession =>
+    val release = { (session: CqlSession) =>
       Sync[F].delay {
         session.close()
       }

doobie-hikari-pureconfig/src/main/scala/com/avast/sst/doobie/pureconfig/ConfigReaders.scala

@@ -6,7 +6,7 @@ import doobie.enumerated.TransactionIsolation
 import pureconfig.ConfigReader
 import pureconfig.error.CannotConvert
 import pureconfig.generic.ProductHint
-import pureconfig.generic.semiauto.deriveReader
+import pureconfig.generic.semiauto._
 
 trait ConfigReaders {
 
@@ -21,6 +21,6 @@ trait ConfigReaders {
     case unknown                        => Left(CannotConvert(unknown, "TransactionIsolation", "unknown value"))
   }
 
-  implicit val doobieDoobieHikariConfigReader: ConfigReader[DoobieHikariConfig] = deriveReader
+  implicit val doobieDoobieHikariConfigReader: ConfigReader[DoobieHikariConfig] = deriveReader[DoobieHikariConfig]
 
 }

doobie-hikari-pureconfig/src/main/scala/com/avast/sst/doobie/pureconfig/implicits.scala

@@ -3,21 +3,21 @@ package com.avast.sst.doobie.pureconfig
 import pureconfig.ConfigFieldMapping
 import pureconfig.generic.ProductHint
 
-/** Contains [[pureconfig.ConfigReader]] and [[pureconfig.ConfigWriter]] instances with default "kebab-case" naming convention. */
-object implicits extends ConfigReaders with ConfigWriters {
+/** Contains [[pureconfig.ConfigReader]] instances with default "kebab-case" naming convention. */
+object implicits extends ConfigReaders {
 
   override implicit protected def hint[T]: ProductHint[T] = ProductHint.default
 
-  /** Contains [[pureconfig.ConfigReader]] and [[pureconfig.ConfigWriter]] instances with "kebab-case" naming convention.
+  /** Contains [[pureconfig.ConfigReader]] instances with "kebab-case" naming convention.
     *
     * This is alias for the default `implicits._` import.
     */
-  object KebabCase extends ConfigReaders with ConfigWriters {
+  object KebabCase extends ConfigReaders {
     override implicit protected def hint[T]: ProductHint[T] = ProductHint.default
   }
 
-  /** Contains [[pureconfig.ConfigReader]] and [[pureconfig.ConfigWriter]] instances with "camelCase" naming convention. */
-  object CamelCase extends ConfigReaders with ConfigWriters {
+  /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
+  object CamelCase extends ConfigReaders {
     implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 

doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala

@@ -1,6 +1,6 @@
 package com.avast.sst.doobie
 
-import doobie.enum.TransactionIsolation
+import doobie.enumerated.TransactionIsolation
 
 import java.util.concurrent.TimeUnit
 import scala.concurrent.duration.FiniteDuration

example/src/main/scala/com/avast/sst/example/Main.scala

@@ -47,13 +47,18 @@ object Main extends ZioServerApp {
         executorModule
           .makeThreadPoolExecutor(
             configuration.boundedConnectExecutor,
-            new ConfigurableThreadFactory(Config(Some("hikari-connect-%02d")))
+            new ConfigurableThreadFactory(Config(nameFormat = Some("hikari-connect-%02d")))
           )
           .map(ExecutionContext.fromExecutorService)
       hikariMetricsFactory = new MicrometerMetricsTrackerFactory(meterRegistry)
       doobieTransactor <-
         DoobieHikariModule
-          .make[Task](configuration.database, boundedConnectExecutionContext, executorModule.blocker, Some(hikariMetricsFactory))
+          .make[Task](
+            configuration.database,
+            boundedConnectExecutionContext: ExecutionContext,
+            executorModule.blocker,
+            Some(hikariMetricsFactory)
+          )
       randomService = RandomService(doobieTransactor)
       httpClient <- Http4sBlazeClientModule.make[Task](configuration.client, executorModule.executionContext)
       circuitBreakerMetrics <- Resource.eval(MicrometerCircuitBreakerMetricsModule.make[Task]("test-http-client", meterRegistry))

example/src/main/scala/com/avast/sst/example/config/Configuration.scala

@@ -13,7 +13,7 @@ import com.avast.sst.micrometer.jmx.pureconfig.implicits._
 import com.avast.sst.monix.catnap.CircuitBreakerConfig
 import com.avast.sst.monix.catnap.pureconfig.implicits._
 import pureconfig.ConfigReader
-import pureconfig.generic.semiauto.deriveReader
+import pureconfig.generic.semiauto._
 
 final case class Configuration(
     server: Http4sBlazeServerConfig,
@@ -26,6 +26,6 @@ final case class Configuration(
 
 object Configuration {
 
-  implicit val reader: ConfigReader[Configuration] = deriveReader
+  implicit val reader: ConfigReader[Configuration] = deriveReader[Configuration]
 
 }

example/src/main/scala/com/avast/sst/example/service/RandomService.scala

@@ -1,5 +1,6 @@
 package com.avast.sst.example.service
 
+import doobie.Fragment
 import doobie.implicits._
 import doobie.util.transactor.Transactor
 import zio.Task
@@ -16,7 +17,8 @@ object RandomService {
   def apply(transactor: Transactor[Task]): RandomService =
     new RandomService {
       override def randomNumber: Task[Double] = {
-        sql"select random()"
+        Fragment
+          .const("select random()")
           .query[Double]
           .unique
           .transact(transactor)

flyway-pureconfig/src/main/scala/com/avast/sst/flyway/pureconfig/ConfigReaders.scala

@@ -6,7 +6,7 @@ import org.flywaydb.core.api.MigrationVersion
 import pureconfig.ConfigReader
 import pureconfig.error.ExceptionThrown
 import pureconfig.generic.ProductHint
-import pureconfig.generic.semiauto.deriveReader
+import pureconfig.generic.semiauto._
 
 import java.nio.charset.Charset
 
@@ -20,6 +20,6 @@ trait ConfigReaders {
 
   implicit val flywayMigrationVersionReader: ConfigReader[MigrationVersion] = ConfigReader[String].map(MigrationVersion.fromVersion)
 
-  implicit val flywayFlywayConfigReader: ConfigReader[FlywayConfig] = deriveReader
+  implicit val flywayFlywayConfigReader: ConfigReader[FlywayConfig] = deriveReader[FlywayConfig]
 
 }