diff --git a/build.sbt b/build.sbt index 1a7ee90c4..4df7c4d06 100644 --- a/build.sbt +++ b/build.sbt @@ -184,7 +184,6 @@ lazy val sbtRoot: Project = (project in file(".")) (allProjects diff Seq( actionsProj, mainSettingsProj, - zincLmIntegrationProj, scriptedSbtReduxProj, scriptedSbtOldProj, scriptedPluginProj, diff --git a/zinc-lm-integration/src/main/scala/sbt/internal/inc/IfMissing.scala b/zinc-lm-integration/src/main/scala/sbt/internal/inc/IfMissing.scala index 91aeb583c..ab5462655 100644 --- a/zinc-lm-integration/src/main/scala/sbt/internal/inc/IfMissing.scala +++ b/zinc-lm-integration/src/main/scala/sbt/internal/inc/IfMissing.scala @@ -12,7 +12,7 @@ sealed trait IfMissing object IfMissing { def fail: IfMissing = Fail - /** f is expected to call ZincComponentManager.define. */ + /** f is expected to call ZincComponentManager.define. */ def define(useSecondaryCache: Boolean, f: => Unit): IfMissing = new Define(useSecondaryCache, f) object Fail extends IfMissing final class Define(val useSecondaryCache: Boolean, define: => Unit) extends IfMissing { diff --git a/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentManager.scala b/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentManager.scala index db5525a1a..e9df5f319 100644 --- a/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentManager.scala +++ b/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentManager.scala @@ -66,12 +66,14 @@ class ZincComponentManager( lockLocalCache(getOrElse(fromSecondary)) } - /** Get the file for component 'id', - * throwing an exception if no files or multiple files exist for the component. */ + /** + * Get the file for component 'id', + * throwing an exception if no files or multiple files exist for the component. + */ def file(id: String)(ifMissing: IfMissing): File = { files(id)(ifMissing).toList match { case x :: Nil => x - case xs => invalid(s"Expected single file for component '$id', found: ${xs.mkString(", ")}") + case xs => invalid(s"Expected single file for component '$id', found: ${xs.mkString(", ")}") } } @@ -79,8 +81,10 @@ class ZincComponentManager( def define(id: String, files: Iterable[File]): Unit = lockLocalCache(provider.defineComponent(id, files.toSeq.toArray)) - /** This is used to lock the local cache in project/boot/. - * By checking the local cache first, we can avoid grabbing a global lock. */ + /** + * This is used to lock the local cache in project/boot/. + * By checking the local cache first, we can avoid grabbing a global lock. + */ private def lockLocalCache[T](action: => T): T = lock(provider.lockFile)(action) /** This is used to ensure atomic access to components in the global Ivy cache. */