From 674dd72544ce62cb6f1af0bc2e20733f8d981f26 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 5 Jul 2022 16:31:04 +0000 Subject: [PATCH 1/5] Applied Scalafix rule(s) https://gist.githubusercontent.com/fthomas/ea14d58e1b445d8038a5bc22acf751e8/raw/e1180c91dab0b36d8f9ec37d413ef9507bee67ff/log4cats-1.2.0.scala Co-authored-by: Frank Thomas --- .../src/main/scala/com/azavea/franklin/api/Server.scala | 4 ++-- .../franklin/api/middleware/AccessLoggingMiddleware.scala | 2 +- .../azavea/franklin/api/services/CollectionItemsService.scala | 2 +- .../com/azavea/franklin/api/services/CollectionsService.scala | 2 +- .../scala/com/azavea/franklin/api/services/TileService.scala | 2 +- .../scala/com/azavea/franklin/crawler/CatalogStacImport.scala | 2 +- .../src/main/scala/com/azavea/franklin/crawler/StacIO.scala | 2 +- .../scala/com/azavea/franklin/crawler/StacItemImporter.scala | 2 +- .../com/azavea/franklin/extensions/validation/package.scala | 2 +- .../test/scala/com/azavea/franklin/api/TestImplicits.scala | 2 +- .../src/test/scala/com/azavea/franklin/api/TestServices.scala | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application/src/main/scala/com/azavea/franklin/api/Server.scala b/application/src/main/scala/com/azavea/franklin/api/Server.scala index 8089371fb..5e3fa8c79 100644 --- a/application/src/main/scala/com/azavea/franklin/api/Server.scala +++ b/application/src/main/scala/com/azavea/franklin/api/Server.scala @@ -19,8 +19,8 @@ import doobie.hikari.HikariTransactor import doobie.util.ExecutionContexts import eu.timepit.refined.auto._ import io.chrisdavenport.log4cats -import io.chrisdavenport.log4cats.SelfAwareStructuredLogger -import io.chrisdavenport.log4cats.slf4j.Slf4jLogger +import org.typelevel.log4cats.SelfAwareStructuredLogger +import org.typelevel.log4cats.slf4j.Slf4jLogger import org.http4s._ import org.http4s.dsl.Http4sDsl import org.http4s.implicits.{http4sLiteralsSyntax => _, _} diff --git a/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala b/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala index 0c45f7c0c..cc5c1dc86 100644 --- a/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala +++ b/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala @@ -4,7 +4,7 @@ import cats.data.Kleisli import cats.data.OptionT import cats.effect.Sync import cats.syntax.functor._ -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe.syntax._ import org.http4s.util.CaseInsensitiveString import org.http4s.{HttpRoutes, Request} diff --git a/application/src/main/scala/com/azavea/franklin/api/services/CollectionItemsService.scala b/application/src/main/scala/com/azavea/franklin/api/services/CollectionItemsService.scala index ae84a52bb..69392ca5f 100644 --- a/application/src/main/scala/com/azavea/franklin/api/services/CollectionItemsService.scala +++ b/application/src/main/scala/com/azavea/franklin/api/services/CollectionItemsService.scala @@ -27,7 +27,7 @@ import doobie.implicits._ import doobie.util.transactor.Transactor import eu.timepit.refined.auto._ import eu.timepit.refined.types.numeric.NonNegInt -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe._ import io.circe.syntax._ import org.http4s.HttpRoutes diff --git a/application/src/main/scala/com/azavea/franklin/api/services/CollectionsService.scala b/application/src/main/scala/com/azavea/franklin/api/services/CollectionsService.scala index f0539521c..3c69c3af2 100644 --- a/application/src/main/scala/com/azavea/franklin/api/services/CollectionsService.scala +++ b/application/src/main/scala/com/azavea/franklin/api/services/CollectionsService.scala @@ -19,7 +19,7 @@ import doobie._ import doobie.implicits._ import doobie.util.transactor.Transactor import eu.timepit.refined.auto._ -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe._ import io.circe.syntax._ import org.http4s.dsl.Http4sDsl diff --git a/application/src/main/scala/com/azavea/franklin/api/services/TileService.scala b/application/src/main/scala/com/azavea/franklin/api/services/TileService.scala index 7867b3d46..dc7d24671 100644 --- a/application/src/main/scala/com/azavea/franklin/api/services/TileService.scala +++ b/application/src/main/scala/com/azavea/franklin/api/services/TileService.scala @@ -36,7 +36,7 @@ import geotrellis.raster.geotiff.GeoTiffRasterSource import geotrellis.raster.render.ColorRamps.greyscale import geotrellis.raster.render.{Implicits => RenderImplicits} import geotrellis.raster.{io => _, _} -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe.Json import io.circe.syntax._ import org.http4s.HttpRoutes diff --git a/application/src/main/scala/com/azavea/franklin/crawler/CatalogStacImport.scala b/application/src/main/scala/com/azavea/franklin/crawler/CatalogStacImport.scala index a63c78a96..1f499c6fe 100644 --- a/application/src/main/scala/com/azavea/franklin/crawler/CatalogStacImport.scala +++ b/application/src/main/scala/com/azavea/franklin/crawler/CatalogStacImport.scala @@ -17,7 +17,7 @@ import eu.timepit.refined.auto._ import geotrellis.vector.io.json.Implicits._ import geotrellis.vector.io.json._ import geotrellis.vector.{Feature, Geometry} -import io.chrisdavenport.log4cats.slf4j.Slf4jLogger +import org.typelevel.log4cats.slf4j.Slf4jLogger import io.circe.parser.decode import io.circe.syntax._ import io.circe.{Decoder, Error => CirceError, JsonObject} diff --git a/application/src/main/scala/com/azavea/franklin/crawler/StacIO.scala b/application/src/main/scala/com/azavea/franklin/crawler/StacIO.scala index a6ec1c91a..b353b074e 100644 --- a/application/src/main/scala/com/azavea/franklin/crawler/StacIO.scala +++ b/application/src/main/scala/com/azavea/franklin/crawler/StacIO.scala @@ -6,7 +6,7 @@ import cats.syntax.all._ import com.amazonaws.services.s3.AmazonS3ClientBuilder import com.azavea.stac4s.{`application/json`, StacCollection, StacItem, StacLink, StacLinkType} import geotrellis.store.s3.AmazonS3URI -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe.parser.decodeAccumulating import io.circe.{CursorOp, Decoder, DecodingFailure, Error => CirceError, ParsingFailure} import sttp.client._ diff --git a/application/src/main/scala/com/azavea/franklin/crawler/StacItemImporter.scala b/application/src/main/scala/com/azavea/franklin/crawler/StacItemImporter.scala index 5dec3bc59..2192a9d84 100644 --- a/application/src/main/scala/com/azavea/franklin/crawler/StacItemImporter.scala +++ b/application/src/main/scala/com/azavea/franklin/crawler/StacItemImporter.scala @@ -8,7 +8,7 @@ import com.azavea.franklin.database.{getItemsBulkExtent, StacCollectionDao, Stac import com.azavea.stac4s._ import doobie.implicits._ import doobie.util.transactor.Transactor -import io.chrisdavenport.log4cats.slf4j.Slf4jLogger +import org.typelevel.log4cats.slf4j.Slf4jLogger import sttp.client.{NothingT, SttpBackend} class StacItemImporter(val collectionId: String, val itemUris: NonEmptyList[String])( diff --git a/application/src/main/scala/com/azavea/franklin/extensions/validation/package.scala b/application/src/main/scala/com/azavea/franklin/extensions/validation/package.scala index 834fd9584..562974bb4 100644 --- a/application/src/main/scala/com/azavea/franklin/extensions/validation/package.scala +++ b/application/src/main/scala/com/azavea/franklin/extensions/validation/package.scala @@ -16,7 +16,7 @@ import com.azavea.stac4s.syntax._ import com.azavea.stac4s.{StacItem, StacLink, StacLinkType} import eu.timepit.refined.auto._ import eu.timepit.refined.types.string.NonEmptyString -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe.Encoder import io.circe.Json import io.circe.schema.Schema diff --git a/application/src/test/scala/com/azavea/franklin/api/TestImplicits.scala b/application/src/test/scala/com/azavea/franklin/api/TestImplicits.scala index ab1bded6f..9d9229378 100644 --- a/application/src/test/scala/com/azavea/franklin/api/TestImplicits.scala +++ b/application/src/test/scala/com/azavea/franklin/api/TestImplicits.scala @@ -7,7 +7,7 @@ import com.azavea.franklin.api.commands.ApiConfig import com.azavea.franklin.api.services.{CollectionItemsService, CollectionsService, SearchService} import doobie.Transactor import eu.timepit.refined.types.numeric.{NonNegInt, PosInt} -import io.chrisdavenport.log4cats.noop.NoOpLogger +import org.typelevel.log4cats.noop.NoOpLogger import sttp.client.asynchttpclient.cats.AsyncHttpClientCatsBackend trait TestImplicits[F[_]] { diff --git a/application/src/test/scala/com/azavea/franklin/api/TestServices.scala b/application/src/test/scala/com/azavea/franklin/api/TestServices.scala index 8d98e0207..1c6ed1048 100644 --- a/application/src/test/scala/com/azavea/franklin/api/TestServices.scala +++ b/application/src/test/scala/com/azavea/franklin/api/TestServices.scala @@ -9,7 +9,7 @@ import com.azavea.franklin.extensions.validation.{collectionExtensionsRef, itemE import com.azavea.stac4s.{`application/json`, StacLink, StacLinkType} import doobie.Transactor import eu.timepit.refined.types.numeric.{NonNegInt, PosInt} -import io.chrisdavenport.log4cats.noop.NoOpLogger +import org.typelevel.log4cats.noop.NoOpLogger import sttp.client.asynchttpclient.cats.AsyncHttpClientCatsBackend class TestServices[F[_]: Concurrent](xa: Transactor[F])( From aa5fa6e93ff6360f0a92c257624291b5e72242e9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 5 Jul 2022 16:31:11 +0000 Subject: [PATCH 2/5] Update log4cats-core, log4cats-noop, ... to 1.7.0 --- project/Versions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Versions.scala b/project/Versions.scala index 9a3b29dde..68666dce8 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -25,7 +25,7 @@ object Versions { val Http4sVersion = "0.21.33" val JtsVersion = "1.16.1" val LogbackVersion = "1.2.5" - val Log4CatsVersion = "1.1.1" + val Log4CatsVersion = "1.7.0" val MagnoliaVersion = "0.17.0" val MonocleVersion = "2.1.0" val Postgis = "2.5.1" From 39710230a5512da58578cd3da2d28ed237346ac7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 17 Oct 2022 13:40:39 +0000 Subject: [PATCH 3/5] Revert commit(s) aa5fa6e, 674dd72 --- .../src/main/scala/com/azavea/franklin/api/Server.scala | 4 ++-- .../franklin/api/middleware/AccessLoggingMiddleware.scala | 2 +- .../azavea/franklin/api/services/CollectionItemsService.scala | 2 +- .../com/azavea/franklin/api/services/CollectionsService.scala | 2 +- .../scala/com/azavea/franklin/api/services/TileService.scala | 2 +- .../scala/com/azavea/franklin/crawler/CatalogStacImport.scala | 2 +- .../src/main/scala/com/azavea/franklin/crawler/StacIO.scala | 2 +- .../scala/com/azavea/franklin/crawler/StacItemImporter.scala | 2 +- .../com/azavea/franklin/extensions/validation/package.scala | 2 +- .../test/scala/com/azavea/franklin/api/TestImplicits.scala | 2 +- .../src/test/scala/com/azavea/franklin/api/TestServices.scala | 2 +- project/Versions.scala | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/application/src/main/scala/com/azavea/franklin/api/Server.scala b/application/src/main/scala/com/azavea/franklin/api/Server.scala index 5e3fa8c79..8089371fb 100644 --- a/application/src/main/scala/com/azavea/franklin/api/Server.scala +++ b/application/src/main/scala/com/azavea/franklin/api/Server.scala @@ -19,8 +19,8 @@ import doobie.hikari.HikariTransactor import doobie.util.ExecutionContexts import eu.timepit.refined.auto._ import io.chrisdavenport.log4cats -import org.typelevel.log4cats.SelfAwareStructuredLogger -import org.typelevel.log4cats.slf4j.Slf4jLogger +import io.chrisdavenport.log4cats.SelfAwareStructuredLogger +import io.chrisdavenport.log4cats.slf4j.Slf4jLogger import org.http4s._ import org.http4s.dsl.Http4sDsl import org.http4s.implicits.{http4sLiteralsSyntax => _, _} diff --git a/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala b/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala index cc5c1dc86..0c45f7c0c 100644 --- a/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala +++ b/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala @@ -4,7 +4,7 @@ import cats.data.Kleisli import cats.data.OptionT import cats.effect.Sync import cats.syntax.functor._ -import org.typelevel.log4cats.Logger +import io.chrisdavenport.log4cats.Logger import io.circe.syntax._ import org.http4s.util.CaseInsensitiveString import org.http4s.{HttpRoutes, Request} diff --git a/application/src/main/scala/com/azavea/franklin/api/services/CollectionItemsService.scala b/application/src/main/scala/com/azavea/franklin/api/services/CollectionItemsService.scala index 69392ca5f..ae84a52bb 100644 --- a/application/src/main/scala/com/azavea/franklin/api/services/CollectionItemsService.scala +++ b/application/src/main/scala/com/azavea/franklin/api/services/CollectionItemsService.scala @@ -27,7 +27,7 @@ import doobie.implicits._ import doobie.util.transactor.Transactor import eu.timepit.refined.auto._ import eu.timepit.refined.types.numeric.NonNegInt -import org.typelevel.log4cats.Logger +import io.chrisdavenport.log4cats.Logger import io.circe._ import io.circe.syntax._ import org.http4s.HttpRoutes diff --git a/application/src/main/scala/com/azavea/franklin/api/services/CollectionsService.scala b/application/src/main/scala/com/azavea/franklin/api/services/CollectionsService.scala index 3c69c3af2..f0539521c 100644 --- a/application/src/main/scala/com/azavea/franklin/api/services/CollectionsService.scala +++ b/application/src/main/scala/com/azavea/franklin/api/services/CollectionsService.scala @@ -19,7 +19,7 @@ import doobie._ import doobie.implicits._ import doobie.util.transactor.Transactor import eu.timepit.refined.auto._ -import org.typelevel.log4cats.Logger +import io.chrisdavenport.log4cats.Logger import io.circe._ import io.circe.syntax._ import org.http4s.dsl.Http4sDsl diff --git a/application/src/main/scala/com/azavea/franklin/api/services/TileService.scala b/application/src/main/scala/com/azavea/franklin/api/services/TileService.scala index dc7d24671..7867b3d46 100644 --- a/application/src/main/scala/com/azavea/franklin/api/services/TileService.scala +++ b/application/src/main/scala/com/azavea/franklin/api/services/TileService.scala @@ -36,7 +36,7 @@ import geotrellis.raster.geotiff.GeoTiffRasterSource import geotrellis.raster.render.ColorRamps.greyscale import geotrellis.raster.render.{Implicits => RenderImplicits} import geotrellis.raster.{io => _, _} -import org.typelevel.log4cats.Logger +import io.chrisdavenport.log4cats.Logger import io.circe.Json import io.circe.syntax._ import org.http4s.HttpRoutes diff --git a/application/src/main/scala/com/azavea/franklin/crawler/CatalogStacImport.scala b/application/src/main/scala/com/azavea/franklin/crawler/CatalogStacImport.scala index 1f499c6fe..a63c78a96 100644 --- a/application/src/main/scala/com/azavea/franklin/crawler/CatalogStacImport.scala +++ b/application/src/main/scala/com/azavea/franklin/crawler/CatalogStacImport.scala @@ -17,7 +17,7 @@ import eu.timepit.refined.auto._ import geotrellis.vector.io.json.Implicits._ import geotrellis.vector.io.json._ import geotrellis.vector.{Feature, Geometry} -import org.typelevel.log4cats.slf4j.Slf4jLogger +import io.chrisdavenport.log4cats.slf4j.Slf4jLogger import io.circe.parser.decode import io.circe.syntax._ import io.circe.{Decoder, Error => CirceError, JsonObject} diff --git a/application/src/main/scala/com/azavea/franklin/crawler/StacIO.scala b/application/src/main/scala/com/azavea/franklin/crawler/StacIO.scala index b353b074e..a6ec1c91a 100644 --- a/application/src/main/scala/com/azavea/franklin/crawler/StacIO.scala +++ b/application/src/main/scala/com/azavea/franklin/crawler/StacIO.scala @@ -6,7 +6,7 @@ import cats.syntax.all._ import com.amazonaws.services.s3.AmazonS3ClientBuilder import com.azavea.stac4s.{`application/json`, StacCollection, StacItem, StacLink, StacLinkType} import geotrellis.store.s3.AmazonS3URI -import org.typelevel.log4cats.Logger +import io.chrisdavenport.log4cats.Logger import io.circe.parser.decodeAccumulating import io.circe.{CursorOp, Decoder, DecodingFailure, Error => CirceError, ParsingFailure} import sttp.client._ diff --git a/application/src/main/scala/com/azavea/franklin/crawler/StacItemImporter.scala b/application/src/main/scala/com/azavea/franklin/crawler/StacItemImporter.scala index 2192a9d84..5dec3bc59 100644 --- a/application/src/main/scala/com/azavea/franklin/crawler/StacItemImporter.scala +++ b/application/src/main/scala/com/azavea/franklin/crawler/StacItemImporter.scala @@ -8,7 +8,7 @@ import com.azavea.franklin.database.{getItemsBulkExtent, StacCollectionDao, Stac import com.azavea.stac4s._ import doobie.implicits._ import doobie.util.transactor.Transactor -import org.typelevel.log4cats.slf4j.Slf4jLogger +import io.chrisdavenport.log4cats.slf4j.Slf4jLogger import sttp.client.{NothingT, SttpBackend} class StacItemImporter(val collectionId: String, val itemUris: NonEmptyList[String])( diff --git a/application/src/main/scala/com/azavea/franklin/extensions/validation/package.scala b/application/src/main/scala/com/azavea/franklin/extensions/validation/package.scala index 562974bb4..834fd9584 100644 --- a/application/src/main/scala/com/azavea/franklin/extensions/validation/package.scala +++ b/application/src/main/scala/com/azavea/franklin/extensions/validation/package.scala @@ -16,7 +16,7 @@ import com.azavea.stac4s.syntax._ import com.azavea.stac4s.{StacItem, StacLink, StacLinkType} import eu.timepit.refined.auto._ import eu.timepit.refined.types.string.NonEmptyString -import org.typelevel.log4cats.Logger +import io.chrisdavenport.log4cats.Logger import io.circe.Encoder import io.circe.Json import io.circe.schema.Schema diff --git a/application/src/test/scala/com/azavea/franklin/api/TestImplicits.scala b/application/src/test/scala/com/azavea/franklin/api/TestImplicits.scala index 9d9229378..ab1bded6f 100644 --- a/application/src/test/scala/com/azavea/franklin/api/TestImplicits.scala +++ b/application/src/test/scala/com/azavea/franklin/api/TestImplicits.scala @@ -7,7 +7,7 @@ import com.azavea.franklin.api.commands.ApiConfig import com.azavea.franklin.api.services.{CollectionItemsService, CollectionsService, SearchService} import doobie.Transactor import eu.timepit.refined.types.numeric.{NonNegInt, PosInt} -import org.typelevel.log4cats.noop.NoOpLogger +import io.chrisdavenport.log4cats.noop.NoOpLogger import sttp.client.asynchttpclient.cats.AsyncHttpClientCatsBackend trait TestImplicits[F[_]] { diff --git a/application/src/test/scala/com/azavea/franklin/api/TestServices.scala b/application/src/test/scala/com/azavea/franklin/api/TestServices.scala index 1c6ed1048..8d98e0207 100644 --- a/application/src/test/scala/com/azavea/franklin/api/TestServices.scala +++ b/application/src/test/scala/com/azavea/franklin/api/TestServices.scala @@ -9,7 +9,7 @@ import com.azavea.franklin.extensions.validation.{collectionExtensionsRef, itemE import com.azavea.stac4s.{`application/json`, StacLink, StacLinkType} import doobie.Transactor import eu.timepit.refined.types.numeric.{NonNegInt, PosInt} -import org.typelevel.log4cats.noop.NoOpLogger +import io.chrisdavenport.log4cats.noop.NoOpLogger import sttp.client.asynchttpclient.cats.AsyncHttpClientCatsBackend class TestServices[F[_]: Concurrent](xa: Transactor[F])( diff --git a/project/Versions.scala b/project/Versions.scala index 68666dce8..9a3b29dde 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -25,7 +25,7 @@ object Versions { val Http4sVersion = "0.21.33" val JtsVersion = "1.16.1" val LogbackVersion = "1.2.5" - val Log4CatsVersion = "1.7.0" + val Log4CatsVersion = "1.1.1" val MagnoliaVersion = "0.17.0" val MonocleVersion = "2.1.0" val Postgis = "2.5.1" From 36a7fa00dd6f7ce2895e85e3712b5a2d5d6368dc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 17 Oct 2022 13:43:21 +0000 Subject: [PATCH 4/5] Applied Scalafix rule(s) https://gist.githubusercontent.com/fthomas/ea14d58e1b445d8038a5bc22acf751e8/raw/e1180c91dab0b36d8f9ec37d413ef9507bee67ff/log4cats-1.2.0.scala Co-authored-by: Frank Thomas --- .../src/main/scala/com/azavea/franklin/api/Server.scala | 4 ++-- .../franklin/api/middleware/AccessLoggingMiddleware.scala | 2 +- .../com/azavea/franklin/api/services/CatalogService.scala | 2 +- .../com/azavea/franklin/api/services/CollectionService.scala | 2 +- .../scala/com/azavea/franklin/api/services/ItemService.scala | 2 +- .../scala/com/azavea/franklin/api/util/UpdateItemLinks.scala | 2 +- .../com/azavea/franklin/api/util/UpdateSearchLinks.scala | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/src/main/scala/com/azavea/franklin/api/Server.scala b/application/src/main/scala/com/azavea/franklin/api/Server.scala index 0a277fbe0..13b5bd94e 100644 --- a/application/src/main/scala/com/azavea/franklin/api/Server.scala +++ b/application/src/main/scala/com/azavea/franklin/api/Server.scala @@ -21,8 +21,8 @@ import doobie.hikari.HikariTransactor import doobie.util.ExecutionContexts import eu.timepit.refined.auto._ import io.chrisdavenport.log4cats -import io.chrisdavenport.log4cats.SelfAwareStructuredLogger -import io.chrisdavenport.log4cats.slf4j.Slf4jLogger +import org.typelevel.log4cats.SelfAwareStructuredLogger +import org.typelevel.log4cats.slf4j.Slf4jLogger import org.http4s._ import org.http4s.dsl.Http4sDsl import org.http4s.implicits.{http4sLiteralsSyntax => _, _} diff --git a/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala b/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala index 0c45f7c0c..cc5c1dc86 100644 --- a/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala +++ b/application/src/main/scala/com/azavea/franklin/api/middleware/AccessLoggingMiddleware.scala @@ -4,7 +4,7 @@ import cats.data.Kleisli import cats.data.OptionT import cats.effect.Sync import cats.syntax.functor._ -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe.syntax._ import org.http4s.util.CaseInsensitiveString import org.http4s.{HttpRoutes, Request} diff --git a/application/src/main/scala/com/azavea/franklin/api/services/CatalogService.scala b/application/src/main/scala/com/azavea/franklin/api/services/CatalogService.scala index 1f1daa707..b498a4d63 100644 --- a/application/src/main/scala/com/azavea/franklin/api/services/CatalogService.scala +++ b/application/src/main/scala/com/azavea/franklin/api/services/CatalogService.scala @@ -16,7 +16,7 @@ import doobie._ import doobie.implicits._ import doobie.util.transactor.Transactor import eu.timepit.refined.auto._ -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe._ import io.circe.optics.JsonPath._ import io.circe.syntax._ diff --git a/application/src/main/scala/com/azavea/franklin/api/services/CollectionService.scala b/application/src/main/scala/com/azavea/franklin/api/services/CollectionService.scala index 1b146bf4c..48b284bcf 100644 --- a/application/src/main/scala/com/azavea/franklin/api/services/CollectionService.scala +++ b/application/src/main/scala/com/azavea/franklin/api/services/CollectionService.scala @@ -14,7 +14,7 @@ import doobie._ import doobie.implicits._ import doobie.util.transactor.Transactor import eu.timepit.refined.auto._ -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe._ import io.circe.optics.JsonPath._ import io.circe.syntax._ diff --git a/application/src/main/scala/com/azavea/franklin/api/services/ItemService.scala b/application/src/main/scala/com/azavea/franklin/api/services/ItemService.scala index 792c90b6c..592565be4 100644 --- a/application/src/main/scala/com/azavea/franklin/api/services/ItemService.scala +++ b/application/src/main/scala/com/azavea/franklin/api/services/ItemService.scala @@ -22,7 +22,7 @@ import doobie._ import doobie.implicits._ import doobie.util.transactor.Transactor import eu.timepit.refined.auto._ -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe._ import io.circe.optics.JsonPath._ import io.circe.syntax._ diff --git a/application/src/main/scala/com/azavea/franklin/api/util/UpdateItemLinks.scala b/application/src/main/scala/com/azavea/franklin/api/util/UpdateItemLinks.scala index fd733b720..3975f53e3 100644 --- a/application/src/main/scala/com/azavea/franklin/api/util/UpdateItemLinks.scala +++ b/application/src/main/scala/com/azavea/franklin/api/util/UpdateItemLinks.scala @@ -11,7 +11,7 @@ import doobie._ import doobie.implicits._ import doobie.util.transactor.Transactor import eu.timepit.refined.auto._ -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe._ import org.http4s.Method diff --git a/application/src/main/scala/com/azavea/franklin/api/util/UpdateSearchLinks.scala b/application/src/main/scala/com/azavea/franklin/api/util/UpdateSearchLinks.scala index ad616965a..a6c7ee25c 100644 --- a/application/src/main/scala/com/azavea/franklin/api/util/UpdateSearchLinks.scala +++ b/application/src/main/scala/com/azavea/franklin/api/util/UpdateSearchLinks.scala @@ -12,7 +12,7 @@ import doobie.implicits._ import doobie.util.transactor.Transactor import eu.timepit.refined.auto._ import eu.timepit.refined.types.numeric.NonNegInt -import io.chrisdavenport.log4cats.Logger +import org.typelevel.log4cats.Logger import io.circe._ import io.circe.syntax._ import org.http4s.Method From 139075dd0b66c3de54f5386c6d53ed54a88a8959 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 17 Oct 2022 13:43:27 +0000 Subject: [PATCH 5/5] Update log4cats-core, log4cats-noop, ... to 1.7.0 --- project/Versions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Versions.scala b/project/Versions.scala index 1c1caa076..bb4cfb20e 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -24,7 +24,7 @@ object Versions { val Http4sVersion = "0.21.33" val JtsVersion = "1.18.1" val LogbackVersion = "1.2.5" - val Log4CatsVersion = "1.1.1" + val Log4CatsVersion = "1.7.0" val MagnoliaVersion = "0.17.0" val MonocleVersion = "2.1.0" val OsLib = "0.8.0"