From 6f021006bb293d74e0959da91df75bdcd4f2ae72 Mon Sep 17 00:00:00 2001 From: Sam Guymer Date: Sun, 19 May 2024 10:04:48 +1000 Subject: [PATCH] more --- build.sbt | 22 +++++++------------ .../src/main/scala/zoobie/Transactor.scala | 1 - project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/build.sbt b/build.sbt index fd877121a..b011e09e3 100644 --- a/build.sbt +++ b/build.sbt @@ -3,24 +3,24 @@ import FreeGen2.* val catsVersion = "2.10.0" val catsEffectVersion = "3.5.4" -val circeVersion = "0.14.6" +val circeVersion = "0.14.7" val fs2Version = "3.10.2" val h2Version = "2.2.224" val hikariVersion = "5.1.0" val magnoliaVersion = "1.1.3" -val munitVersion = "1.0.0-M11" -val mysqlVersion = "8.3.0" -val openTelemetryVersion = "1.36.0" +val munitVersion = "1.0.0-RC1" +val mysqlVersion = "8.4.0" +val openTelemetryVersion = "1.38.0" val postgisVersion = "2023.1.0" val postgresVersion = "42.7.3" val scalatestVersion = "3.2.18" val shapelessVersion = "2.3.10" -val slf4jVersion = "2.0.12" +val slf4jVersion = "2.0.13" val weaverVersion = "0.8.4" -val zioInteropCats = "23.1.0.1" -val zioVersion = "2.0.21" +val zioInteropCats = "23.1.0.2" +val zioVersion = "2.1.1" -val Scala213 = "2.13.13" +val Scala213 = "2.13.14" val Scala3 = "3.3.3" inThisBuild(Seq( @@ -88,12 +88,6 @@ lazy val commonSettings = Seq( ) }), Test / scalacOptions --= Seq("-Wperformance"), - Test / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { - case Some((2, _)) => Seq( - "-Wconf:cat=lint-named-booleans:silent", - ) - case _ => Seq.empty - }), Compile / console / scalacOptions ~= filterScalacConsoleOpts, Test / console / scalacOptions ~= filterScalacConsoleOpts, diff --git a/modules/zio/src/main/scala/zoobie/Transactor.scala b/modules/zio/src/main/scala/zoobie/Transactor.scala index 82377cb0a..a4d970605 100644 --- a/modules/zio/src/main/scala/zoobie/Transactor.scala +++ b/modules/zio/src/main/scala/zoobie/Transactor.scala @@ -114,5 +114,4 @@ object Transactor { def fromPoolTransactional(pool: ConnectionPool): Transactor = { fromPool(pool, strategies.transactional) } - } diff --git a/project/build.properties b/project/build.properties index 04267b14a..081fdbbc7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index ae2926d1b..43bf77d2a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0") -addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.6.0") +addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")