From 5438781142b0fd26c371ebce6ff0edb71c835864 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Wed, 1 Jan 2025 16:06:34 +0900
Subject: [PATCH] use collectFirst instead of collect and headOption

---
 main-actions/src/main/scala/sbt/Pkg.scala                     | 2 +-
 .../src/main/scala/sbt/plugins/RemoteCachePlugin.scala        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/main-actions/src/main/scala/sbt/Pkg.scala b/main-actions/src/main/scala/sbt/Pkg.scala
index d0d969dcb..2545678ec 100644
--- a/main-actions/src/main/scala/sbt/Pkg.scala
+++ b/main-actions/src/main/scala/sbt/Pkg.scala
@@ -76,7 +76,7 @@ object Pkg:
       .orElse(Some(default2010Timestamp))
 
   def timeFromConfiguration(config: Configuration): Option[Long] =
-    (config.options.collect { case t: PackageOption.FixedTimestamp => t }).headOption match
+    config.options.collectFirst { case t: PackageOption.FixedTimestamp => t } match
       case Some(PackageOption.FixedTimestamp(value)) => value
       case _                                         => defaultTimestamp
 
diff --git a/sbt-remote-cache/src/main/scala/sbt/plugins/RemoteCachePlugin.scala b/sbt-remote-cache/src/main/scala/sbt/plugins/RemoteCachePlugin.scala
index a6466f7be..d502d860d 100644
--- a/sbt-remote-cache/src/main/scala/sbt/plugins/RemoteCachePlugin.scala
+++ b/sbt-remote-cache/src/main/scala/sbt/plugins/RemoteCachePlugin.scala
@@ -14,9 +14,9 @@ object RemoteCachePlugin extends AutoPlugin:
       val remoteOpt = remoteCache.value
       remoteOpt match
         case Some(remote) =>
-          val disk = orig.collect { case r: DiskActionCacheStore =>
+          val disk = orig.collectFirst { case r: DiskActionCacheStore =>
             r
-          }.headOption match
+          } match
             case Some(x) => x
             case None    => sys.error("disk store not found")
           val r = GrpcActionCacheStore(