From 237f341d6ff1b31cef63c35c1cbe308fc13d1af8 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Fri, 9 May 2025 16:48:39 +0900
Subject: [PATCH] add `using` if explicitly providing arguments to methods
 defined with implicit

---
 .../scala/sbt/internal/util/appmacro/ContextUtil.scala |  2 +-
 .../scala/sbt/librarymanagement/ResolverExtra.scala    | 10 ++++++----
 .../scala/sbt/librarymanagement/ResolverTest.scala     |  2 +-
 .../main/scala/lmcoursier/internal/ResolutionRun.scala |  2 +-
 .../ivy/formats/UpdateOptionsFormat.scala              |  4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
index 4bcd3e0a4..752f8071b 100644
--- a/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
+++ b/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
@@ -91,7 +91,7 @@ trait ContextUtil[C <: Quotes & scala.Singleton](val valStart: Int):
         getAnnotation(tree) match
           case Some(annot) =>
             annot.asExprOf[cacheLevel] match
-              case '{ cacheLevel(include = Array.empty[CacheLevelTag]($_)) } => Nil
+              case '{ cacheLevel(include = Array.empty[CacheLevelTag](using $_)) } => Nil
               case '{ cacheLevel(include = Array[CacheLevelTag]($include*)) } =>
                 include.value.get.toList
               case _ => sys.error(Printer.TreeStructure.show(annot) + " does not match")
diff --git a/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
index a8a6101a2..6b5d3fa2d 100644
--- a/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
+++ b/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
@@ -149,13 +149,15 @@ private[librarymanagement] abstract class ResolverFunctions {
     MavenRepository("typesafe-" + status, TypesafeRepositoryRoot + "/" + status)
   def typesafeIvyRepo(status: String) =
     url("typesafe-ivy-" + status, new URI(TypesafeRepositoryRoot + "/ivy-" + status + "/").toURL)(
-      ivyStylePatterns
+      using ivyStylePatterns
     )
   def sbtIvyRepo(status: String) =
-    url(s"sbt-ivy-$status", new URI(s"$SbtRepositoryRoot/ivy-$status/").toURL)(ivyStylePatterns)
+    url(s"sbt-ivy-$status", new URI(s"$SbtRepositoryRoot/ivy-$status/").toURL)(using
+      ivyStylePatterns
+    )
   def sbtPluginRepo(status: String) =
     url("sbt-plugin-" + status, new URI(SbtRepositoryRoot + "/sbt-plugin-" + status + "/").toURL)(
-      ivyStylePatterns
+      using ivyStylePatterns
     )
   @deprecated(
     """Use sonatypeOssRepos instead e.g. `resolvers ++= Resolver.sonatypeOssRepos("snapshots")`""",
@@ -177,7 +179,7 @@ private[librarymanagement] abstract class ResolverFunctions {
   def bintrayRepo(owner: String, repo: String) =
     MavenRepository(s"bintray-$owner-$repo", s"https://dl.bintray.com/$owner/$repo/")
   def bintrayIvyRepo(owner: String, repo: String) =
-    url(s"bintray-$owner-$repo", new URI(s"https://dl.bintray.com/$owner/$repo/").toURL)(
+    url(s"bintray-$owner-$repo", new URI(s"https://dl.bintray.com/$owner/$repo/").toURL)(using
       Resolver.ivyStylePatterns
     )
   def jcenterRepo = JCenterRepository
diff --git a/lm-core/src/test/scala/sbt/librarymanagement/ResolverTest.scala b/lm-core/src/test/scala/sbt/librarymanagement/ResolverTest.scala
index 400162766..a29646c96 100644
--- a/lm-core/src/test/scala/sbt/librarymanagement/ResolverTest.scala
+++ b/lm-core/src/test/scala/sbt/librarymanagement/ResolverTest.scala
@@ -10,7 +10,7 @@ object ResolverTest extends UnitSpec {
     val pats = Vector("[orgPath]")
     val patsExpected = Vector("http://foo.com/test/[orgPath]")
     val patterns = Resolver
-      .url("test", new URI("http://foo.com/test").toURL)(
+      .url("test", new URI("http://foo.com/test").toURL)(using
         Patterns(
           pats,
           pats,
diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionRun.scala b/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionRun.scala
index 8cd85fab5..28967745a 100644
--- a/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionRun.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionRun.scala
@@ -163,7 +163,7 @@ object ResolutionRun {
               Task.point(Right(value))
           }
 
-      retry(0, period).unsafeRun()(resolveTask.cache.ec)
+      retry(0, period).unsafeRun()(using resolveTask.cache.ec)
     }
 
     finalResult match {
diff --git a/lm-ivy/src/main/scala/sbt/librarymanagement/ivy/formats/UpdateOptionsFormat.scala b/lm-ivy/src/main/scala/sbt/librarymanagement/ivy/formats/UpdateOptionsFormat.scala
index 31e97f8d9..c8086c3c5 100644
--- a/lm-ivy/src/main/scala/sbt/librarymanagement/ivy/formats/UpdateOptionsFormat.scala
+++ b/lm-ivy/src/main/scala/sbt/librarymanagement/ivy/formats/UpdateOptionsFormat.scala
@@ -26,9 +26,9 @@ trait UpdateOptionsFormat {
       import sjsonnew.support.scalajson.unsafe.*
       val moduleIdFormat: JsonFormat[ModuleID] = implicitly[JsonFormat[ModuleID]]
       def write(key: ModuleID): String =
-        CompactPrinter(Converter.toJsonUnsafe(key)(moduleIdFormat))
+        CompactPrinter(Converter.toJsonUnsafe(key)(using moduleIdFormat))
       def read(key: String): ModuleID =
-        Converter.fromJsonUnsafe[ModuleID](Parser.parseUnsafe(key))(moduleIdFormat)
+        Converter.fromJsonUnsafe[ModuleID](Parser.parseUnsafe(key))(using moduleIdFormat)
     }
   }