Merge pull request #194 from TinkoffCreditSystems/casefix

Urgent rename functionk to funk to avoid classname clush on case-insensitive systems
tofu-tf · Mar 11, 2020 · 32e28aa · 32e28aa
2 parents 4bbd862 + 02bb68f
commit 32e28aa
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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