luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preserve cleanFiles' type for bincompat

This commit is contained in:
Dale Wijnand 2018-01-02 10:25:18 +00:00
parent 377ff91484
commit 9bf3b0a556
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/scala/sbt/Defaults.scala
View File

@ -342,9 +342,10 @@ object Defaults extends BuildCommon {
)) ))
lazy val projectTasks: Seq[Setting[_]] = Seq( lazy val projectTasks: Seq[Setting[_]] = Seq(
cleanFiles := cleanFilesTask.value, cleanFiles := Seq(managedDirectory.value, target.value),
cleanFilesTask := cleanFilesImpl.value,
cleanKeepFiles := historyPath.value.toVector, cleanKeepFiles := historyPath.value.toVector,
clean := (Def.task { IO.delete(cleanFiles.value) } tag (Tags.Clean)).value, clean := (Def.task { IO.delete(cleanFilesTask.value) } tag (Tags.Clean)).value,
consoleProject := consoleProjectTask.value, consoleProject := consoleProjectTask.value,
watchTransitiveSources := watchTransitiveSourcesTask.value, watchTransitiveSources := watchTransitiveSourcesTask.value,
watch := watchSetting.value watch := watchSetting.value
@ -780,8 +781,8 @@ object Defaults extends BuildCommon {
pickMainClass(classes) pickMainClass(classes)
} }
/** Implements `cleanFiles` task. */ /** Implements `cleanFilesTask` */
def cleanFilesTask: Initialize[Task[Vector[File]]] = def cleanFilesImpl: Initialize[Task[Vector[File]]] =
Def.task { Def.task {
val filesAndDirs = Vector(managedDirectory.value, target.value) val filesAndDirs = Vector(managedDirectory.value, target.value)
val preserve = cleanKeepFiles.value val preserve = cleanKeepFiles.value

3
main/src/main/scala/sbt/Keys.scala
View File

@ -107,7 +107,8 @@ object Keys {
val classDirectory = SettingKey[File]("class-directory", "Directory for compiled classes and copied resources.", AMinusSetting) val classDirectory = SettingKey[File]("class-directory", "Directory for compiled classes and copied resources.", AMinusSetting)
@deprecated("Use the cacheDirectory provided by streams.", "0.13.0") @deprecated("Use the cacheDirectory provided by streams.", "0.13.0")
val cacheDirectory = SettingKey[File]("cache-directory", "Directory used for caching task data.", BMinusSetting) val cacheDirectory = SettingKey[File]("cache-directory", "Directory used for caching task data.", BMinusSetting)
val cleanFiles = TaskKey[Seq[File]]("clean-files", "The files to recursively delete during a clean.", BSetting) val cleanFiles = SettingKey[Seq[File]]("clean-files", "The files to recursively delete during a clean.", BSetting)
val cleanFilesTask = TaskKey[Seq[File]]("clean-files-task", "The files to recursively delete during a clean.", BSetting)
val cleanKeepFiles = SettingKey[Seq[File]]("clean-keep-files", "Files or directories to keep during a clean. Must be direct children of target.", CSetting) val cleanKeepFiles = SettingKey[Seq[File]]("clean-keep-files", "Files or directories to keep during a clean. Must be direct children of target.", CSetting)
val crossPaths = SettingKey[Boolean]("cross-paths", "If true, enables cross paths, which distinguish input and output directories for cross-building.", ASetting) val crossPaths = SettingKey[Boolean]("cross-paths", "If true, enables cross paths, which distinguish input and output directories for cross-building.", ASetting)
val taskTemporaryDirectory = SettingKey[File]("task-temporary-directory", "Directory used for temporary files for tasks that is deleted after each task execution.", DSetting) val taskTemporaryDirectory = SettingKey[File]("task-temporary-directory", "Directory used for temporary files for tasks that is deleted after each task execution.", DSetting)