Alias withLatestSnapshots to withCachedSnapshots

sbt · Sep 10, 2023 · 1162c57 · 1162c57
1 parent 689f347
commit 1162c57
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
@@ -541,7 +541,7 @@ private[sbt] object IvySbt {
       val delegate = ivyint.SbtChainResolver(delegatedName, rest, settings, updateOptions, log)
       val initialResolvers = projectResolvers :+ delegate
       val freshOptions = UpdateOptions()
-        .withLatestSnapshots(false)
+        .withCachedSnapshots(true)
         .withModuleResolvers(updateOptions.moduleResolvers)
       ivyint.SbtChainResolver(name, initialResolvers, settings, freshOptions, log)
     }

diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala
@@ -227,7 +227,7 @@ private[sbt] case class SbtChainResolver(
         if (resolvedModule.getId.getRevision.contains("SNAPSHOT")) {
 
           Message.warn(
-            "Resolving a snapshot version. It's going to be slow unless you use `updateOptions := updateOptions.value.withLatestSnapshots(false)` options."
+            "Resolving a snapshot version. It's going to be slow unless you use `updateOptions := updateOptions.value.withCachedSnapshots(true)` options."
           )
           val resolvers = sortedRevisions.map(_._2.getName)
           sortedRevisions.foreach(h => {

diff --git a/ivy/src/main/scala/sbt/librarymanagement/ivy/UpdateOptions.scala b/ivy/src/main/scala/sbt/librarymanagement/ivy/UpdateOptions.scala
@@ -19,7 +19,10 @@ final class UpdateOptions private[sbt] (
     // If set to true, prioritize inter-project resolver
     val interProjectFirst: Boolean,
     // If set to true, check all resolvers for snapshots.
+    @deprecated("Use withCachedSnapshots instead with opposite boolean values", "1.9.2")
     val latestSnapshots: Boolean,
+    // If set to true, cache snapshots
+    val cachedSnapshots: Boolean,
     // If set to true, use cached resolution.
     val cachedResolution: Boolean,
     // If set to true, use Gigahorse
@@ -35,8 +38,11 @@ final class UpdateOptions private[sbt] (
     copy(circularDependencyLevel = circularDependencyLevel)
   def withInterProjectFirst(interProjectFirst: Boolean): UpdateOptions =
     copy(interProjectFirst = interProjectFirst)
+  @deprecated("Use withCachedSnapshots instead with opposite boolean values", "1.9.2")
   def withLatestSnapshots(latestSnapshots: Boolean): UpdateOptions =
-    copy(latestSnapshots = latestSnapshots)
+    withCachedSnapshots(!latestSnapshots)
+  def withCachedSnapshots(cachedSnapshots: Boolean): UpdateOptions
+  copy(latestSnapshots = !cachedResolution)
   def withCachedResolution(cachedResolution: Boolean): UpdateOptions =
     copy(cachedResolution = cachedResolution)
 
@@ -54,6 +60,7 @@ final class UpdateOptions private[sbt] (
       circularDependencyLevel: CircularDependencyLevel = this.circularDependencyLevel,
       interProjectFirst: Boolean = this.interProjectFirst,
       latestSnapshots: Boolean = this.latestSnapshots,
+      cachedSnasphots: Boolean = !this.latestSnapshots,
       cachedResolution: Boolean = this.cachedResolution,
       gigahorse: Boolean = this.gigahorse,
       resolverConverter: UpdateOptions.ResolverConverter = this.resolverConverter,
@@ -63,6 +70,7 @@ final class UpdateOptions private[sbt] (
       circularDependencyLevel,
       interProjectFirst,
       latestSnapshots,
+      cachedSnasphots,
       cachedResolution,
       gigahorse,
       resolverConverter,
@@ -109,6 +117,7 @@ object UpdateOptions {
       circularDependencyLevel = CircularDependencyLevel.Warn,
       interProjectFirst = true,
       latestSnapshots = true,
+      cachedSnapshots = false,
       cachedResolution = false,
       gigahorse = LMSysProp.useGigahorse,
       resolverConverter = PartialFunction.empty,

diff --git a/ivy/src/test/scala/sbt/internal/librarymanagement/UpdateOptionsSpec.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/UpdateOptionsSpec.scala
@@ -15,10 +15,10 @@ class UpdateOptionsSpec extends BasicTestSuite {
       UpdateOptions()
         .withCircularDependencyLevel(CircularDependencyLevel.Error)
         .withCachedResolution(true)
-        .withLatestSnapshots(false)
+        .withCachedSnapshots(true)
         .toString() == """|UpdateOptions(
         |  circularDependencyLevel = error,
-        |  latestSnapshots = false,
+        |  cachedSnapshots = true,
         |  cachedResolution = true
         |)""".stripMargin
     )