Rework profile activation

- don't activate profiles activated by default if some user activated profiles are provided, and
- accept OS / JDK conditions in activation
This commit is contained in:
Alexandre Archambault
2016-11-07 12:27:53 +01:00
parent 7de95c927d
commit bf097fa018
12 changed files with 567 additions and 54 deletions
@@ -285,7 +285,9 @@ class Helper(
dependencies.toSet,
forceVersions = forceVersions,
filter = Some(dep => keepOptional || !dep.optional),
profileActivation = Some(core.Resolution.userProfileActivation(userEnabledProfiles))
userActivations =
if (userEnabledProfiles.isEmpty) None
else Some(userEnabledProfiles.iterator.map(_ -> true).toMap)
)
val loggerFallbackMode =