diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala index 61cf796da..25792d684 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala @@ -5,7 +5,20 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait ChainedResolverFormats { self: sbt.librarymanagement.ResolverFormats with sjsonnew.BasicJsonProtocol => +trait ChainedResolverFormats { self: sbt.librarymanagement.ResolverFormats with + sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.MavenRepoFormats with + sbt.librarymanagement.MavenCacheFormats with + sbt.librarymanagement.PatternsFormats with + sbt.librarymanagement.FileConfigurationFormats with + sbt.librarymanagement.FileRepositoryFormats with + sbt.librarymanagement.URLRepositoryFormats with + sbt.librarymanagement.SshConnectionFormats with + sbt.librarymanagement.SshAuthenticationFormats with + sbt.librarymanagement.SshRepositoryFormats with + sbt.librarymanagement.SftpRepositoryFormats with + sbt.librarymanagement.PasswordAuthenticationFormats with + sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val ChainedResolverFormat: JsonFormat[sbt.librarymanagement.ChainedResolver] = new JsonFormat[sbt.librarymanagement.ChainedResolver] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ChainedResolver = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala index c8090c6e1..282877526 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala @@ -5,7 +5,23 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait ConfigurationReportFormats { self: sbt.librarymanagement.ConfigRefFormats with sbt.librarymanagement.ModuleReportFormats with sbt.librarymanagement.ModuleIDFormats with sbt.librarymanagement.ArtifactFormats with sbt.librarymanagement.ChecksumFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.InclExclRuleFormats with sbt.librarymanagement.CrossVersionFormats with sbt.librarymanagement.DisabledFormats with sbt.librarymanagement.BinaryFormats with sbt.librarymanagement.ConstantFormats with sbt.librarymanagement.PatchFormats with sbt.librarymanagement.FullFormats with sbt.librarymanagement.For3Use2_13Formats with sbt.librarymanagement.For2_13Use3Formats with sbt.librarymanagement.CallerFormats with sbt.librarymanagement.OrganizationArtifactReportFormats => +trait ConfigurationReportFormats { self: sbt.librarymanagement.ConfigRefFormats with + sbt.librarymanagement.ModuleReportFormats with + sbt.librarymanagement.ModuleIDFormats with + sbt.librarymanagement.ArtifactFormats with + sbt.librarymanagement.ChecksumFormats with + sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.InclExclRuleFormats with + sbt.librarymanagement.CrossVersionFormats with + sbt.librarymanagement.DisabledFormats with + sbt.librarymanagement.BinaryFormats with + sbt.librarymanagement.ConstantFormats with + sbt.librarymanagement.PatchFormats with + sbt.librarymanagement.FullFormats with + sbt.librarymanagement.For3Use2_13Formats with + sbt.librarymanagement.For2_13Use3Formats with + sbt.librarymanagement.CallerFormats with + sbt.librarymanagement.OrganizationArtifactReportFormats => implicit lazy val ConfigurationReportFormat: JsonFormat[sbt.librarymanagement.ConfigurationReport] = new JsonFormat[sbt.librarymanagement.ConfigurationReport] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ConfigurationReport = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala index 1f34ab28f..f562f1bb4 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala @@ -5,7 +5,21 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait ModuleConfigurationFormats { self: sbt.librarymanagement.ResolverFormats with sjsonnew.BasicJsonProtocol => +trait ModuleConfigurationFormats { self: sbt.librarymanagement.ResolverFormats with + sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.ChainedResolverFormats with + sbt.librarymanagement.MavenRepoFormats with + sbt.librarymanagement.MavenCacheFormats with + sbt.librarymanagement.PatternsFormats with + sbt.librarymanagement.FileConfigurationFormats with + sbt.librarymanagement.FileRepositoryFormats with + sbt.librarymanagement.URLRepositoryFormats with + sbt.librarymanagement.SshConnectionFormats with + sbt.librarymanagement.SshAuthenticationFormats with + sbt.librarymanagement.SshRepositoryFormats with + sbt.librarymanagement.SftpRepositoryFormats with + sbt.librarymanagement.PasswordAuthenticationFormats with + sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val ModuleConfigurationFormat: JsonFormat[sbt.librarymanagement.ModuleConfiguration] = new JsonFormat[sbt.librarymanagement.ModuleConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ModuleConfiguration = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala index 843e70f3d..f49f0f9c6 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala @@ -6,6 +6,16 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat -trait PatternsBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.FileConfigurationFormats with sbt.librarymanagement.FileRepositoryFormats with sbt.librarymanagement.URLRepositoryFormats with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats with sbt.librarymanagement.SshRepositoryFormats with sbt.librarymanagement.SftpRepositoryFormats => +trait PatternsBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with + sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.FileConfigurationFormats with + sbt.librarymanagement.FileRepositoryFormats with + sbt.librarymanagement.URLRepositoryFormats with + sbt.librarymanagement.SshConnectionFormats with + sbt.librarymanagement.SshAuthenticationFormats with + sbt.librarymanagement.SshRepositoryFormats with + sbt.librarymanagement.SftpRepositoryFormats with + sbt.librarymanagement.PasswordAuthenticationFormats with + sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val PatternsBasedRepositoryFormat: JsonFormat[sbt.librarymanagement.PatternsBasedRepository] = flatUnionFormat4[sbt.librarymanagement.PatternsBasedRepository, sbt.librarymanagement.FileRepository, sbt.librarymanagement.URLRepository, sbt.librarymanagement.SshRepository, sbt.librarymanagement.SftpRepository]("type") } diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala index d1fde3d18..8b2842ad8 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala @@ -5,7 +5,13 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait PublishConfigurationFormats { self: sbt.librarymanagement.ConfigRefFormats with sbt.librarymanagement.ArtifactFormats with sbt.librarymanagement.UpdateLoggingFormats with sjsonnew.BasicJsonProtocol => +trait PublishConfigurationFormats { self: sbt.librarymanagement.ConfigRefFormats with + sbt.librarymanagement.ArtifactFormats with + sbt.librarymanagement.UpdateLoggingFormats with + sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.PasswordAuthenticationFormats with + sbt.librarymanagement.KeyFileAuthenticationFormats with + sbt.librarymanagement.ChecksumFormats => implicit lazy val PublishConfigurationFormat: JsonFormat[sbt.librarymanagement.PublishConfiguration] = new JsonFormat[sbt.librarymanagement.PublishConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.PublishConfiguration = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala index 5569ef568..3f0a73150 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala @@ -6,6 +6,19 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat -trait ResolverFormats { self: sjsonnew.BasicJsonProtocol with sbt.librarymanagement.ChainedResolverFormats with sbt.librarymanagement.MavenRepoFormats with sbt.librarymanagement.MavenCacheFormats with sbt.librarymanagement.PatternsFormats with sbt.librarymanagement.FileConfigurationFormats with sbt.librarymanagement.FileRepositoryFormats with sbt.librarymanagement.URLRepositoryFormats with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats with sbt.librarymanagement.SshRepositoryFormats with sbt.librarymanagement.SftpRepositoryFormats => +trait ResolverFormats { self: sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.ChainedResolverFormats with + sbt.librarymanagement.MavenRepoFormats with + sbt.librarymanagement.MavenCacheFormats with + sbt.librarymanagement.PatternsFormats with + sbt.librarymanagement.FileConfigurationFormats with + sbt.librarymanagement.FileRepositoryFormats with + sbt.librarymanagement.URLRepositoryFormats with + sbt.librarymanagement.SshConnectionFormats with + sbt.librarymanagement.SshAuthenticationFormats with + sbt.librarymanagement.SshRepositoryFormats with + sbt.librarymanagement.SftpRepositoryFormats with + sbt.librarymanagement.PasswordAuthenticationFormats with + sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val ResolverFormat: JsonFormat[sbt.librarymanagement.Resolver] = flatUnionFormat7[sbt.librarymanagement.Resolver, sbt.librarymanagement.ChainedResolver, sbt.librarymanagement.MavenRepo, sbt.librarymanagement.MavenCache, sbt.librarymanagement.FileRepository, sbt.librarymanagement.URLRepository, sbt.librarymanagement.SshRepository, sbt.librarymanagement.SftpRepository]("type") } diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala index 9441ada31..2a2f49073 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala @@ -5,7 +5,12 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait SftpRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats => +trait SftpRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with + sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.SshConnectionFormats with + sbt.librarymanagement.SshAuthenticationFormats with + sbt.librarymanagement.PasswordAuthenticationFormats with + sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val SftpRepositoryFormat: JsonFormat[sbt.librarymanagement.SftpRepository] = new JsonFormat[sbt.librarymanagement.SftpRepository] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.SftpRepository = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala index 8143d7239..b16f32821 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala @@ -6,6 +6,13 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat -trait SshBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats with sbt.librarymanagement.SshRepositoryFormats with sbt.librarymanagement.SftpRepositoryFormats => +trait SshBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with + sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.SshConnectionFormats with + sbt.librarymanagement.SshAuthenticationFormats with + sbt.librarymanagement.SshRepositoryFormats with + sbt.librarymanagement.SftpRepositoryFormats with + sbt.librarymanagement.PasswordAuthenticationFormats with + sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val SshBasedRepositoryFormat: JsonFormat[sbt.librarymanagement.SshBasedRepository] = flatUnionFormat2[sbt.librarymanagement.SshBasedRepository, sbt.librarymanagement.SshRepository, sbt.librarymanagement.SftpRepository]("type") } diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala index 9daea2940..db4ea41e5 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala @@ -5,7 +5,10 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait SshConnectionFormats { self: sbt.librarymanagement.SshAuthenticationFormats with sjsonnew.BasicJsonProtocol => +trait SshConnectionFormats { self: sbt.librarymanagement.SshAuthenticationFormats with + sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.PasswordAuthenticationFormats with + sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val SshConnectionFormat: JsonFormat[sbt.librarymanagement.SshConnection] = new JsonFormat[sbt.librarymanagement.SshConnection] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.SshConnection = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala index 861d359b1..2b3c4893b 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala @@ -5,7 +5,12 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait SshRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats => +trait SshRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with + sjsonnew.BasicJsonProtocol with + sbt.librarymanagement.SshConnectionFormats with + sbt.librarymanagement.SshAuthenticationFormats with + sbt.librarymanagement.PasswordAuthenticationFormats with + sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val SshRepositoryFormat: JsonFormat[sbt.librarymanagement.SshRepository] = new JsonFormat[sbt.librarymanagement.SshRepository] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.SshRepository = { __jsOpt match { diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala index e9384ca63..49c66fc7b 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala @@ -5,7 +5,37 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement.ivy import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait ExternalIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat with sbt.internal.librarymanagement.formats.LoggerFormat with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat with sbt.librarymanagement.ResolverFormats with sjsonnew.BasicJsonProtocol => +trait ExternalIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat + with sbt.internal.librarymanagement.formats.LoggerFormat + with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat + with sbt.librarymanagement.ModuleIDFormats + with sbt.librarymanagement.ResolverFormats + with sjsonnew.BasicJsonProtocol + with sbt.librarymanagement.ArtifactFormats + with sbt.librarymanagement.ConfigRefFormats + with sbt.librarymanagement.ChecksumFormats + with sbt.librarymanagement.InclExclRuleFormats + with sbt.librarymanagement.CrossVersionFormats + with sbt.librarymanagement.DisabledFormats + with sbt.librarymanagement.BinaryFormats + with sbt.librarymanagement.ConstantFormats + with sbt.librarymanagement.PatchFormats + with sbt.librarymanagement.FullFormats + with sbt.librarymanagement.For3Use2_13Formats + with sbt.librarymanagement.For2_13Use3Formats + with sbt.librarymanagement.ChainedResolverFormats + with sbt.librarymanagement.MavenRepoFormats + with sbt.librarymanagement.MavenCacheFormats + with sbt.librarymanagement.PatternsFormats + with sbt.librarymanagement.FileConfigurationFormats + with sbt.librarymanagement.FileRepositoryFormats + with sbt.librarymanagement.URLRepositoryFormats + with sbt.librarymanagement.SshConnectionFormats + with sbt.librarymanagement.SshAuthenticationFormats + with sbt.librarymanagement.SshRepositoryFormats + with sbt.librarymanagement.SftpRepositoryFormats + with sbt.librarymanagement.PasswordAuthenticationFormats + with sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val ExternalIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.ExternalIvyConfiguration = { __jsOpt match { diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala index b73006cd3..28fbd616f 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala @@ -5,7 +5,39 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement.ivy import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait InlineIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat with sbt.internal.librarymanagement.formats.LoggerFormat with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat with sbt.librarymanagement.ivy.IvyPathsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.ResolverFormats with sbt.librarymanagement.ModuleConfigurationFormats => +trait InlineIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat + with sbt.internal.librarymanagement.formats.LoggerFormat + with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat + with sbt.librarymanagement.ivy.IvyPathsFormats + with sjsonnew.BasicJsonProtocol + with sbt.librarymanagement.ModuleIDFormats + with sbt.librarymanagement.ResolverFormats + with sbt.librarymanagement.ModuleConfigurationFormats + with sbt.librarymanagement.ArtifactFormats + with sbt.librarymanagement.ConfigRefFormats + with sbt.librarymanagement.ChecksumFormats + with sbt.librarymanagement.InclExclRuleFormats + with sbt.librarymanagement.CrossVersionFormats + with sbt.librarymanagement.DisabledFormats + with sbt.librarymanagement.BinaryFormats + with sbt.librarymanagement.ConstantFormats + with sbt.librarymanagement.PatchFormats + with sbt.librarymanagement.FullFormats + with sbt.librarymanagement.For3Use2_13Formats + with sbt.librarymanagement.For2_13Use3Formats + with sbt.librarymanagement.ChainedResolverFormats + with sbt.librarymanagement.MavenRepoFormats + with sbt.librarymanagement.MavenCacheFormats + with sbt.librarymanagement.PatternsFormats + with sbt.librarymanagement.FileConfigurationFormats + with sbt.librarymanagement.FileRepositoryFormats + with sbt.librarymanagement.URLRepositoryFormats + with sbt.librarymanagement.SshConnectionFormats + with sbt.librarymanagement.SshAuthenticationFormats + with sbt.librarymanagement.SshRepositoryFormats + with sbt.librarymanagement.SftpRepositoryFormats + with sbt.librarymanagement.PasswordAuthenticationFormats + with sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val InlineIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.InlineIvyConfiguration = { __jsOpt match { diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala index c281e7d05..cbab06322 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala @@ -6,6 +6,40 @@ package sbt.librarymanagement.ivy import _root_.sjsonnew.JsonFormat -trait IvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat with sbt.internal.librarymanagement.formats.LoggerFormat with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat with sbt.librarymanagement.ivy.IvyPathsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.ResolverFormats with sbt.librarymanagement.ModuleConfigurationFormats with sbt.librarymanagement.ivy.InlineIvyConfigurationFormats with sbt.librarymanagement.ivy.ExternalIvyConfigurationFormats => +trait IvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat + with sbt.internal.librarymanagement.formats.LoggerFormat + with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat + with sbt.librarymanagement.ivy.IvyPathsFormats + with sbt.librarymanagement.ModuleIDFormats + with sjsonnew.BasicJsonProtocol + with sbt.librarymanagement.ResolverFormats + with sbt.librarymanagement.ModuleConfigurationFormats + with sbt.librarymanagement.ivy.InlineIvyConfigurationFormats + with sbt.librarymanagement.ivy.ExternalIvyConfigurationFormats + with sbt.librarymanagement.ArtifactFormats + with sbt.librarymanagement.ConfigRefFormats + with sbt.librarymanagement.ChecksumFormats + with sbt.librarymanagement.InclExclRuleFormats + with sbt.librarymanagement.CrossVersionFormats + with sbt.librarymanagement.DisabledFormats + with sbt.librarymanagement.BinaryFormats + with sbt.librarymanagement.ConstantFormats + with sbt.librarymanagement.PatchFormats + with sbt.librarymanagement.FullFormats + with sbt.librarymanagement.For3Use2_13Formats + with sbt.librarymanagement.For2_13Use3Formats + with sbt.librarymanagement.ChainedResolverFormats + with sbt.librarymanagement.MavenRepoFormats + with sbt.librarymanagement.MavenCacheFormats + with sbt.librarymanagement.PatternsFormats + with sbt.librarymanagement.FileConfigurationFormats + with sbt.librarymanagement.FileRepositoryFormats + with sbt.librarymanagement.URLRepositoryFormats + with sbt.librarymanagement.SshConnectionFormats + with sbt.librarymanagement.SshAuthenticationFormats + with sbt.librarymanagement.SshRepositoryFormats + with sbt.librarymanagement.SftpRepositoryFormats + with sbt.librarymanagement.PasswordAuthenticationFormats + with sbt.librarymanagement.KeyFileAuthenticationFormats => implicit lazy val IvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.IvyConfiguration] = flatUnionFormat2[sbt.librarymanagement.ivy.IvyConfiguration, sbt.librarymanagement.ivy.InlineIvyConfiguration, sbt.librarymanagement.ivy.ExternalIvyConfiguration]("type") } diff --git a/ivy/src/main/scala/sbt/librarymanagement/ivy/formats/UpdateOptionsFormat.scala b/ivy/src/main/scala/sbt/librarymanagement/ivy/formats/UpdateOptionsFormat.scala index fc71dee26..6929546be 100644 --- a/ivy/src/main/scala/sbt/librarymanagement/ivy/formats/UpdateOptionsFormat.scala +++ b/ivy/src/main/scala/sbt/librarymanagement/ivy/formats/UpdateOptionsFormat.scala @@ -4,7 +4,35 @@ package formats import sjsonnew._ import sbt.librarymanagement._ -trait UpdateOptionsFormat { self: BasicJsonProtocol with ModuleIDFormats with ResolverFormats => +trait UpdateOptionsFormat { + self: BasicJsonProtocol + with ModuleIDFormats + with ResolverFormats + with sbt.librarymanagement.ArtifactFormats + with sbt.librarymanagement.ConfigRefFormats + with sbt.librarymanagement.ChecksumFormats + with sbt.librarymanagement.InclExclRuleFormats + with sbt.librarymanagement.CrossVersionFormats + with sbt.librarymanagement.DisabledFormats + with sbt.librarymanagement.BinaryFormats + with sbt.librarymanagement.ConstantFormats + with sbt.librarymanagement.PatchFormats + with sbt.librarymanagement.FullFormats + with sbt.librarymanagement.For3Use2_13Formats + with sbt.librarymanagement.For2_13Use3Formats + with sbt.librarymanagement.ChainedResolverFormats + with sbt.librarymanagement.MavenRepoFormats + with sbt.librarymanagement.MavenCacheFormats + with sbt.librarymanagement.PatternsFormats + with sbt.librarymanagement.FileConfigurationFormats + with sbt.librarymanagement.FileRepositoryFormats + with sbt.librarymanagement.URLRepositoryFormats + with sbt.librarymanagement.SshConnectionFormats + with sbt.librarymanagement.SshAuthenticationFormats + with sbt.librarymanagement.SshRepositoryFormats + with sbt.librarymanagement.SftpRepositoryFormats + with sbt.librarymanagement.PasswordAuthenticationFormats + with sbt.librarymanagement.KeyFileAuthenticationFormats => /* This is necessary to serialize/deserialize `directResolvers`. */ private implicit val moduleIdJsonKeyFormat: sjsonnew.JsonKeyFormat[ModuleID] = { new sjsonnew.JsonKeyFormat[ModuleID] {