Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sbt 0.13] Fix logging + clean concurrency issue #3834

Merged
merged 3 commits into from
Jan 3, 2018

Conversation

dwijnand
Copy link
Member

@dwijnand dwijnand commented Dec 21, 2017

This is a backport request via the Lightbend subscription.

Backport of #3093

Fixes #3811

cleanFiles is now a task that lists exactly what will be deleted recursively.

Cherry-picked 7acb876
@dwijnand dwijnand added this to the 0.13.17 milestone Dec 21, 2017
@@ -107,8 +107,8 @@ object Keys {
val classDirectory = SettingKey[File]("class-directory", "Directory for compiled classes and copied resources.", AMinusSetting)
@deprecated("Use the cacheDirectory provided by streams.", "0.13.0")
val cacheDirectory = SettingKey[File]("cache-directory", "Directory used for caching task data.", BMinusSetting)
val cleanFiles = SettingKey[Seq[File]]("clean-files", "The files to recursively delete during a clean.", BSetting)
val cleanKeepFiles = SettingKey[Seq[File]]("clean-keep-files", "Files to keep during a clean.", CSetting)
val cleanFiles = TaskKey[Seq[File]]("clean-files", "The files to recursively delete during a clean.", BSetting)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bincompat?
I think we need to introduce a new key.

@dwijnand dwijnand requested a review from eed3si9n January 2, 2018 10:25
@eed3si9n eed3si9n merged commit 160875e into sbt:0.13 Jan 3, 2018
@dwijnand dwijnand deleted the exclusive-cleaning branch January 3, 2018 08:21
@@ -108,7 +108,8 @@ object Keys {
@deprecated("Use the cacheDirectory provided by streams.", "0.13.0")
val cacheDirectory = SettingKey[File]("cache-directory", "Directory used for caching task data.", BMinusSetting)
val cleanFiles = SettingKey[Seq[File]]("clean-files", "The files to recursively delete during a clean.", BSetting)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be deprecated? The Scala build customized this setting but since upgrading to 0.13.17 it seems to be ignored and clean doesn't clean our custom target directories of build/quick/classes/<subproject>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The setting is no longer used.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants