diff --git a/build.sbt b/build.sbt index b5b8e79f1..ba2f56383 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ 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 fs2Version = "3.10.2" val natchezVersion = "0.3.1" lazy val gpgPass = Option(System.getenv("GPG_KEY_PASSWORD")) diff --git a/build.scala-2.12.sbt.lock b/build.scala-2.12.sbt.lock index 8cd7dc84c..d9b157b3b 100644 --- a/build.scala-2.12.sbt.lock +++ b/build.scala-2.12.sbt.lock @@ -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" : [ @@ -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" : [ @@ -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 index b08b49f98..97ba7a20d 100644 --- 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" : [ @@ -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" : [ @@ -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" : [ diff --git a/build.scala-3.sbt.lock b/build.scala-3.sbt.lock index a41ff2f54..8ebfc5fa7 100644 --- a/build.scala-3.sbt.lock +++ b/build.scala-3.sbt.lock @@ -1,6 +1,6 @@ { "lockVersion" : 1, - "timestamp" : "2024-07-06T18:08:43.479312Z", + "timestamp" : "2024-07-07T06:52:08.985657Z", "configurations" : [ "compile", "optional", @@ -14,11 +14,11 @@ { "org" : "co.fs2", "name" : "fs2-core_3", - "version" : "3.6.1", + "version" : "3.10.2", "artifacts" : [ { "name" : "fs2-core_3.jar", - "hash" : "sha1:adb973197a3ad0914442ee59f0c308d930370d4c" + "hash" : "sha1:d0993296535929e1190036ca5e5f750c285460cb" } ], "configurations" : [ @@ -30,11 +30,11 @@ { "org" : "co.fs2", "name" : "fs2-io_3", - "version" : "3.6.1", + "version" : "3.10.2", "artifacts" : [ { "name" : "fs2-io_3.jar", - "hash" : "sha1:2215ce3c20301ebea09fc47fe18cf83e54185418" + "hash" : "sha1:b86de0250e1ad9e4c1dc9972469a76b632325703" } ], "configurations" : [ @@ -46,11 +46,11 @@ { "org" : "com.comcast", "name" : "ip4s-core_3", - "version" : "3.2.0", + "version" : "3.5.0", "artifacts" : [ { "name" : "ip4s-core_3.jar", - "hash" : "sha1:a91cf664c1f3cd923122dae1641df63ab79054e3" + "hash" : "sha1:7ed193dc579a8def12110bc6cb90e95a215a2091" } ], "configurations" : [ @@ -948,11 +948,11 @@ { "org" : "org.scodec", "name" : "scodec-bits_3", - "version" : "1.1.35", + "version" : "1.1.38", "artifacts" : [ { "name" : "scodec-bits_3.jar", - "hash" : "sha1:3d3142b28a4008d1bbc8f07c5e1522532c0271f4" + "hash" : "sha1:3b2b8b0e757ee6fa6ec2cadc5e0e4c5b55bdc798" } ], "configurations" : [ diff --git a/src/main/scala/com/cognite/sdk/scala/common/OAuth2.scala b/src/main/scala/com/cognite/sdk/scala/common/OAuth2.scala index e3867fcba..91eb01d13 100644 --- a/src/main/scala/com/cognite/sdk/scala/common/OAuth2.scala +++ b/src/main/scala/com/cognite/sdk/scala/common/OAuth2.scala @@ -86,7 +86,8 @@ object OAuth2 { /** Only use for SessionProvider to interact with Cognite internal SessionAPI */ private def getKubernetesJwt[F[_]](implicit F: Async[F]): F[String] = { val serviceAccountTokenPath = Path("/var/run/secrets/tokens/cdf_token") - Files[F] + Files + .forAsync[F] .readAll(serviceAccountTokenPath) .through(fs2.text.utf8.decode) .compile diff --git a/src/main/scala/com/cognite/sdk/scala/common/ReadableResource.scala b/src/main/scala/com/cognite/sdk/scala/common/ReadableResource.scala index 68c501b50..3cc036716 100644 --- a/src/main/scala/com/cognite/sdk/scala/common/ReadableResource.scala +++ b/src/main/scala/com/cognite/sdk/scala/common/ReadableResource.scala @@ -69,7 +69,7 @@ object Readable { Pull .eval(get(cursor, remaining, partition)) .flatMap(res => - Pull.output(Chunk.seq(res.items)) >> Pull.pure( + Pull.output(Chunk.from(res.items)) >> Pull.pure( res.nextCursor.map(nc => (Some(nc), remaining.map(_ - res.items.size))) ) )