Merge pull request #424 from tpolecat/update-deps

Update deps and headers

Author: tpolecat

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 by Rob Norris
+Copyright (c) 2018-2021 by Rob Norris
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

build.sbt

@@ -3,11 +3,11 @@
 // Our Scala versions.
 lazy val `scala-2.12`     = "2.12.13"
 lazy val `scala-2.13`     = "2.13.5"
-lazy val `scala-3.0-prev` = "3.0.0-M3"
-lazy val `scala-3.0-curr` = "3.0.0-RC1"
+lazy val `scala-3.0-prev` = "3.0.0-RC1"
+lazy val `scala-3.0-curr` = "3.0.0-RC2"
 
 // This is used in a couple places
-lazy val fs2Version = "2.5.3"
+lazy val fs2Version = "2.5.4"
 
 // Global Settings
 lazy val commonSettings = Seq(
@@ -27,7 +27,7 @@ lazy val commonSettings = Seq(
   // Headers
   headerMappings := headerMappings.value + (HeaderFileType.scala -> HeaderCommentStyle.cppStyleLineComment),
   headerLicense  := Some(HeaderLicense.Custom(
-    """|Copyright (c) 2018-2020 by Rob Norris
+    """|Copyright (c) 2018-2021 by Rob Norris
        |This software is licensed under the MIT License (MIT).
        |For more information see LICENSE or https://opensource.org/licenses/MIT
        |""".stripMargin
@@ -103,19 +103,19 @@ lazy val core = project
     description := "Tagless, non-blocking data access library for Postgres.",
     resolvers   +=  "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
     libraryDependencies ++= Seq(
-      "org.typelevel"    %% "cats-core"    % "2.4.2",
-      "org.typelevel"    %% "cats-effect"  % "2.3.3",
+      "org.typelevel"    %% "cats-core"    % "2.5.0",
+      "org.typelevel"    %% "cats-effect"  % "2.4.1",
       "co.fs2"           %% "fs2-core"     % fs2Version,
       "co.fs2"           %% "fs2-io"       % fs2Version,
-      "org.scodec"       %% "scodec-core"  % (if (isDotty.value) "2.0.0-RC1" else "1.11.7"),
-      "org.scodec"       %% "scodec-cats"  % "1.1.0-RC1",
-      "org.tpolecat"     %% "natchez-core" % "0.0.20",
-      "org.tpolecat"     %% "sourcepos"    % "0.1.1",
+      "org.scodec"       %% "scodec-core"  % (if (isDotty.value) "2.0.0-RC2" else "1.11.7"),
+      "org.scodec"       %% "scodec-cats"  % "1.1.0-RC2",
+      "org.tpolecat"     %% "natchez-core" % "0.0.22",
+      "org.tpolecat"     %% "sourcepos"    % "0.1.2",
       "com.ongres.scram"  % "client"       % "2.1",
     ) ++ Seq(
       "com.beachape"  %% "enumeratum"   % "1.6.1",
     ).map(_.withDottyCompat(scalaVersion.value)) ++ Seq(
-      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2",
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3",
     )
   )
 
@@ -152,11 +152,11 @@ lazy val tests = project
     publish / skip := true,
     scalacOptions  -= "-Xfatal-warnings",
     libraryDependencies ++= Seq(
-      "org.typelevel"     %% "scalacheck-effect-munit" % "0.7.1",
-      "org.typelevel"     %% "munit-cats-effect-2"     % "0.13.1",
-      "org.typelevel"     %% "cats-free"               % "2.4.2",
-      "org.typelevel"     %% "cats-laws"               % "2.4.2",
-      "org.typelevel"     %% "discipline-munit"        % "1.0.6",
+      "org.typelevel"     %% "scalacheck-effect-munit" % "1.0.0",
+      "org.typelevel"     %% "munit-cats-effect-2"     % "1.0.1",
+      "org.typelevel"     %% "cats-free"               % "2.5.0",
+      "org.typelevel"     %% "cats-laws"               % "2.5.0",
+      "org.typelevel"     %% "discipline-munit"        % "1.0.7",
     ) ++ Seq(
       "io.chrisdavenport" %% "cats-time"               % "0.3.4",
     ).filterNot(_ => isDotty.value),
@@ -171,8 +171,8 @@ lazy val example = project
   .settings(
     publish / skip := true,
     libraryDependencies ++= Seq(
-      "org.tpolecat"  %% "natchez-honeycomb"   % "0.0.20",
-      "org.tpolecat"  %% "natchez-jaeger"      % "0.0.20",
+      "org.tpolecat"  %% "natchez-honeycomb"   % "0.0.22",
+      "org.tpolecat"  %% "natchez-jaeger"      % "0.0.22",
     ) ++ Seq(
       "org.http4s"    %% "http4s-dsl"          % "0.21.21",
       "org.http4s"    %% "http4s-blaze-server" % "0.21.21",

modules/circe/src/main/scala-2/JsonCodecs.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-2.12/data/ArrPlatform.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-2.12/utll/package.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-2.13+/data/ArrPlatform.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-2.13/utll/package.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-2/SqlState.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-2/syntax/AllOps.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-2/syntax/StringContextOps.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-2/util/Twiddler.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-3/SqlState.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-3/syntax/AllOps.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-3/syntax/CodecOps.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-3/syntax/DecoderOps.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-3/syntax/EncoderOps.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-3/syntax/StringContextOps.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala-3/util/Twiddler.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/AppliedFragment.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Channel.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Codec.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Command.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Cursor.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Decoder.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Encoder.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Fragment.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/PreparedCommand.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/PreparedQuery.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Query.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/SSL.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Session.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 
@@ -270,7 +270,7 @@ object Session {
     for {
       blocker <- Blocker[F]
       sockGrp <- SocketGroup[F](blocker)
-      sslOp   <- Resource.liftF(ssl.toSSLNegotiationOptions(blocker, if (debug) logger.some else none))
+      sslOp   <- Resource.eval(ssl.toSSLNegotiationOptions(blocker, if (debug) logger.some else none))
       pool    <- Pool.of(session(sockGrp, sslOp), max)(Recyclers.full)
     } yield pool
 
@@ -326,10 +326,10 @@ object Session {
     parameters: Map[String, String]
   ): Resource[F, Session[F]] =
     for {
-      namer <- Resource.liftF(Namer[F])
+      namer <- Resource.eval(Namer[F])
       proto <- Protocol[F](host, port, debug, namer, readTimeout, writeTimeout, socketGroup, sslOptions)
-      _     <- Resource.liftF(proto.startup(user, database, password, parameters))
-      sess  <- Resource.liftF(fromProtocol(proto, namer, strategy))
+      _     <- Resource.eval(proto.startup(user, database, password, parameters))
+      sess  <- Resource.eval(fromProtocol(proto, namer, strategy))
     } yield sess
 
   /**

modules/core/src/main/scala/Statement.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Transaction.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/Void.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/codec/AllCodecs.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/codec/BinaryCodecs.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/codec/BooleanCodec.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/codec/EnumCodec.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/codec/NumericCodecs.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/codec/TemporalCodecs.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/codec/TextCodecs.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/codec/UuidCodec.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/data/Arr.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/data/Completion.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/data/Identifier.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/data/Notification.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/data/TransactionAccessMode.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/data/TransactionIsolationLevel.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/data/TransactionStatus.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT
 

modules/core/src/main/scala/data/Type.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 by Rob Norris
+// Copyright (c) 2018-2021 by Rob Norris
 // This software is licensed under the MIT License (MIT).
 // For more information see LICENSE or https://opensource.org/licenses/MIT