Update deps and polish things

build.sbt

@@ -1,50 +1,42 @@
 name := "zio-cassandra"
+import Dependencies.V
+import sbt.librarymanagement.CrossVersion
+import BuildHelper._
 
 inThisBuild(
   List(
-    organization := "st.alzo",
-    scalaVersion := "2.13.8",
-    licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")),
-    developers   := List(
+    organization           := "st.alzo",
+    scalaVersion           := V.scala2,
+    licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")),
+    developers             := List(
       Developer("jsfwa", "jsfwa", "[email protected]", url("https://gitlab.com/jsfwa")),
       Developer("alzo", "Sergey Rublev", "[email protected]", url("https://github.com/narma/"))
     ),
-    scmInfo      := Some(ScmInfo(url("https://github.com/narma/zio-cassandra"), "[email protected]:jsfwa/zio-cassandra.git")),
-    homepage     := Some(url("https://github.com/narma/zio-cassandra")),
+    scmInfo                := Some(ScmInfo(url("https://github.com/narma/zio-cassandra"), "[email protected]:jsfwa/zio-cassandra.git")),
+    homepage               := Some(url("https://github.com/narma/zio-cassandra")),
     sonatypeCredentialHost := "s01.oss.sonatype.org"
   )
 )
 
 testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
 
+def shapelessDeps(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match {
+  case Some((3, _)) => Nil
+  case _            => Seq("com.chuusai" %% "shapeless" % "2.3.9")
+}
+
 lazy val root =
   (project in file("."))
     .configs(IntegrationTest)
+    .settings(stdSettings("zio-cassandra"))
     .settings(
       Defaults.itSettings,
       libraryDependencies ++=
         Dependencies.cassandraDependencies ++
           Dependencies.zioDependencies ++
-          Dependencies.commonDependencies ++
+          shapelessDeps(scalaVersion.value) ++
           Dependencies.testCommon ++
           Dependencies.testIntegrationDeps,
-      scalacOptions ++= Seq(
-        "-encoding",
-        "utf-8",
-        "-unchecked",
-        "-explaintypes",
-        "-Yrangepos",
-        "-Ywarn-unused",
-        "-Ymacro-annotations",
-        "-deprecation",
-        "-language:higherKinds",
-        "-language:implicitConversions",
-        "-Xlint:-serial",
-        "-Xfatal-warnings",
-        "-Werror",
-        "-Wconf:any:error"
-      ),
-      Compile / console / scalacOptions --= Seq("-Wconf:any:error", "-Werror", "-Xfatal-warnings", "-Ywarn-unused"),
       Test / parallelExecution := false,
       Test / fork              := false,
       IntegrationTest / fork   := true

project/BuildHelper.scala

@@ -0,0 +1,84 @@
+import sbt.Keys._
+import sbt.librarymanagement.CrossVersion
+import sbt.{Compile, Test}
+
+object BuildHelper {
+
+  private val stdOptions = Seq(
+    "-deprecation",
+    "-encoding",
+    "UTF-8",
+    "-feature",
+    "-unchecked"
+  ) ++ {
+    if (isCI) {
+      Seq("-Xfatal-warnings")
+    } else {
+      Nil
+    }
+  }
+
+  private val std2xOptions = Seq(
+    "-language:higherKinds",
+    "-language:implicitConversions",
+    "-explaintypes",
+    "-Yrangepos",
+    "-Ymacro-annotations",
+    "-Xlint:_,-missing-interpolator,-type-parameter-shadow,-infer-any,-byname-implicit",
+    "-Xlint:stars-align",
+    "-Xlint:strict-unsealed-patmat",
+    "-Ywarn-numeric-widen",
+    "-Ywarn-value-discard",
+    "-Ywarn-unused:params,imports,-implicits",
+    "-Ypatmat-exhaust-depth",
+    "40",
+    "-Xfatal-warnings",
+    "-Werror",
+    "-Wconf:any:error"
+    // "-Xsource:3"
+  )
+
+  def optimizerOptions(optimize: Boolean): Seq[String] =
+    if (optimize)
+      Seq(
+        "-opt:l:inline",
+        "-opt:l:method",
+        "-opt-inline-from:zio.cassandra.**"
+      )
+    else Nil
+
+  def extraOptions(scalaVersion: String, optimize: Boolean) =
+    CrossVersion.partialVersion(scalaVersion) match {
+      case Some((3, _))  =>
+        Seq(
+          "-language:implicitConversions",
+          "-explain-types",
+          "-Xmax-inlines",
+          "40",
+          "-Ycheck-all-patmat",
+          "-noindent"
+        )
+      case Some((2, 13)) =>
+        std2xOptions ++ optimizerOptions(optimize)
+      case _             => Seq.empty
+    }
+
+  private def getEnv(name: String): Option[String] = Option(System.getenv(name))
+
+  private def envExist(name: String): Boolean =
+    getEnv(name).exists(_.nonEmpty)
+
+  private def isCI: Boolean =
+    envExist("CI")
+
+  def stdSettings(projectName: String) = Seq(
+    name                 := s"$projectName",
+    scalacOptions ++= stdOptions ++ extraOptions(
+      scalaVersion.value,
+      optimize = !isSnapshot.value || isCI
+    ),
+    Compile / console / scalacOptions ~= (_.filterNot(Set("-Wconf:any:error", "-Werror", "-Xfatal-warnings", "-Ywarn-unused").contains)),
+    Test / scalacOptions := (Compile / console / scalacOptions).value
+  )
+
+}

project/Dependencies.scala

@@ -1,21 +1,24 @@
 import sbt._
+import sbt.librarymanagement.CrossVersion
 
 object Dependencies {
 
-  val cassandraDriverVersion = "4.14.0"
+  object V {
+    val scala2    = "2.13.8"
+    val scala3    = "3.1.3"
+    val allScala  = Seq(scala2, scala3)
+  }
 
-  val zioVersion = "1.0.13"
+  val cassandraDriverVersion = "4.14.1"
 
-  val testContainersVersion = "0.40.2"
+  val zioVersion = "1.0.16"
+
+  val testContainersVersion = "0.40.8"
 
   val cassandraDependencies = Seq(
     "com.datastax.oss" % "java-driver-core" % cassandraDriverVersion
   )
 
-  val commonDependencies = Seq(
-    "com.chuusai" %% "shapeless" % "2.3.8"
-  )
-
   val zioDependencies = Seq(
     "dev.zio" %% "zio"         % zioVersion,
     "dev.zio" %% "zio-streams" % zioVersion
@@ -27,11 +30,11 @@ object Dependencies {
   ).map(_ % "it,test")
 
   val testIntegrationDeps = Seq(
-    "org.wvlet.airframe" %% "airframe-log"                   % "20.5.1",
-    "org.slf4j"           % "slf4j-jdk14"                    % "1.7.32",
+    "org.wvlet.airframe" %% "airframe-log"                   % "22.6.1",
+    "org.slf4j"           % "slf4j-jdk14"                    % "1.7.36",
     "com.dimafeng"       %% "testcontainers-scala-core"      % testContainersVersion,
     "com.dimafeng"       %% "testcontainers-scala-cassandra" % testContainersVersion,
-    "org.testcontainers"  % "testcontainers"                 % "1.16.3"
+    "org.testcontainers"  % "testcontainers"                 % "1.17.2"
   ).map(_ % "it")
 
 }

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.6.2
+sbt.version = 1.7.1