diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 3782bd24b..06cbd84cb 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2902,6 +2902,9 @@ object Classpaths { import Defaults._ import Keys._ + def analyzed[A](data: A, analysisFile: VirtualFile): Attributed[A] = + Attributed.blank(data).put(Keys.analysis, analysisFile.id) + def concatDistinct[A]( a: Taskable[Seq[A]], b: Taskable[Seq[A]] diff --git a/main/src/main/scala/sbt/internal/ClasspathImpl.scala b/main/src/main/scala/sbt/internal/ClasspathImpl.scala index 5fbd145e9..74b5f066d 100644 --- a/main/src/main/scala/sbt/internal/ClasspathImpl.scala +++ b/main/src/main/scala/sbt/internal/ClasspathImpl.scala @@ -43,7 +43,7 @@ private[sbt] object ClasspathImpl { val xs = products.map(_ -> analysis) for (f, analysis) <- xs yield APIMappings - .store(analyzed(f, analysisFile), apiURL.value) + .store(Classpaths.analyzed(f, analysisFile), apiURL.value) .put(Keys.moduleIDStr, Classpaths.moduleIdJsonKeyFormat.write(module)) .put(Keys.configurationStr, config.name) else exportedProducts.value @@ -57,7 +57,7 @@ private[sbt] object ClasspathImpl { val config = configuration.value for (f, analysis) <- trackedExportedProductsImplTask(track).value yield APIMappings - .store(analyzed(f, analysis), apiURL.value) + .store(Classpaths.analyzed(f, analysis), apiURL.value) .put(Keys.artifactStr, RemoteCache.artifactToStr(art)) .put(Keys.moduleIDStr, Classpaths.moduleIdJsonKeyFormat.write(module)) .put(Keys.configurationStr, config.name) @@ -71,7 +71,7 @@ private[sbt] object ClasspathImpl { val config = configuration.value for (f, analysis) <- trackedJarProductsImplTask(track).value yield APIMappings - .store(analyzed(f, analysis), apiURL.value) + .store(Classpaths.analyzed(f, analysis), apiURL.value) .put(Keys.artifactStr, RemoteCache.artifactToStr(art)) .put(Keys.moduleIDStr, Classpaths.moduleIdJsonKeyFormat.write(module)) .put(Keys.configurationStr, config.name) @@ -344,9 +344,6 @@ private[sbt] object ClasspathImpl { (tasks.toSeq.join).map(_.flatten.distinct) } - def analyzed[A](data: A, analysisFile: VirtualFile): Attributed[A] = - Attributed.blank(data).put(Keys.analysis, analysisFile.id) - def interSort( projectRef: ProjectRef, conf: Configuration,