Merge branch 'master' into renovate/com.google.protobuf-protobuf-java…

…-4.x
cognitedata · Jul 19, 2024 · 4794f36 · 4794f36
2 parents 14d9fc9 + 2de0654
commit 4794f36
Show file tree

Hide file tree

Showing 26 changed files with 155 additions and 882 deletions.
diff --git a/.github/workflows/lottery.yaml b/.github/workflows/lottery.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !github.event.pull_request.draft }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: uesteibar/reviewer-lottery@c291d74388da1cb583aff994b8be945e8eefbcd5 # v3.1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -130,8 +130,8 @@ jobs:
 
       - name: Compile
         run: |
-          cat /dev/null | sbt -Dsbt.log.noformat=true ++3.4 dependencyLockCheck
-          cat /dev/null | sbt -Dsbt.log.noformat=true -J-Xmx4G -J-XX:+UseG1GC ++3.4 Test/compile
+          cat /dev/null | sbt -Dsbt.log.noformat=true ++3.3 dependencyLockCheck
+          cat /dev/null | sbt -Dsbt.log.noformat=true -J-Xmx4G -J-XX:+UseG1GC ++3.3 Test/compile
 
   test:
     runs-on: ubuntu-latest
@@ -200,11 +200,11 @@ jobs:
         TEST_PROJECT2: "playground"
       # run: sbt test
       run: |
-        cat /dev/null | sbt -Dsbt.log.noformat=true ++3.4 dependencyLockCheck
-        cat /dev/null | sbt -Dsbt.log.noformat=true -J-Xmx4G -J-XX:+UseG1GC ++3.4 scalafmtCheck test
+        cat /dev/null | sbt -Dsbt.log.noformat=true ++3.3 dependencyLockCheck
+        cat /dev/null | sbt -Dsbt.log.noformat=true -J-Xmx4G -J-XX:+UseG1GC ++3.3 scalafmtCheck test
 
     - name: Upload test coverage report
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.codecov_token }}
 

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -2,7 +2,7 @@ style = default
 
 maxColumn = 100
 
-version = 3.5.8
+version = 3.8.2
 
 // Vertical alignment is pretty, but leads to bigger diffs
 align.preset = none

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 import sbt.{Test, project}
 import wartremover.Wart
 
-val scala3 = "3.4.2"
+val scala3 = "3.3.3"
 val scala213 = "2.13.14"
 val scala212 = "2.12.17"
 val supportedScalaVersions = List(scala212, scala213, scala3)
@@ -12,8 +12,8 @@ val jettyTestVersion = "9.4.55.v20240627"
 val sttpVersion = "3.5.2"
 val circeVersion = "0.14.9"
 val catsEffectVersion = "3.5.4"
-val fs2Version = "3.3.0"
-val natchezVersion = "0.3.1"
+val fs2Version = "3.10.2"
+val natchezVersion = "0.3.5"
 
 lazy val gpgPass = Option(System.getenv("GPG_KEY_PASSWORD"))
 
@@ -33,7 +33,7 @@ lazy val commonSettings = Seq(
   organization := "com.cognite",
   organizationName := "Cognite",
   organizationHomepage := Some(url("https://cognite.com")),
-  version := "2.23." + patchVersion,
+  version := "2.25." + patchVersion,
   isSnapshot := patchVersion.endsWith("-SNAPSHOT"),
   scalaVersion := scala213, // use 2.13 by default
   // handle cross plugin https://github.com/stringbean/sbt-dependency-lock/issues/13
@@ -116,7 +116,7 @@ lazy val core = (project in file("."))
   .settings(
     commonSettings,
     libraryDependencies ++= Seq(
-      "commons-io" % "commons-io" % "2.15.0",
+      "commons-io" % "commons-io" % "2.16.1",
       "org.eclipse.jetty" % "jetty-server" % jettyTestVersion % Test,
       "org.eclipse.jetty" % "jetty-servlet" % jettyTestVersion % Test,
       "org.typelevel" %% "cats-effect" % catsEffectVersion,

diff --git a/build.scala-2.12.sbt.lock b/build.scala-2.12.sbt.lock
@@ -1,6 +1,6 @@
 {
   "lockVersion" : 1,
-  "timestamp" : "2024-07-04T18:20:25.448762Z",
+  "timestamp" : "2024-07-04T18:23:05.000710Z",
   "configurations" : [
     "compile",
     "optional",
@@ -14,11 +14,11 @@
     {
       "org" : "co.fs2",
       "name" : "fs2-core_2.12",
-      "version" : "3.6.1",
+      "version" : "3.10.2",
       "artifacts" : [
         {
           "name" : "fs2-core_2.12.jar",
-          "hash" : "sha1:e20dd115333be346f9926a6f04db1daaddea29fa"
+          "hash" : "sha1:413c7d123f943eea68f6c77907318e58e0410ad4"
         }
       ],
       "configurations" : [
@@ -30,11 +30,11 @@
     {
       "org" : "co.fs2",
       "name" : "fs2-io_2.12",
-      "version" : "3.6.1",
+      "version" : "3.10.2",
       "artifacts" : [
         {
           "name" : "fs2-io_2.12.jar",
-          "hash" : "sha1:8b3ac38ebf5f4d69c19a11601131c5b916f69583"
+          "hash" : "sha1:89cefd0c05480d603e26d4b92a3d8284b8ec7b4a"
         }
       ],
       "configurations" : [
@@ -62,11 +62,11 @@
     {
       "org" : "com.comcast",
       "name" : "ip4s-core_2.12",
-      "version" : "3.2.0",
+      "version" : "3.5.0",
       "artifacts" : [
         {
           "name" : "ip4s-core_2.12.jar",
-          "hash" : "sha1:8ae877810ae84e6e73cf8d3bdbfaa8389c1f4f0a"
+          "hash" : "sha1:19d582e20c3cb27c1481b7e43baea0fa90aa7cd6"
         }
       ],
       "configurations" : [
@@ -260,11 +260,11 @@
     {
       "org" : "commons-io",
       "name" : "commons-io",
-      "version" : "2.15.0",
+      "version" : "2.16.1",
       "artifacts" : [
         {
           "name" : "commons-io.jar",
-          "hash" : "sha1:5c3c2db10f6f797430a7f9c696b4d1273768c924"
+          "hash" : "sha1:377d592e740dc77124e0901291dbfaa6810a200e"
         }
       ],
       "configurations" : [
@@ -680,11 +680,11 @@
     {
       "org" : "org.scala-lang.modules",
       "name" : "scala-collection-compat_2.12",
-      "version" : "2.9.0",
+      "version" : "2.11.0",
       "artifacts" : [
         {
           "name" : "scala-collection-compat_2.12.jar",
-          "hash" : "sha1:ff06706d7baaad4405ca4fe985aa167396414a25"
+          "hash" : "sha1:965bfcb4ca7f821113b4877154457f9a4fae2328"
         }
       ],
       "configurations" : [
@@ -962,11 +962,11 @@
     {
       "org" : "org.scodec",
       "name" : "scodec-bits_2.12",
-      "version" : "1.1.35",
+      "version" : "1.1.38",
       "artifacts" : [
         {
           "name" : "scodec-bits_2.12.jar",
-          "hash" : "sha1:007bcd191452d1c311806b086fe143e60da97d4b"
+          "hash" : "sha1:6d253d78dae3642fc225dbea6970edde5b54a927"
         }
       ],
       "configurations" : [
@@ -992,11 +992,11 @@
     {
       "org" : "org.tpolecat",
       "name" : "natchez-core_2.12",
-      "version" : "0.3.1",
+      "version" : "0.3.5",
       "artifacts" : [
         {
           "name" : "natchez-core_2.12.jar",
-          "hash" : "sha1:c5d6619236b2382a6e0289aeae9742e863b7084b"
+          "hash" : "sha1:fbb1e4d392e3b0e0bb255cf79e94286f062943ce"
         }
       ],
       "configurations" : [
@@ -1008,11 +1008,11 @@
     {
       "org" : "org.typelevel",
       "name" : "case-insensitive_2.12",
-      "version" : "1.3.0",
+      "version" : "1.4.0",
       "artifacts" : [
         {
           "name" : "case-insensitive_2.12.jar",
-          "hash" : "sha1:194997ae8ccab715c93ff657fc2fe35b272ec709"
+          "hash" : "sha1:cf318fd2cf687883ec48a6c76f497cf3871750a7"
         }
       ],
       "configurations" : [
@@ -1024,11 +1024,11 @@
     {
       "org" : "org.typelevel",
       "name" : "cats-core_2.12",
-      "version" : "2.9.0",
+      "version" : "2.10.0",
       "artifacts" : [
         {
           "name" : "cats-core_2.12.jar",
-          "hash" : "sha1:844f21541d1809008586fbc1172dc02c96476639"
+          "hash" : "sha1:100bc0d103c5bd9ddcd4e2b5c24e88483e2a77d5"
         }
       ],
       "configurations" : [
@@ -1158,11 +1158,11 @@
     {
       "org" : "org.typelevel",
       "name" : "cats-kernel_2.12",
-      "version" : "2.9.0",
+      "version" : "2.10.0",
       "artifacts" : [
         {
           "name" : "cats-kernel_2.12.jar",
-          "hash" : "sha1:9974ee89be2d39074a756a3ff3b94eb32b5fbaaf"
+          "hash" : "sha1:94b372f873e763186c3cccc9e76492553d01350e"
         }
       ],
       "configurations" : [

diff --git a/build.scala-2.13.sbt.lock b/build.scala-2.13.sbt.lock
@@ -14,11 +14,11 @@
     {
       "org" : "co.fs2",
       "name" : "fs2-core_2.13",
-      "version" : "3.6.1",
+      "version" : "3.10.2",
       "artifacts" : [
         {
           "name" : "fs2-core_2.13.jar",
-          "hash" : "sha1:507ac3d526d841c5857c394a841c54a92ca497fc"
+          "hash" : "sha1:ee6589d3ee01c487af8a9d60cd35274b7010ae95"
         }
       ],
       "configurations" : [
@@ -30,11 +30,11 @@
     {
       "org" : "co.fs2",
       "name" : "fs2-io_2.13",
-      "version" : "3.6.1",
+      "version" : "3.10.2",
       "artifacts" : [
         {
           "name" : "fs2-io_2.13.jar",
-          "hash" : "sha1:4eebbfcb60cd66782d3ed07280f8ad7d014cd20b"
+          "hash" : "sha1:e1c3ac4217d017f26efb0cf2af104d62208090c9"
         }
       ],
       "configurations" : [
@@ -62,11 +62,11 @@
     {
       "org" : "com.comcast",
       "name" : "ip4s-core_2.13",
-      "version" : "3.2.0",
+      "version" : "3.5.0",
       "artifacts" : [
         {
           "name" : "ip4s-core_2.13.jar",
-          "hash" : "sha1:c3b87f772bd3ad888b3fe0f531ec08c3678bb475"
+          "hash" : "sha1:a35384c0eea504e57656f0a859487624e1ff8c63"
         }
       ],
       "configurations" : [
@@ -260,11 +260,11 @@
     {
       "org" : "commons-io",
       "name" : "commons-io",
-      "version" : "2.15.0",
+      "version" : "2.16.1",
       "artifacts" : [
         {
           "name" : "commons-io.jar",
-          "hash" : "sha1:5c3c2db10f6f797430a7f9c696b4d1273768c924"
+          "hash" : "sha1:377d592e740dc77124e0901291dbfaa6810a200e"
         }
       ],
       "configurations" : [
@@ -680,11 +680,11 @@
     {
       "org" : "org.scala-lang.modules",
       "name" : "scala-collection-compat_2.13",
-      "version" : "2.9.0",
+      "version" : "2.11.0",
       "artifacts" : [
         {
           "name" : "scala-collection-compat_2.13.jar",
-          "hash" : "sha1:e84549f3c5af4f93dedc3c7088ecaeb4207d4d59"
+          "hash" : "sha1:a1d1a4591c59ac01f041762692d81879accd849b"
         }
       ],
       "configurations" : [
@@ -962,11 +962,11 @@
     {
       "org" : "org.scodec",
       "name" : "scodec-bits_2.13",
-      "version" : "1.1.35",
+      "version" : "1.1.38",
       "artifacts" : [
         {
           "name" : "scodec-bits_2.13.jar",
-          "hash" : "sha1:d94da766a969d49d5a655299cc638c8701ce35d5"
+          "hash" : "sha1:48b7983881f1f16a73cc85e863fc9e5401fed90d"
         }
       ],
       "configurations" : [
@@ -992,11 +992,11 @@
     {
       "org" : "org.tpolecat",
       "name" : "natchez-core_2.13",
-      "version" : "0.3.1",
+      "version" : "0.3.5",
       "artifacts" : [
         {
           "name" : "natchez-core_2.13.jar",
-          "hash" : "sha1:82c1f25d6d4d27982766bf7c5d1638ef590c5cc8"
+          "hash" : "sha1:c8616b07885b6b574a3d241f81f3e524ebcc536c"
         }
       ],
       "configurations" : [
@@ -1008,11 +1008,11 @@
     {
       "org" : "org.typelevel",
       "name" : "case-insensitive_2.13",
-      "version" : "1.3.0",
+      "version" : "1.4.0",
       "artifacts" : [
         {
           "name" : "case-insensitive_2.13.jar",
-          "hash" : "sha1:7e1cf6149b17fb4abe94e60974dfa641068adbb9"
+          "hash" : "sha1:d6974ef3ebe84385592e0e7ee3ebd4dcad9ab667"
         }
       ],
       "configurations" : [
@@ -1024,11 +1024,11 @@
     {
       "org" : "org.typelevel",
       "name" : "cats-core_2.13",
-      "version" : "2.9.0",
+      "version" : "2.10.0",
       "artifacts" : [
         {
           "name" : "cats-core_2.13.jar",
-          "hash" : "sha1:e829364b8a5cf0d79c9ea0827dc082a49d01bc3d"
+          "hash" : "sha1:f333233487bff425196019aed0443acdfbc80dae"
         }
       ],
       "configurations" : [
@@ -1158,11 +1158,11 @@
     {
       "org" : "org.typelevel",
       "name" : "cats-kernel_2.13",
-      "version" : "2.9.0",
+      "version" : "2.10.0",
       "artifacts" : [
         {
           "name" : "cats-kernel_2.13.jar",
-          "hash" : "sha1:60d9c13a233d7dbff25cc1f07e4fa29c00bbd333"
+          "hash" : "sha1:6e9fbc99fa5a88a00ac55afc2540247f7f4ce04d"
         }
       ],
       "configurations" : [