From c34f8d85beb4ed8d4dd008b57462846b26026667 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 27 Nov 2025 00:28:51 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.10.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e4359af..3cc6778 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.10.2 runner.dialect = Scala213 align { preset = more From 1583859e58c0b6f27da02df050b900be13f157f7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 27 Nov 2025 00:28:58 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.10.2 Executed command: scalafmt --non-interactive --- src/main/scala/com/stuart/zcaffeine/ZCaffeine.scala | 6 +++--- src/test/scala/com/stuart/zcaffeine/LoadingCacheSpec.scala | 2 +- .../scala/com/stuart/zcaffeine/RemovalListenerSpec.scala | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/scala/com/stuart/zcaffeine/ZCaffeine.scala b/src/main/scala/com/stuart/zcaffeine/ZCaffeine.scala index 6424775..ff17934 100644 --- a/src/main/scala/com/stuart/zcaffeine/ZCaffeine.scala +++ b/src/main/scala/com/stuart/zcaffeine/ZCaffeine.scala @@ -214,8 +214,8 @@ object ZCaffeine { caffeine: => Caffeine[Key, Value] ): URIO[R, ZCaffeine[R, Unconfigured, Key, Value]] = for { - executor <- ZIO.executor - runtime <- ZIO.runtime[R] + executor <- ZIO.executor + runtime <- ZIO.runtime[R] configured = ZIO.attempt( caffeine .executor(executor.asJava) @@ -278,7 +278,7 @@ class ZCaffeine[R, S <: State, Key, Value] private ( ): CompletableFuture[util.Map[Key, Value]] = zioToCompletableFuture(runtime) { loadAll match { case Some(f) => f(keys.asScala.toSet).map(_.asJava) - case None => + case None => ZIO .foreach(keys.asScala.toSet)(key => loadOne(key).map(key -> _)) .map(_.toMap[Key, Value].asJava) diff --git a/src/test/scala/com/stuart/zcaffeine/LoadingCacheSpec.scala b/src/test/scala/com/stuart/zcaffeine/LoadingCacheSpec.scala index 0137af8..f8266f1 100644 --- a/src/test/scala/com/stuart/zcaffeine/LoadingCacheSpec.scala +++ b/src/test/scala/com/stuart/zcaffeine/LoadingCacheSpec.scala @@ -11,7 +11,7 @@ object LoadingCacheSpec extends ZIOSpecDefault { test("get/getAll/refresh/refreshAll") { for { zcaffeine <- ZCaffeine[TestEnvironment, String, String]() - cache <- zcaffeine.build( + cache <- zcaffeine.build( loadOne = key => ZIO.succeed(s"loadOne: $key"), loadAll = Some(keys => ZIO.succeed(keys.map(key => key -> s"loadAll: $key").toMap)), reloadOne = Some((key, value) => ZIO.succeed(s"""reloadOne: $key (old: "$value")""")) diff --git a/src/test/scala/com/stuart/zcaffeine/RemovalListenerSpec.scala b/src/test/scala/com/stuart/zcaffeine/RemovalListenerSpec.scala index 716a41d..6883fa4 100644 --- a/src/test/scala/com/stuart/zcaffeine/RemovalListenerSpec.scala +++ b/src/test/scala/com/stuart/zcaffeine/RemovalListenerSpec.scala @@ -12,7 +12,7 @@ object RemovalListenerSpec extends ZIOSpecDefault { for { evictedKeys <- Ref.make(List.empty[String]) zcaffeine <- ZCaffeine[TestEnvironment, String, Int]() - cache <- zcaffeine + cache <- zcaffeine .enableScheduling() .removalListener((key, _, _) => evictedKeys.update(key :: _)) .build() From 7f0ddf74689a7469bc5da5e2ddf62e4aa229cd0c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 27 Nov 2025 00:28:58 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.10.2' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d411f19..e15cb82 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ af0d992acdc6d49705be09ede6f08fdf03455c02 # Scala Steward: Reformat with scalafmt 3.6.1 fb151ecf9ca6384e2f67c536f991f2dcdb197b22 + +# Scala Steward: Reformat with scalafmt 3.10.2 +1583859e58c0b6f27da02df050b900be13f157f7