diff --git a/cli/src/main/scala/rpm4s/cli/Main.scala b/cli/src/main/scala/rpm4s/cli/Main.scala index 0a12cbd..4a74ccb 100644 --- a/cli/src/main/scala/rpm4s/cli/Main.scala +++ b/cli/src/main/scala/rpm4s/cli/Main.scala @@ -2,7 +2,7 @@ package rpm4s.cli import java.nio.file.Path -import cats.implicits._ +import cats.syntax.all._ import com.monovore.decline._ import rpm4s.data.{Architecture, License} import rpm4s.data._ diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d14c447..5e48795 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,5 +1,5 @@ object Dependencies { - val cats = "2.1.1" + val cats = "2.12.0" val fs2 = "2.4.2" val scalatest = "3.2.2" val scalatestplus = "3.2.2.0" diff --git a/repo-utils/jvm/src/main/scala/rpm4s/repo/repo.scala b/repo-utils/jvm/src/main/scala/rpm4s/repo/repo.scala index c47e5e1..f7d497c 100644 --- a/repo-utils/jvm/src/main/scala/rpm4s/repo/repo.scala +++ b/repo-utils/jvm/src/main/scala/rpm4s/repo/repo.scala @@ -5,13 +5,13 @@ import java.nio.file._ import java.security.MessageDigest import cats.effect.{Blocker, ContextShift, Effect} -import cats.implicits._ +import cats.syntax.all._ import fs2.{Chunk, Pipe, Stream} import rpm4s.data.Checksum.Sha256 import rpm4s.data._ import rpm4s.repo.utils.compress.gzip import rpm4s.repo.data.updateinfo.UpdateF.Update -import cats.implicits._ +import cats.syntax.all._ package object repo { diff --git a/repo-utils/jvm/src/main/scala/rpm4s/repo/repomd/xml/primary/package.scala b/repo-utils/jvm/src/main/scala/rpm4s/repo/repomd/xml/primary/package.scala index 5482f47..c8fa4d2 100644 --- a/repo-utils/jvm/src/main/scala/rpm4s/repo/repomd/xml/primary/package.scala +++ b/repo-utils/jvm/src/main/scala/rpm4s/repo/repomd/xml/primary/package.scala @@ -15,7 +15,6 @@ import rpm4s.repo.data.primary._ import rpm4s.repo.data.primary.PackageF.PackageBuilder import rpm4s.repo.utils.xml.{EndEvent, StartEvent, xmlevents} import cats._ -import cats.implicits._ import cats.syntax._ import scala.annotation.tailrec diff --git a/repo-utils/jvm/src/main/scala/rpm4s/repo/utils/hash/package.scala b/repo-utils/jvm/src/main/scala/rpm4s/repo/utils/hash/package.scala index e73dedd..832c5d8 100644 --- a/repo-utils/jvm/src/main/scala/rpm4s/repo/utils/hash/package.scala +++ b/repo-utils/jvm/src/main/scala/rpm4s/repo/utils/hash/package.scala @@ -5,7 +5,7 @@ import java.security.MessageDigest import cats.effect.{Effect, Sync} import fs2.{Pipe, Stream} import rpm4s.data.Checksum -import cats.implicits._ +import cats.syntax.all._ package object hash { diff --git a/repo-utils/jvm/src/main/scala/rpm4s/repo/yast2/Yast2.scala b/repo-utils/jvm/src/main/scala/rpm4s/repo/yast2/Yast2.scala index 6c6f70c..09a05fd 100644 --- a/repo-utils/jvm/src/main/scala/rpm4s/repo/yast2/Yast2.scala +++ b/repo-utils/jvm/src/main/scala/rpm4s/repo/yast2/Yast2.scala @@ -1,7 +1,7 @@ package rpm4s.repo.yast2 import cats._ -import cats.implicits._ +import cats.syntax.all._ import fs2.{Pipe, Pull, RaiseThrowable, Stream} import rpm4s.data.Checksum.{Sha1, Sha256} import rpm4s.data.{Architecture, Checksum, Name} diff --git a/repo-utils/jvm/src/test/scala/RepomdSpec.scala b/repo-utils/jvm/src/test/scala/RepomdSpec.scala index 2cf3e90..26e9116 100644 --- a/repo-utils/jvm/src/test/scala/RepomdSpec.scala +++ b/repo-utils/jvm/src/test/scala/RepomdSpec.scala @@ -13,7 +13,6 @@ import scodec.bits.{BitVector, ByteVector} import fs2.{Pure, Stream} import rpm4s.repo.data.primary.{PackageF, SizeInfo} import rpm4s.repo.repomd.xml.primary.xml2packages -import cats.implicits._ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks diff --git a/repo-utils/shared/src/main/scala/rpm4s/repo/data/RMDataF.scala b/repo-utils/shared/src/main/scala/rpm4s/repo/data/RMDataF.scala index dac0067..bed9505 100644 --- a/repo-utils/shared/src/main/scala/rpm4s/repo/data/RMDataF.scala +++ b/repo-utils/shared/src/main/scala/rpm4s/repo/data/RMDataF.scala @@ -3,7 +3,7 @@ package rpm4s.repo.data import java.time.Instant import cats.Id -import cats.implicits._ +import cats.syntax.all._ import rpm4s.data.Checksum diff --git a/repo-utils/shared/src/main/scala/rpm4s/repo/data/primary/PackageF.scala b/repo-utils/shared/src/main/scala/rpm4s/repo/data/primary/PackageF.scala index f6ed3bf..61786f1 100644 --- a/repo-utils/shared/src/main/scala/rpm4s/repo/data/primary/PackageF.scala +++ b/repo-utils/shared/src/main/scala/rpm4s/repo/data/primary/PackageF.scala @@ -1,7 +1,7 @@ package rpm4s.repo.data.primary import cats.Id -import cats.implicits._ +import cats.syntax.all._ import rpm4s.data._ case class PackageF[F[_]]( diff --git a/repo-utils/shared/src/main/scala/rpm4s/repo/data/updateinfo/UpdateF.scala b/repo-utils/shared/src/main/scala/rpm4s/repo/data/updateinfo/UpdateF.scala index a30b00d..9d5073e 100644 --- a/repo-utils/shared/src/main/scala/rpm4s/repo/data/updateinfo/UpdateF.scala +++ b/repo-utils/shared/src/main/scala/rpm4s/repo/data/updateinfo/UpdateF.scala @@ -3,7 +3,7 @@ package rpm4s.repo.data.updateinfo import java.time.Instant import cats.Id -import cats.implicits._ +import cats.syntax.all._ import rpm4s.data.{CVE, _} diff --git a/shared/src/main/scala/rpm4s/codecs/Extractor.scala b/shared/src/main/scala/rpm4s/codecs/Extractor.scala index 8c58b0d..af9e16f 100644 --- a/shared/src/main/scala/rpm4s/codecs/Extractor.scala +++ b/shared/src/main/scala/rpm4s/codecs/Extractor.scala @@ -100,7 +100,7 @@ object Extractor { ) val sigTags: Set[SignatureTag] = Set.empty def extract(data: Data): Result[Vector[T]] = { - import cats.implicits._ + import cats.syntax.all._ //TODO: needs more validation val a = for { names <- data(namesTag) @@ -211,7 +211,7 @@ object Extractor { ) val sigTags: Set[SignatureTag] = Set.empty def extract(data: Data): Result[Vector[FileEntry]] = { - import cats.implicits._ + import cats.syntax.all._ for { dirNames <- data(HeaderTag.DirNames) dirIndexes <- data(HeaderTag.DirIndexes) diff --git a/shared/src/main/scala/rpm4s/data/EVR.scala b/shared/src/main/scala/rpm4s/data/EVR.scala index 8dba974..ae2a9b9 100644 --- a/shared/src/main/scala/rpm4s/data/EVR.scala +++ b/shared/src/main/scala/rpm4s/data/EVR.scala @@ -1,7 +1,6 @@ package rpm4s.data import rpm4s.codecs.ConvertingError -import cats.implicits._ case class EVR( version: Version,