Skip to content

Commit

Permalink
Merge pull request #712 from scala-steward/update/alleycats-core-2.2.0
Browse files Browse the repository at this point in the history
Update alleycats-core, cats-core, cats-free, ... to 2.2.0
  • Loading branch information
chenharryhua authored Sep 3, 2020
2 parents fc88ccd + 76a52ed commit 934ddd4
Show file tree
Hide file tree
Showing 83 changed files with 58 additions and 93 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version in ThisBuild := "0.8.0-SNAPSHOT"
val shapeless = "2.3.3"
val contextual = "1.2.1"
val kittens = "2.1.0"
val catsCore = "2.2.0-RC4"
val catsCore = "2.2.0"
val algebra = "2.0.1"
val fs2Version = "2.4.4"
val streamz = "0.13-RC1"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
package com.github.chenharryhua.nanjin.common

import cats.instances.int._
import enumeratum.values.{CatsOrderValueEnum, IntEnum, IntEnumEntry}
import monocle.Prism
import monocle.generic.coproduct.coProductPrism
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import cats.effect.{Concurrent, Sync}
import fs2.Stream
import fs2.concurrent.Signal
import org.jline.terminal.{Terminal, TerminalBuilder}
import cats.implicits._
import cats.syntax.all._

object Keyboard {
val pauSe: Char = 's'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.chenharryhua.nanjin.database

import cats.effect.{Async, Blocker, Concurrent, ContextShift, Resource, Timer}
import cats.implicits._
import cats.syntax.all._
import doobie.free.connection.{AsyncConnectionIO, ConnectionIO}
import doobie.hikari.HikariTransactor
import doobie.util.ExecutionContexts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import java.time.format.DateTimeParseException

import cats.Alternative
import cats.data.NonEmptyList
import cats.implicits._
import cats.syntax.all._

final case class FailedParsers(parsers: NonEmptyList[String]) extends AnyVal {
def concat(other: FailedParsers): FailedParsers = FailedParsers(parsers ::: other.parsers)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package com.github.chenharryhua.nanjin.datetime

import java.sql.Timestamp
import java.time._

import cats.implicits._
import cats.{PartialOrder, Show}
import monocle.Prism
import monocle.generic.coproduct.coProductPrism
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import java.time._
import java.time.temporal.{ChronoUnit, TemporalUnit}
import java.util.concurrent.TimeUnit

import cats.implicits._
import cats.syntax.all._
import cats.{Hash, Order, Show}

import scala.concurrent.duration.{Duration, FiniteDuration}
Expand Down
2 changes: 1 addition & 1 deletion datetime/src/test/scala/mtest/DateTimeRangeTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.scalacheck.{Arbitrary, Cogen, Gen}
import org.scalatest.funsuite.AnyFunSuite
import org.scalatest.prop.Configuration
import org.typelevel.discipline.scalatest.FunSuiteDiscipline
import cats.implicits._
import cats.syntax.all._

class DateTimeRangeTest extends AnyFunSuite with FunSuiteDiscipline with Configuration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import akka.stream.Materializer
import akka.stream.alpakka.ftp.scaladsl.{Ftp, FtpApi, Ftps, Sftp}
import akka.stream.alpakka.ftp.{FtpSettings, FtpsSettings, RemoteFileSettings, SftpSettings}
import cats.effect.{Async, Concurrent, ContextShift}
import cats.implicits._
import cats.syntax.all._
import fs2.{Chunk, Stream}
import net.schmizz.sshj.SSHClient
import org.apache.commons.net.ftp.{FTPClient, FTPSClient}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import java.io.InputStream
import java.net.URI

import cats.effect.{Blocker, ContextShift, Resource, Sync}
import cats.implicits._
import cats.syntax.all._
import fs2.io.{readInputStream, writeOutputStream}
import fs2.{Pipe, Pull, Stream}
import org.apache.avro.Schema
Expand Down
2 changes: 1 addition & 1 deletion devices/src/test/scala/mtest/FtpTest.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mtest

import cats.effect.IO
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.devices.{AkkaFtpDownloader, AkkaFtpUploader}
import fs2.Stream
import org.scalatest.Ignore
Expand Down
2 changes: 1 addition & 1 deletion devices/src/test/scala/mtest/HadoopTest.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mtest

import cats.effect.IO
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.devices.NJHadoop
import fs2.Stream
import fs2.io.readInputStream
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.chenharryhua.nanjin.kafka

import cats.effect.{Concurrent, ContextShift, Resource}
import cats.implicits._
import cats.syntax.all._
import fs2.kafka.{adminClientResource, AdminClientSettings, KafkaAdminClient}
import org.apache.kafka.clients.admin.{NewTopic, TopicDescription}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import akka.kafka.{
import akka.stream.Materializer
import cats.data.{NonEmptyList, Reader}
import cats.effect._
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.datetime.NJDateTimeRange
import com.github.chenharryhua.nanjin.utils
import fs2.Stream
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.github.chenharryhua.nanjin.kafka

import java.{lang, util}

import cats.implicits._
import cats.syntax.all._
import cats.{Order, PartialOrder, Show}
import com.github.chenharryhua.nanjin.datetime.NJTimestamp
import eu.timepit.refined.api.Refined
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.github.chenharryhua.nanjin.kafka
import java.time.ZoneId

import cats.effect.{Blocker, ConcurrentEffect, ContextShift, Timer}
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.datetime.NJTimestamp
import com.github.chenharryhua.nanjin.messages.kafka.NJConsumerMessage._
import com.github.chenharryhua.nanjin.messages.kafka._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.github.chenharryhua.nanjin.kafka
import cats.data.Reader
import cats.effect.ConcurrentEffect
import cats.effect.concurrent.Deferred
import cats.implicits._
import cats.syntax.all._
import fs2.Stream
import org.apache.kafka.streams.KafkaStreams
import org.apache.kafka.streams.scala.StreamsBuilder
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.chenharryhua.nanjin.kafka

import cats.effect.{Concurrent, ConcurrentEffect, ContextShift, Resource, Sync, Timer}
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.messages.kafka.NJConsumerMessage
import com.github.chenharryhua.nanjin.messages.kafka.codec.{
KafkaGenericDecoder,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.chenharryhua.nanjin.kafka

import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.messages.kafka.codec.{NJCodec, SerdeOf}
import com.sksamuel.avro4s.SchemaFor
import org.apache.kafka.common.serialization.{Deserializer, Serializer}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import akka.NotUsed
import akka.kafka.ProducerMessage
import cats.Traverse
import cats.effect.{ConcurrentEffect, ContextShift, Resource}
import cats.implicits._
import cats.syntax.all._
import fs2.kafka.{
producerResource,
KafkaProducer => Fs2KafkaProducer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.github.chenharryhua.nanjin.kafka

import cats.Show
import cats.effect.{Resource, Sync}
import cats.implicits._
import cats.syntax.all._
import io.confluent.kafka.schemaregistry.avro.AvroSchema
import io.confluent.kafka.schemaregistry.client.{CachedSchemaRegistryClient, SchemaMetadata}
import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import java.time.ZoneId

import akka.kafka.ConsumerMessage.CommittableMessage
import cats.Show
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.datetime.NJTimestamp
import com.github.chenharryhua.nanjin.messages.kafka._
import com.sksamuel.avro4s.Record
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.chenharryhua.nanjin.kafka

import cats.implicits._
import cats.syntax.all._
import cats.kernel.Eq
import com.github.chenharryhua.nanjin.messages.kafka._
import com.github.chenharryhua.nanjin.messages.kafka.codec.{NJAvroCodec, SerdeOf}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import akka.stream.stage.{GraphStageLogic, GraphStageWithMaterializedValue, InHa
import akka.stream.{Attributes, Inlet, SinkShape}
import cats.effect.ConcurrentEffect
import cats.effect.concurrent.Deferred
import cats.implicits._
import cats.syntax.all._

object akkaSinks {

Expand Down
2 changes: 1 addition & 1 deletion kafka/src/test/scala/mtest/kafka/CompilationTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import akka.kafka.ConsumerMessage
import akka.kafka.scaladsl.Consumer
import akka.stream.scaladsl.Source
import org.scalatest.funsuite.AnyFunSuite
import cats.implicits._
import cats.syntax.all._

import scala.util.Try
import cats.effect.IO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package mtest.kafka
import java.time.LocalDateTime

import cats.derived.auto.show._
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.kafka.{KafkaOffset, TopicName, _}
import org.scalatest.funsuite.AnyFunSuite
import cats.effect.IO
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mtest.kafka

import cats.derived.auto.show._
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.kafka.{TopicName, _}
import com.github.chenharryhua.nanjin.messages.kafka.codec.{KJson, NJAvroCodec}
import com.landoop.telecom.telecomitalia.telecommunications.{smsCallInternet, Key}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mtest.kafka

import cats.effect.IO
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.datetime.{darwinTime, NJDateTimeRange}
import com.github.chenharryhua.nanjin.kafka.{
KafkaOffset,
Expand Down
3 changes: 1 addition & 2 deletions kafka/src/test/scala/mtest/kafka/Domain.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package mtest.kafka

import cats.Show
import cats.implicits._
import cats.Show

case class Payment(
id: String,
Expand Down
2 changes: 1 addition & 1 deletion kafka/src/test/scala/mtest/kafka/KafkaStreamingTest.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mtest.kafka

import cats.effect.IO
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.kafka.{KafkaTopic, TopicDef, TopicName}
import com.github.chenharryhua.nanjin.messages.kafka.codec.{NJSerdeConfig, SerdeOf}
import org.apache.kafka.common.serialization.Serde
Expand Down
2 changes: 1 addition & 1 deletion kafka/src/test/scala/mtest/kafka/ProducerTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package mtest.kafka

import akka.Done
import cats.effect.IO
import cats.implicits._
import cats.syntax.all._
import org.apache.kafka.clients.consumer.ConsumerConfig
import org.scalatest.funsuite.AnyFunSuite
import fs2.kafka.{ProducerRecords => Fs2ProducerRecords, ProducerRecord => Fs2ProducerRecord}
Expand Down
2 changes: 1 addition & 1 deletion kafka/src/test/scala/mtest/kafka/ProtobufTest.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mtest.kafka

import cats.effect.IO
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.kafka.KafkaTopic
import com.github.chenharryhua.nanjin.messages.kafka.codec.KPB
import mtest.pb.test._
Expand Down
2 changes: 1 addition & 1 deletion kafka/src/test/scala/mtest/kafka/ZioTest.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mtest.kafka

import cats.derived.auto.show._
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.kafka._
import org.scalatest.Ignore
import org.scalatest.funsuite.AnyFunSuite
Expand Down
1 change: 0 additions & 1 deletion kafka/src/test/scala/mtest/kafka/package.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package mtest

import cats.effect.{Blocker, ContextShift, IO, Timer}
import cats.implicits._
import com.github.chenharryhua.nanjin.kafka.{IoKafkaContext, KafkaSettings, KafkaTopic}
import org.apache.kafka.clients.consumer.ConsumerConfig

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import akka.kafka.ConsumerMessage.{
TransactionalMessage => AkkaTransactionalMessage
}
import akka.kafka.ProducerMessage.{Message => AkkaProducerMessage}
import cats.implicits._
import cats.syntax.all._
import cats.{Applicative, Bitraverse, Eval}
import fs2.kafka.{
CommittableConsumerRecord => Fs2CommittableConsumerRecord,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.chenharryhua.nanjin.messages.kafka

import akka.kafka.ProducerMessage.{MultiMessage => AkkaMultiMessage}
import cats.implicits._
import cats.syntax.all._
import cats.{Applicative, Bitraverse, Eval}
import fs2.Chunk
import fs2.kafka.{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import akka.kafka.ConsumerMessage.{
}
import akka.kafka.ProducerMessage.{Message => AkkaProducerMessage, MultiMessage => AkkaMultiMessage}
import cats.Eq
import cats.implicits._
import cats.syntax.all._
import fs2.kafka.{
CommittableConsumerRecord => Fs2CommittableConsumerRecord,
CommittableOffset => Fs2CommittableOffset,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.github.chenharryhua.nanjin.messages.kafka
import java.time.Instant

import alleycats.Empty
import cats.implicits._
import cats.kernel.{LowerBounded, PartialOrder}
import cats.{Applicative, Bifunctor, Bitraverse, Eval, Order, Show}
import com.sksamuel.avro4s.AvroDoc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.github.chenharryhua.nanjin.messages.kafka

import alleycats.Empty
import cats.implicits._
import cats.{Bifunctor, Show}
import fs2.kafka.{ProducerRecord => Fs2ProducerRecord}
import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.chenharryhua.nanjin.messages.kafka.codec

import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.messages.kafka._

import scala.util.{Success, Try}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.chenharryhua.nanjin.messages.kafka.codec

import cats.data.Ior
import cats.implicits._
import cats.syntax.all._
import com.sksamuel.avro4s.{
DecoderHelpers,
EncoderHelpers,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.chenharryhua.nanjin.messages.kafka.codec

import cats.data.{Chain, Writer}
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.messages.kafka._
import org.apache.kafka.common.serialization.Deserializer

Expand Down
1 change: 0 additions & 1 deletion messages/src/test/scala/mtest/codec/PrismTest.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package mtest.codec

import cats.Eq
import cats.implicits._
import com.github.chenharryhua.nanjin.messages.kafka._
import com.github.chenharryhua.nanjin.messages.kafka.codec.KJson
import monocle.law.discipline.PrismTests
Expand Down
2 changes: 1 addition & 1 deletion messages/src/test/scala/mtest/kafka/ArbitraryData.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import fs2.kafka.{
import org.apache.kafka.clients.consumer.ConsumerRecord
import org.apache.kafka.clients.producer.ProducerRecord
import org.scalacheck.{Arbitrary, Cogen, Gen}
import cats.implicits._
import cats.syntax.all._
import com.github.chenharryhua.nanjin.messages.kafka.{NJProducerRecord, OptionalKV}

final case class PrimitiveTypeCombined(
Expand Down
1 change: 0 additions & 1 deletion messages/src/test/scala/mtest/kafka/BimapNJRecords.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package mtest.kafka

import cats.derived.auto.eq._
import cats.implicits._
import cats.kernel.laws.discipline.{LowerBoundedTests, OrderTests}
import cats.laws.discipline.BifunctorTests
import com.github.chenharryhua.nanjin.messages.kafka._
Expand Down
Loading

0 comments on commit 934ddd4

Please sign in to comment.