diff --git a/build.sbt b/build.sbt index 3144bb0c4..28aeecb49 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import Publish._, Dependencies._ import com.typesafe.sbt.SbtGit.git -val libVersion = "0.7.2" +val libVersion = "0.7.2.1" lazy val setMinorVersion = minorVersion := { CrossVersion.partialVersion(scalaVersion.value) match { diff --git a/concurrent/src/main/scala/tofu/concurrent/ContextT.scala b/concurrent/src/main/scala/tofu/concurrent/ContextT.scala index c61427553..c05db9736 100644 --- a/concurrent/src/main/scala/tofu/concurrent/ContextT.scala +++ b/concurrent/src/main/scala/tofu/concurrent/ContextT.scala @@ -4,7 +4,7 @@ import cats.effect._ import cats.instances.either._ import tofu.HasContextRun import tofu.concurrent.impl._ -import tofu.syntax.functionk.funKFrom +import tofu.syntax.funk.funKFrom import tofu.syntax.monadic._ /** a ReaderT analog, allowing to have context referring resulting type diff --git a/concurrent/src/main/scala/tofu/concurrent/impl/contextt.scala b/concurrent/src/main/scala/tofu/concurrent/impl/contextt.scala index f1315072c..013c15445 100644 --- a/concurrent/src/main/scala/tofu/concurrent/impl/contextt.scala +++ b/concurrent/src/main/scala/tofu/concurrent/impl/contextt.scala @@ -6,7 +6,7 @@ import cats.instances.tuple._ import cats.syntax.bifunctor._ import cats._ import tofu.{Context, HasContextRun, RunContext} -import tofu.syntax.functionk.funKFrom +import tofu.syntax.funk.funKFrom import tofu.syntax.monadic._ trait ContextTInvariant[F[+_], C[_[_]]] extends Invariant[ContextT[F, C, *]] { diff --git a/config/src/main/scala/tofu/config/ConfigMonad.scala b/config/src/main/scala/tofu/config/ConfigMonad.scala index 80c4148dd..32b33868c 100644 --- a/config/src/main/scala/tofu/config/ConfigMonad.scala +++ b/config/src/main/scala/tofu/config/ConfigMonad.scala @@ -11,7 +11,7 @@ import tofu.syntax.monadic._ import cats.MonadError import cats.Applicative import cats.~> -import tofu.syntax.functionk._ +import tofu.syntax.funk._ import cats.syntax.applicativeError._ trait ConfigMonad[F[_]] { diff --git a/config/src/main/scala/tofu/config/typesafe.scala b/config/src/main/scala/tofu/config/typesafe.scala index 6d91e9f46..ba809e0f5 100644 --- a/config/src/main/scala/tofu/config/typesafe.scala +++ b/config/src/main/scala/tofu/config/typesafe.scala @@ -8,7 +8,7 @@ import com.typesafe.config.{Config, ConfigValue} import scala.collection.JavaConverters._ import tofu.concurrent.Refs import tofu.syntax.monadic._ -import tofu.syntax.functionk._ +import tofu.syntax.funk._ import cats.effect.SyncIO object typesafe { diff --git a/core/src/main/scala/tofu/lift/IsoK.scala b/core/src/main/scala/tofu/lift/IsoK.scala index e17a42319..bebbfa02e 100644 --- a/core/src/main/scala/tofu/lift/IsoK.scala +++ b/core/src/main/scala/tofu/lift/IsoK.scala @@ -1,7 +1,7 @@ package tofu.lift import cats.~> -import tofu.syntax.functionk._ +import tofu.syntax.funk._ /** bidirectional transformation */ trait IsoK[F[_], G[_]] { self => diff --git a/derivation/src/test/scala/tofu/higherKind/derived/RepresentableKSuite.scala b/derivation/src/test/scala/tofu/higherKind/derived/RepresentableKSuite.scala index a00f35892..871443646 100644 --- a/derivation/src/test/scala/tofu/higherKind/derived/RepresentableKSuite.scala +++ b/derivation/src/test/scala/tofu/higherKind/derived/RepresentableKSuite.scala @@ -15,7 +15,7 @@ import derevo.derive import org.scalatest.{FlatSpec, Matchers} import tofu.data.Embedded import tofu.syntax.embed._ -import tofu.syntax.functionk.funK +import tofu.syntax.funk.funK import scala.util.Try diff --git a/env/src/main/scala/tofu/env/EnvInstances.scala b/env/src/main/scala/tofu/env/EnvInstances.scala index e1d6f7768..7319f60f1 100644 --- a/env/src/main/scala/tofu/env/EnvInstances.scala +++ b/env/src/main/scala/tofu/env/EnvInstances.scala @@ -6,7 +6,7 @@ import monix.eval.Task import monix.execution.Scheduler import tofu.lift.UnsafeExecFuture import tofu.optics.Contains -import tofu.syntax.functionk._ +import tofu.syntax.funk._ import scala.concurrent.Future diff --git a/env/src/main/scala/tofu/env/EnvUnliftTask.scala b/env/src/main/scala/tofu/env/EnvUnliftTask.scala index 32b86c1b9..80307a641 100644 --- a/env/src/main/scala/tofu/env/EnvUnliftTask.scala +++ b/env/src/main/scala/tofu/env/EnvUnliftTask.scala @@ -3,7 +3,7 @@ import cats.~> import monix.eval.Task import tofu.lift.Unlift import tofu.optics.Contains -import tofu.syntax.functionk.funK +import tofu.syntax.funk.funK class EnvUnliftTask[E] extends Unlift[Task, Env[E, *]] { def lift[A](fa: Task[A]): Env[E, A] = Env.fromTask(fa) diff --git a/higherKindCore/src/main/scala/tofu/higherKind/Function2K.scala b/higherKindCore/src/main/scala/tofu/higherKind/Function2K.scala index d4ba741da..fdf47322f 100644 --- a/higherKindCore/src/main/scala/tofu/higherKind/Function2K.scala +++ b/higherKindCore/src/main/scala/tofu/higherKind/Function2K.scala @@ -1,7 +1,7 @@ package tofu.higherKind import cats.data.Tuple2K import cats.{FlatMap, ~>} -import tofu.syntax.functionk.funK +import tofu.syntax.funk.funK import tofu.syntax.monadic._ trait Function2K[F[_], G[_], H[_]] { diff --git a/higherKindCore/src/main/scala/tofu/higherKind/Mid.scala b/higherKindCore/src/main/scala/tofu/higherKind/Mid.scala index aa1b346c3..0e5309b78 100644 --- a/higherKindCore/src/main/scala/tofu/higherKind/Mid.scala +++ b/higherKindCore/src/main/scala/tofu/higherKind/Mid.scala @@ -3,7 +3,7 @@ import cats.data.Chain import cats.tagless.ApplyK import cats.{Monoid, MonoidK, Semigroup} import tofu.higherKind.Mid.MidCompose -import tofu.syntax.functionk.funK +import tofu.syntax.funk.funK import tofu.syntax.monoidalK._ trait Mid[F[_], A] { diff --git a/higherKindCore/src/main/scala/tofu/higherKind/Post.scala b/higherKindCore/src/main/scala/tofu/higherKind/Post.scala index 80879cddb..dca830406 100644 --- a/higherKindCore/src/main/scala/tofu/higherKind/Post.scala +++ b/higherKindCore/src/main/scala/tofu/higherKind/Post.scala @@ -1,7 +1,7 @@ package tofu.higherKind import cats.tagless.ApplyK import cats.{Applicative, Apply, FlatMap, Monoid, MonoidK, Semigroup, SemigroupK, ~>} -import tofu.syntax.functionk.funK +import tofu.syntax.funk.funK import tofu.syntax.monadic._ /** diff --git a/higherKindCore/src/main/scala/tofu/higherKind/Pre.scala b/higherKindCore/src/main/scala/tofu/higherKind/Pre.scala index 64d213a18..2a94e597e 100644 --- a/higherKindCore/src/main/scala/tofu/higherKind/Pre.scala +++ b/higherKindCore/src/main/scala/tofu/higherKind/Pre.scala @@ -2,7 +2,7 @@ package tofu package higherKind import cats.tagless.ApplyK import cats.{Applicative, Apply, Monoid, MonoidK, Semigroup, SemigroupK, ~>} -import tofu.syntax.functionk.funK +import tofu.syntax.funk.funK import tofu.syntax.monadic._ /** diff --git a/higherKindCore/src/main/scala/tofu/higherKind/RepresentableK.scala b/higherKindCore/src/main/scala/tofu/higherKind/RepresentableK.scala index 7c1d00016..35ccc3049 100644 --- a/higherKindCore/src/main/scala/tofu/higherKind/RepresentableK.scala +++ b/higherKindCore/src/main/scala/tofu/higherKind/RepresentableK.scala @@ -3,7 +3,7 @@ import cats.data._ import cats.tagless.IdK import cats.{FlatMap, ~>} import simulacrum.typeclass -import tofu.syntax.functionk.funK +import tofu.syntax.funk.funK import tofu.syntax.monadic._ trait RepK[U[_[_]], A] { diff --git a/higherKindCore/src/main/scala/tofu/higherKind/derived/HigherKindedMacros.scala b/higherKindCore/src/main/scala/tofu/higherKind/derived/HigherKindedMacros.scala index 3729c44dc..d4bc8024c 100644 --- a/higherKindCore/src/main/scala/tofu/higherKind/derived/HigherKindedMacros.scala +++ b/higherKindCore/src/main/scala/tofu/higherKind/derived/HigherKindedMacros.scala @@ -22,7 +22,7 @@ class HigherKindedMacros(override val c: blackbox.Context) extends cats.tagless. val members = overridableMembersOf(af) val types = delegateAbstractTypes(af, members, af) val repk = reify(tofu.higherKind.RepK).tree - val funk = reify(tofu.syntax.functionk).tree + val funk = reify(tofu.syntax.funk).tree val alg = TermName(c.freshName("alg")) val rep = TermName(c.freshName("rep")) val et = tq"" diff --git a/higherKindCore/src/main/scala/tofu/syntax/functionK.scala b/higherKindCore/src/main/scala/tofu/syntax/functionK.scala index e63cf9d38..7c17da55d 100644 --- a/higherKindCore/src/main/scala/tofu/syntax/functionK.scala +++ b/higherKindCore/src/main/scala/tofu/syntax/functionK.scala @@ -21,7 +21,7 @@ object functionK { type Arbitrary } -object functionk { +object funk { /** simple constructor of FunctionK * you can use it as makeFunctionK[List, Option](_.headOption) diff --git a/zio/core/src/main/scala/tofu/zioInstances/ZioTofuInstance.scala b/zio/core/src/main/scala/tofu/zioInstances/ZioTofuInstance.scala index 24f803355..626da8616 100644 --- a/zio/core/src/main/scala/tofu/zioInstances/ZioTofuInstance.scala +++ b/zio/core/src/main/scala/tofu/zioInstances/ZioTofuInstance.scala @@ -8,7 +8,7 @@ import tofu.generate.GenRandom import tofu.internal.CachedMatcher import tofu.lift.Unlift import tofu.optics.{Contains, Extract} -import tofu.syntax.functionk.funK +import tofu.syntax.funk.funK import tofu.zioInstances.ZioTofuInstance.convertFiber import zio.clock.Clock import zio.console.Console