Merge branch 'master' into renovate/jettytestversion

cognitedata · Jan 25, 2025 · 19f08e0 · 19f08e0
2 parents ce76dd6 + f8a2d00
commit 19f08e0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -2,7 +2,7 @@ style = default
 
 maxColumn = 100
 
-version = 3.8.4
+version = 3.8.5
 
 // Vertical alignment is pretty, but leads to bigger diffs
 align.preset = none

diff --git a/build.sbt b/build.sbt
@@ -17,7 +17,7 @@ val natchezVersion = "0.3.7"
 
 lazy val gpgPass = Option(System.getenv("GPG_KEY_PASSWORD"))
 
-ThisBuild / scalafixDependencies += "org.typelevel" %% "typelevel-scalafix" % "0.4.0"
+ThisBuild / scalafixDependencies += "org.typelevel" %% "typelevel-scalafix" % "0.5.0"
 
 lazy val patchVersion = scala.io.Source.fromFile("patch_version.txt").mkString.trim
 
@@ -136,7 +136,7 @@ lazy val core = (project in file("."))
       "org.typelevel" %% "cats-effect-testkit" % catsEffectVersion % Test,
       "co.fs2" %% "fs2-core" % fs2Version,
       "co.fs2" %% "fs2-io" % fs2Version,
-      "com.google.protobuf" % "protobuf-java" % "4.29.2",
+      "com.google.protobuf" % "protobuf-java" % "4.29.3",
       "org.tpolecat" %% "natchez-core" % natchezVersion,
     ) ++ scalaTestDeps ++ sttpDeps ++ circeDeps(CrossVersion.partialVersion(scalaVersion.value)),
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {

diff --git a/build.scala-2.12.sbt.lock b/build.scala-2.12.sbt.lock
@@ -78,11 +78,11 @@
     {
       "org" : "com.google.protobuf",
       "name" : "protobuf-java",
-      "version" : "4.29.2",
+      "version" : "4.29.3",
       "artifacts" : [
         {
           "name" : "protobuf-java.jar",
-          "hash" : "sha1:695bb50e3e4a88cc10ffa94c67199d849e9398e6"
+          "hash" : "sha1:83afa847b893932b49a8fd896608fa23cd5fb0b5"
         }
       ],
       "configurations" : [

diff --git a/build.scala-2.13.sbt.lock b/build.scala-2.13.sbt.lock
@@ -78,11 +78,11 @@
     {
       "org" : "com.google.protobuf",
       "name" : "protobuf-java",
-      "version" : "4.29.2",
+      "version" : "4.29.3",
       "artifacts" : [
         {
           "name" : "protobuf-java.jar",
-          "hash" : "sha1:695bb50e3e4a88cc10ffa94c67199d849e9398e6"
+          "hash" : "sha1:83afa847b893932b49a8fd896608fa23cd5fb0b5"
         }
       ],
       "configurations" : [

diff --git a/build.scala-3.sbt.lock b/build.scala-3.sbt.lock
@@ -62,11 +62,11 @@
     {
       "org" : "com.google.protobuf",
       "name" : "protobuf-java",
-      "version" : "4.29.2",
+      "version" : "4.29.3",
       "artifacts" : [
         {
           "name" : "protobuf-java.jar",
-          "hash" : "sha1:695bb50e3e4a88cc10ffa94c67199d849e9398e6"
+          "hash" : "sha1:83afa847b893932b49a8fd896608fa23cd5fb0b5"
         }
       ],
       "configurations" : [

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,12 +1,12 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")
 addSbtPlugin("au.com.onegeek" %% "sbt-dotenv" % "2.1.233")
-addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.2.5")
+addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.2.7")
 addSbtPlugin("software.purpledragon" % "sbt-dependency-lock" % "1.5.1")
 
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")