diff --git a/main/Defaults.scala b/main/Defaults.scala index 1a109f581..227a354c0 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -991,7 +991,6 @@ trait BuildExtra extends BuildCommon } def seq(settings: Setting[_]*): SettingsDefinition = new Project.SettingList(settings) - implicit def settingsDefinitionToSeq(sd: SettingsDefinition): Seq[Setting[_]] = sd.settings def externalIvySettings(file: Initialize[File] = baseDirectory / "ivysettings.xml"): Setting[Task[IvyConfiguration]] = { diff --git a/util/collection/Settings.scala b/util/collection/Settings.scala index 6135173fa..418b5b737 100644 --- a/util/collection/Settings.scala +++ b/util/collection/Settings.scala @@ -216,6 +216,10 @@ trait Init[Scope] case Seq(x, xs @ _*) => (join(xs) zipWith x)( (t,h) => h +: t) } } + object SettingsDefinition { + implicit def unwrapSettingsDefinition(d: SettingsDefinition): Seq[Setting[_]] = d.settings + implicit def wrapSettingsDefinition(ss: Seq[Setting[_]]): SettingsDefinition = new SettingList(ss) + } sealed trait SettingsDefinition { def settings: Seq[Setting[_]] }