diff --git a/client/src/main/scala/com/fortysevendeg/smarthome/client/app/ClientApp.scala b/client/src/main/scala/com/fortysevendeg/smarthome/client/app/ClientApp.scala index cbab584..72958bd 100644 --- a/client/src/main/scala/com/fortysevendeg/smarthome/client/app/ClientApp.scala +++ b/client/src/main/scala/com/fortysevendeg/smarthome/client/app/ClientApp.scala @@ -5,7 +5,7 @@ import cats.implicits._ import com.fortysevendeg.smarthome.client.common._ import com.fortysevendeg.smarthome.client.common.Implicits._ import fs2.Stream -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger class ClientProgram[F[_]: ConcurrentEffect: ContextShift: Timer] extends ClientBoot[F] { diff --git a/client/src/main/scala/com/fortysevendeg/smarthome/client/app/ClientBoot.scala b/client/src/main/scala/com/fortysevendeg/smarthome/client/app/ClientBoot.scala index cc96a2f..909578a 100644 --- a/client/src/main/scala/com/fortysevendeg/smarthome/client/app/ClientBoot.scala +++ b/client/src/main/scala/com/fortysevendeg/smarthome/client/app/ClientBoot.scala @@ -6,8 +6,8 @@ import com.fortysevendeg.smarthome.client.common._ import com.fortysevendeg.smarthome.client.process.SmartHomeServiceApi import com.fortysevendeg.smarthome.config.ConfigService import fs2.Stream -import io.chrisdavenport.log4cats.Logger -import io.chrisdavenport.log4cats.slf4j.Slf4jLogger +import org.typelevel.log4cats.Logger +import org.typelevel.log4cats.slf4j.Slf4jLogger import pureconfig.generic.auto._ abstract class ClientBoot[F[_]: ConcurrentEffect: ContextShift: Timer] { diff --git a/client/src/main/scala/com/fortysevendeg/smarthome/client/common/LocationsGenerator.scala b/client/src/main/scala/com/fortysevendeg/smarthome/client/common/LocationsGenerator.scala index 6106994..0951300 100644 --- a/client/src/main/scala/com/fortysevendeg/smarthome/client/common/LocationsGenerator.scala +++ b/client/src/main/scala/com/fortysevendeg/smarthome/client/common/LocationsGenerator.scala @@ -4,7 +4,7 @@ import cats.effect.{Async, Timer} import cats.syntax.flatMap._ import com.fortysevendeg.smarthome.protocol.messages._ import fs2.Stream -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import scala.concurrent.duration._ import scala.math.BigDecimal.RoundingMode diff --git a/client/src/main/scala/com/fortysevendeg/smarthome/client/process/SmartHomeServiceApi.scala b/client/src/main/scala/com/fortysevendeg/smarthome/client/process/SmartHomeServiceApi.scala index 0bf52da..8eb4d10 100644 --- a/client/src/main/scala/com/fortysevendeg/smarthome/client/process/SmartHomeServiceApi.scala +++ b/client/src/main/scala/com/fortysevendeg/smarthome/client/process/SmartHomeServiceApi.scala @@ -9,7 +9,7 @@ import com.fortysevendeg.smarthome.client.common._ import com.fortysevendeg.smarthome.protocol.messages._ import com.fortysevendeg.smarthome.protocol.services._ import fs2.Stream -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import higherkindness.mu.rpc.ChannelForAddress import higherkindness.mu.rpc.channel.{ManagedChannelInterpreter, UsePlaintext} import io.grpc.{CallOptions, ManagedChannel} diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index b2ddbee..50147b4 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -12,7 +12,7 @@ object ProjectPlugin extends AutoPlugin { lazy val V = new { val catsEffect = "2.5.3" - val log4cats = "1.1.1" + val log4cats = "1.2.0" val logbackClassic = "1.2.6" val mu = "0.21.3" val pureconfig = "0.14.1" diff --git a/server/src/main/scala/com/fortysevendeg/smarthome/server/app/ServerApp.scala b/server/src/main/scala/com/fortysevendeg/smarthome/server/app/ServerApp.scala index 39a4154..bac0943 100644 --- a/server/src/main/scala/com/fortysevendeg/smarthome/server/app/ServerApp.scala +++ b/server/src/main/scala/com/fortysevendeg/smarthome/server/app/ServerApp.scala @@ -8,7 +8,7 @@ import com.fortysevendeg.smarthome.server.process._ import com.fortysevendeg.smarthome.protocol.services._ import com.permutive.pubsub.producer.PubsubProducer import higherkindness.mu.rpc.server.{AddService, GrpcServer} -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger class ServerProgram[F[_]: ConcurrentEffect: Timer] extends ServerBoot[F] { diff --git a/server/src/main/scala/com/fortysevendeg/smarthome/server/app/ServerBoot.scala b/server/src/main/scala/com/fortysevendeg/smarthome/server/app/ServerBoot.scala index 56121ed..b2444e6 100644 --- a/server/src/main/scala/com/fortysevendeg/smarthome/server/app/ServerBoot.scala +++ b/server/src/main/scala/com/fortysevendeg/smarthome/server/app/ServerBoot.scala @@ -9,8 +9,8 @@ import com.fortysevendeg.smarthome.server.common._ import com.permutive.pubsub.producer.{Model, PubsubProducer} import com.permutive.pubsub.producer.encoder.MessageEncoder import com.permutive.pubsub.producer.grpc.{GooglePubsubProducer, PubsubProducerConfig} -import io.chrisdavenport.log4cats.Logger -import io.chrisdavenport.log4cats.slf4j.Slf4jLogger +import org.typelevel.log4cats.Logger +import org.typelevel.log4cats.slf4j.Slf4jLogger import io.circe.generic.auto._, io.circe.syntax._ import pureconfig.generic.auto._ diff --git a/server/src/main/scala/com/fortysevendeg/smarthome/server/process/SmartHomeServiceHandler.scala b/server/src/main/scala/com/fortysevendeg/smarthome/server/process/SmartHomeServiceHandler.scala index e299034..f1ae041 100644 --- a/server/src/main/scala/com/fortysevendeg/smarthome/server/process/SmartHomeServiceHandler.scala +++ b/server/src/main/scala/com/fortysevendeg/smarthome/server/process/SmartHomeServiceHandler.scala @@ -6,7 +6,7 @@ import cats.syntax.functor._ import com.fortysevendeg.smarthome.protocol.messages._ import com.fortysevendeg.smarthome.protocol.services._ import fs2._ -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger class SmartHomeServiceHandler[F[_]: Async: Logger: Timer: TemperatureReader: SmartHomeSupervisor] extends SmartHomeService[F] { diff --git a/server/src/main/scala/com/fortysevendeg/smarthome/server/process/SmartHomeSupervisor.scala b/server/src/main/scala/com/fortysevendeg/smarthome/server/process/SmartHomeSupervisor.scala index c49d7a9..172193b 100644 --- a/server/src/main/scala/com/fortysevendeg/smarthome/server/process/SmartHomeSupervisor.scala +++ b/server/src/main/scala/com/fortysevendeg/smarthome/server/process/SmartHomeSupervisor.scala @@ -8,7 +8,7 @@ import com.fortysevendeg.smarthome.protocol.messages._ import com.fortysevendeg.smarthome.server.common.Row import com.permutive.pubsub.producer.Model.MessageId import com.permutive.pubsub.producer.PubsubProducer -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger trait SmartHomeSupervisor[F[_]] { def performAction(location: Location): F[List[SmartHomeAction]] diff --git a/server/src/main/scala/com/fortysevendeg/smarthome/server/process/TemperatureReader.scala b/server/src/main/scala/com/fortysevendeg/smarthome/server/process/TemperatureReader.scala index a046ba5..8911dc4 100644 --- a/server/src/main/scala/com/fortysevendeg/smarthome/server/process/TemperatureReader.scala +++ b/server/src/main/scala/com/fortysevendeg/smarthome/server/process/TemperatureReader.scala @@ -4,7 +4,7 @@ import cats.effect._ import cats.syntax.flatMap._ import com.fortysevendeg.smarthome.protocol.messages._ import fs2.Stream -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import scala.concurrent.duration._ import scala.math.BigDecimal.RoundingMode