From 866b0a1d3f6037beba36e628292e74b76ceb9c3c Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Thu, 8 Mar 2018 15:34:48 +0000
Subject: [PATCH] Upgrade to contraband 0.3.3

---
 .../contraband-scala/sbt/librarymanagement/Artifact.scala   | 2 +-
 .../contraband-scala/sbt/librarymanagement/Binary.scala     | 2 +-
 .../sbt/librarymanagement/ConflictManager.scala             | 2 +-
 .../contraband-scala/sbt/librarymanagement/Constant.scala   | 2 +-
 .../main/contraband-scala/sbt/librarymanagement/Full.scala  | 2 +-
 .../sbt/librarymanagement/InclExclRule.scala                | 2 +-
 .../sbt/librarymanagement/IvyFileConfiguration.scala        | 2 +-
 .../contraband-scala/sbt/librarymanagement/MavenCache.scala | 2 +-
 .../contraband-scala/sbt/librarymanagement/MavenRepo.scala  | 2 +-
 .../librarymanagement/ModuleDescriptorConfiguration.scala   | 2 +-
 .../contraband-scala/sbt/librarymanagement/ModuleID.scala   | 2 +-
 .../contraband-scala/sbt/librarymanagement/ModuleInfo.scala | 2 +-
 .../sbt/librarymanagement/ModuleReport.scala                | 2 +-
 .../contraband-scala/sbt/librarymanagement/Patterns.scala   | 2 +-
 .../sbt/librarymanagement/PomConfiguration.scala            | 2 +-
 .../sbt/librarymanagement/PublishConfiguration.scala        | 2 +-
 .../sbt/librarymanagement/RetrieveConfiguration.scala       | 6 +++---
 .../sbt/librarymanagement/ScalaModuleInfo.scala             | 2 +-
 .../contraband-scala/sbt/librarymanagement/ScmInfo.scala    | 2 +-
 .../sbt/librarymanagement/UpdateConfiguration.scala         | 2 +-
 .../librarymanagement/ivy/ExternalIvyConfiguration.scala    | 2 +-
 .../sbt/librarymanagement/ivy/InlineIvyConfiguration.scala  | 2 +-
 project/plugins.sbt                                         | 2 +-
 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala
index a676be246..92c623050 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala
@@ -56,6 +56,6 @@ final class Artifact private (
 }
 object Artifact extends sbt.librarymanagement.ArtifactFunctions {
   
-  def apply(name: String): Artifact = new Artifact(name, Artifact.DefaultType, Artifact.DefaultExtension, None, Vector.empty, None, Map.empty, None)
+  def apply(name: String): Artifact = new Artifact(name)
   def apply(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Vector[sbt.librarymanagement.ConfigRef], url: Option[java.net.URL], extraAttributes: Map[String, String], checksum: Option[sbt.librarymanagement.Checksum]): Artifact = new Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Binary.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Binary.scala
index f06902d22..b66b5f737 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/Binary.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/Binary.scala
@@ -38,6 +38,6 @@ final class Binary private (
 }
 object Binary {
   
-  def apply(): Binary = new Binary("", "")
+  def apply(): Binary = new Binary()
   def apply(prefix: String, suffix: String): Binary = new Binary(prefix, suffix)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManager.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManager.scala
index d7adb8829..97e9737bf 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManager.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManager.scala
@@ -37,6 +37,6 @@ final class ConflictManager private (
 }
 object ConflictManager extends sbt.librarymanagement.ConflictManagerFunctions {
   
-  def apply(name: String): ConflictManager = new ConflictManager(name, "*", "*")
+  def apply(name: String): ConflictManager = new ConflictManager(name)
   def apply(name: String, organization: String, module: String): ConflictManager = new ConflictManager(name, organization, module)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Constant.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Constant.scala
index 25ca45c3b..148546958 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/Constant.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/Constant.scala
@@ -29,6 +29,6 @@ final class Constant private (
 }
 object Constant {
   
-  def apply(): Constant = new Constant("")
+  def apply(): Constant = new Constant()
   def apply(value: String): Constant = new Constant(value)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Full.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Full.scala
index c51ccd0db..71ea0fc87 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/Full.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/Full.scala
@@ -38,6 +38,6 @@ final class Full private (
 }
 object Full {
   
-  def apply(): Full = new Full("", "")
+  def apply(): Full = new Full()
   def apply(prefix: String, suffix: String): Full = new Full(prefix, suffix)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRule.scala b/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRule.scala
index e93c8ac2c..a6f1ec1dd 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRule.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRule.scala
@@ -53,6 +53,6 @@ final class InclExclRule private (
 }
 object InclExclRule extends sbt.librarymanagement.InclExclRuleFunctions {
   
-  def apply(): InclExclRule = new InclExclRule("*", "*", "*", Vector.empty, sbt.librarymanagement.Disabled())
+  def apply(): InclExclRule = new InclExclRule()
   def apply(organization: String, name: String, artifact: String, configurations: Vector[sbt.librarymanagement.ConfigRef], crossVersion: sbt.librarymanagement.CrossVersion): InclExclRule = new InclExclRule(organization, name, artifact, configurations, crossVersion)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfiguration.scala
index cd0a38aff..1136de05c 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfiguration.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfiguration.scala
@@ -43,7 +43,7 @@ final class IvyFileConfiguration private (
 }
 object IvyFileConfiguration {
   
-  def apply(file: java.io.File, autoScalaTools: Boolean): IvyFileConfiguration = new IvyFileConfiguration(false, None, file, autoScalaTools)
+  def apply(file: java.io.File, autoScalaTools: Boolean): IvyFileConfiguration = new IvyFileConfiguration(file, autoScalaTools)
   def apply(validate: Boolean, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo], file: java.io.File, autoScalaTools: Boolean): IvyFileConfiguration = new IvyFileConfiguration(validate, scalaModuleInfo, file, autoScalaTools)
   def apply(validate: Boolean, scalaModuleInfo: sbt.librarymanagement.ScalaModuleInfo, file: java.io.File, autoScalaTools: Boolean): IvyFileConfiguration = new IvyFileConfiguration(validate, Option(scalaModuleInfo), file, autoScalaTools)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/MavenCache.scala b/core/src/main/contraband-scala/sbt/librarymanagement/MavenCache.scala
index a99bb5da9..3f10f8e04 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/MavenCache.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/MavenCache.scala
@@ -45,6 +45,6 @@ final class MavenCache private (
 }
 object MavenCache {
   def apply(name: String, rootFile: java.io.File): MavenCache = new MavenCache(name, rootFile)
-  def apply(name: String, root: String, rootFile: java.io.File): MavenCache = new MavenCache(name, root, true, rootFile)
+  def apply(name: String, root: String, rootFile: java.io.File): MavenCache = new MavenCache(name, root, rootFile)
   def apply(name: String, root: String, localIfFile: Boolean, rootFile: java.io.File): MavenCache = new MavenCache(name, root, localIfFile, rootFile)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepo.scala b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepo.scala
index f964670f1..db4a4d64b 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepo.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepo.scala
@@ -36,6 +36,6 @@ final class MavenRepo private (
 }
 object MavenRepo {
   
-  def apply(name: String, root: String): MavenRepo = new MavenRepo(name, root, true)
+  def apply(name: String, root: String): MavenRepo = new MavenRepo(name, root)
   def apply(name: String, root: String, localIfFile: Boolean): MavenRepo = new MavenRepo(name, root, localIfFile)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfiguration.scala
index 552b2ae61..215a0c367 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfiguration.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfiguration.scala
@@ -74,7 +74,7 @@ final class ModuleDescriptorConfiguration private (
 }
 object ModuleDescriptorConfiguration extends sbt.librarymanagement.InlineConfigurationFunctions {
   
-  def apply(module: sbt.librarymanagement.ModuleID, moduleInfo: sbt.librarymanagement.ModuleInfo): ModuleDescriptorConfiguration = new ModuleDescriptorConfiguration(false, None, module, moduleInfo, Vector.empty, Vector.empty, Vector.empty, scala.xml.NodeSeq.Empty, sbt.librarymanagement.Configurations.default, Option(sbt.librarymanagement.Configurations.Compile), sbt.librarymanagement.ConflictManager.default)
+  def apply(module: sbt.librarymanagement.ModuleID, moduleInfo: sbt.librarymanagement.ModuleInfo): ModuleDescriptorConfiguration = new ModuleDescriptorConfiguration(module, moduleInfo)
   def apply(validate: Boolean, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo], module: sbt.librarymanagement.ModuleID, moduleInfo: sbt.librarymanagement.ModuleInfo, dependencies: Vector[sbt.librarymanagement.ModuleID], overrides: Vector[sbt.librarymanagement.ModuleID], excludes: Vector[sbt.librarymanagement.InclExclRule], ivyXML: scala.xml.NodeSeq, configurations: Vector[sbt.librarymanagement.Configuration], defaultConfiguration: Option[sbt.librarymanagement.Configuration], conflictManager: sbt.librarymanagement.ConflictManager): ModuleDescriptorConfiguration = new ModuleDescriptorConfiguration(validate, scalaModuleInfo, module, moduleInfo, dependencies, overrides, excludes, ivyXML, configurations, defaultConfiguration, conflictManager)
   def apply(validate: Boolean, scalaModuleInfo: sbt.librarymanagement.ScalaModuleInfo, module: sbt.librarymanagement.ModuleID, moduleInfo: sbt.librarymanagement.ModuleInfo, dependencies: Vector[sbt.librarymanagement.ModuleID], overrides: Vector[sbt.librarymanagement.ModuleID], excludes: Vector[sbt.librarymanagement.InclExclRule], ivyXML: scala.xml.NodeSeq, configurations: Vector[sbt.librarymanagement.Configuration], defaultConfiguration: sbt.librarymanagement.Configuration, conflictManager: sbt.librarymanagement.ConflictManager): ModuleDescriptorConfiguration = new ModuleDescriptorConfiguration(validate, Option(scalaModuleInfo), module, moduleInfo, dependencies, overrides, excludes, ivyXML, configurations, Option(defaultConfiguration), conflictManager)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleID.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleID.scala
index 822f7d2d6..eafa0dd95 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleID.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleID.scala
@@ -76,6 +76,6 @@ final class ModuleID private (
 }
 object ModuleID extends sbt.librarymanagement.ModuleIDFunctions {
   
-  def apply(organization: String, name: String, revision: String): ModuleID = new ModuleID(organization, name, revision, None, false, true, false, Vector.empty, Vector.empty, Vector.empty, Map.empty, sbt.librarymanagement.Disabled(), None)
+  def apply(organization: String, name: String, revision: String): ModuleID = new ModuleID(organization, name, revision)
   def apply(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, isForce: Boolean, explicitArtifacts: Vector[sbt.librarymanagement.Artifact], inclusions: Vector[sbt.librarymanagement.InclExclRule], exclusions: Vector[sbt.librarymanagement.InclExclRule], extraAttributes: Map[String, String], crossVersion: sbt.librarymanagement.CrossVersion, branchName: Option[String]): ModuleID = new ModuleID(organization, name, revision, configurations, isChanging, isTransitive, isForce, explicitArtifacts, inclusions, exclusions, extraAttributes, crossVersion, branchName)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala
index ae7d42f5c..e41ca76fb 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala
@@ -61,6 +61,6 @@ final class ModuleInfo private (
 }
 object ModuleInfo {
   
-  def apply(nameFormal: String): ModuleInfo = new ModuleInfo(nameFormal, "", None, None, Vector.empty, "", None, None, Vector.empty)
+  def apply(nameFormal: String): ModuleInfo = new ModuleInfo(nameFormal)
   def apply(nameFormal: String, description: String, homepage: Option[java.net.URL], startYear: Option[Int], licenses: Vector[scala.Tuple2[String, java.net.URL]], organizationName: String, organizationHomepage: Option[java.net.URL], scmInfo: Option[sbt.librarymanagement.ScmInfo], developers: Vector[sbt.librarymanagement.Developer]): ModuleInfo = new ModuleInfo(nameFormal, description, homepage, startYear, licenses, organizationName, organizationHomepage, scmInfo, developers)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReport.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReport.scala
index 0c2526b1d..3de609527 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReport.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReport.scala
@@ -101,6 +101,6 @@ final class ModuleReport private (
 }
 object ModuleReport {
   
-  def apply(module: sbt.librarymanagement.ModuleID, artifacts: Vector[scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]], missingArtifacts: Vector[sbt.librarymanagement.Artifact]): ModuleReport = new ModuleReport(module, artifacts, missingArtifacts, None, None, None, None, false, None, None, None, None, Map.empty, None, None, Vector.empty, Vector.empty, Vector.empty)
+  def apply(module: sbt.librarymanagement.ModuleID, artifacts: Vector[scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]], missingArtifacts: Vector[sbt.librarymanagement.Artifact]): ModuleReport = new ModuleReport(module, artifacts, missingArtifacts)
   def apply(module: sbt.librarymanagement.ModuleID, artifacts: Vector[scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]], missingArtifacts: Vector[sbt.librarymanagement.Artifact], status: Option[String], publicationDate: Option[java.util.Calendar], resolver: Option[String], artifactResolver: Option[String], evicted: Boolean, evictedData: Option[String], evictedReason: Option[String], problem: Option[String], homepage: Option[String], extraAttributes: Map[String, String], isDefault: Option[Boolean], branch: Option[String], configurations: Vector[sbt.librarymanagement.ConfigRef], licenses: Vector[scala.Tuple2[String, Option[String]]], callers: Vector[sbt.librarymanagement.Caller]): ModuleReport = new ModuleReport(module, artifacts, missingArtifacts, status, publicationDate, resolver, artifactResolver, evicted, evictedData, evictedReason, problem, homepage, extraAttributes, isDefault, branch, configurations, licenses, callers)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Patterns.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Patterns.scala
index ea43d5525..de2a54d98 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/Patterns.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/Patterns.scala
@@ -45,6 +45,6 @@ final class Patterns private (
 }
 object Patterns extends sbt.librarymanagement.PatternsFunctions {
   
-  def apply(): Patterns = new Patterns(Vector.empty, Vector.empty, true, false, false)
+  def apply(): Patterns = new Patterns()
   def apply(ivyPatterns: Vector[String], artifactPatterns: Vector[String], isMavenCompatible: Boolean, descriptorOptional: Boolean, skipConsistencyCheck: Boolean): Patterns = new Patterns(ivyPatterns, artifactPatterns, isMavenCompatible, descriptorOptional, skipConsistencyCheck)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PomConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PomConfiguration.scala
index 93fdbc39c..e9cbf9219 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/PomConfiguration.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/PomConfiguration.scala
@@ -43,7 +43,7 @@ final class PomConfiguration private (
 }
 object PomConfiguration {
   
-  def apply(file: java.io.File, autoScalaTools: Boolean): PomConfiguration = new PomConfiguration(false, None, file, autoScalaTools)
+  def apply(file: java.io.File, autoScalaTools: Boolean): PomConfiguration = new PomConfiguration(file, autoScalaTools)
   def apply(validate: Boolean, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo], file: java.io.File, autoScalaTools: Boolean): PomConfiguration = new PomConfiguration(validate, scalaModuleInfo, file, autoScalaTools)
   def apply(validate: Boolean, scalaModuleInfo: sbt.librarymanagement.ScalaModuleInfo, file: java.io.File, autoScalaTools: Boolean): PomConfiguration = new PomConfiguration(validate, Option(scalaModuleInfo), file, autoScalaTools)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfiguration.scala
index 8dcd7d7aa..3adc81fcf 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfiguration.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfiguration.scala
@@ -75,7 +75,7 @@ final class PublishConfiguration private (
 }
 object PublishConfiguration {
   
-  def apply(): PublishConfiguration = new PublishConfiguration(true, None, None, None, None, Vector(), Vector("sha1", "md5"), None, false)
+  def apply(): PublishConfiguration = new PublishConfiguration()
   def apply(publishMavenStyle: Boolean, deliverIvyPattern: Option[String], status: Option[String], configurations: Option[scala.Vector[sbt.librarymanagement.ConfigRef]], resolverName: Option[String], artifacts: Vector[scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]], checksums: scala.Vector[String], logging: Option[sbt.librarymanagement.UpdateLogging], overwrite: Boolean): PublishConfiguration = new PublishConfiguration(publishMavenStyle, deliverIvyPattern, status, configurations, resolverName, artifacts, checksums, logging, overwrite)
   def apply(publishMavenStyle: Boolean, deliverIvyPattern: String, status: String, configurations: scala.Vector[sbt.librarymanagement.ConfigRef], resolverName: String, artifacts: Vector[scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]], checksums: scala.Vector[String], logging: sbt.librarymanagement.UpdateLogging, overwrite: Boolean): PublishConfiguration = new PublishConfiguration(publishMavenStyle, Option(deliverIvyPattern), Option(status), Option(configurations), Option(resolverName), artifacts, checksums, Option(logging), overwrite)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfiguration.scala
index 7a063b474..205218b04 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfiguration.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfiguration.scala
@@ -50,9 +50,9 @@ final class RetrieveConfiguration private (
 }
 object RetrieveConfiguration {
   
-  def apply(): RetrieveConfiguration = new RetrieveConfiguration(None, None, false, None)
-  def apply(retrieveDirectory: Option[java.io.File], outputPattern: Option[String]): RetrieveConfiguration = new RetrieveConfiguration(retrieveDirectory, outputPattern, false, None)
-  def apply(retrieveDirectory: java.io.File, outputPattern: String): RetrieveConfiguration = new RetrieveConfiguration(Option(retrieveDirectory), Option(outputPattern), false, None)
+  def apply(): RetrieveConfiguration = new RetrieveConfiguration()
+  def apply(retrieveDirectory: Option[java.io.File], outputPattern: Option[String]): RetrieveConfiguration = new RetrieveConfiguration(retrieveDirectory, outputPattern)
+  def apply(retrieveDirectory: java.io.File, outputPattern: String): RetrieveConfiguration = new RetrieveConfiguration(Option(retrieveDirectory), Option(outputPattern))
   def apply(retrieveDirectory: Option[java.io.File], outputPattern: Option[String], sync: Boolean, configurationsToRetrieve: Option[scala.Vector[sbt.librarymanagement.ConfigRef]]): RetrieveConfiguration = new RetrieveConfiguration(retrieveDirectory, outputPattern, sync, configurationsToRetrieve)
   def apply(retrieveDirectory: java.io.File, outputPattern: String, sync: Boolean, configurationsToRetrieve: scala.Vector[sbt.librarymanagement.ConfigRef]): RetrieveConfiguration = new RetrieveConfiguration(Option(retrieveDirectory), Option(outputPattern), sync, Option(configurationsToRetrieve))
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfo.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfo.scala
index 73afbfcb9..36431b387 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfo.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfo.scala
@@ -56,6 +56,6 @@ final class ScalaModuleInfo private (
 }
 object ScalaModuleInfo {
   
-  def apply(scalaFullVersion: String, scalaBinaryVersion: String, configurations: Vector[sbt.librarymanagement.Configuration], checkExplicit: Boolean, filterImplicit: Boolean, overrideScalaVersion: Boolean): ScalaModuleInfo = new ScalaModuleInfo(scalaFullVersion, scalaBinaryVersion, configurations, checkExplicit, filterImplicit, overrideScalaVersion, sbt.librarymanagement.ScalaArtifacts.Organization, sbt.librarymanagement.ScalaArtifacts.Artifacts)
+  def apply(scalaFullVersion: String, scalaBinaryVersion: String, configurations: Vector[sbt.librarymanagement.Configuration], checkExplicit: Boolean, filterImplicit: Boolean, overrideScalaVersion: Boolean): ScalaModuleInfo = new ScalaModuleInfo(scalaFullVersion, scalaBinaryVersion, configurations, checkExplicit, filterImplicit, overrideScalaVersion)
   def apply(scalaFullVersion: String, scalaBinaryVersion: String, configurations: Vector[sbt.librarymanagement.Configuration], checkExplicit: Boolean, filterImplicit: Boolean, overrideScalaVersion: Boolean, scalaOrganization: String, scalaArtifacts: scala.Vector[String]): ScalaModuleInfo = new ScalaModuleInfo(scalaFullVersion, scalaBinaryVersion, configurations, checkExplicit, filterImplicit, overrideScalaVersion, scalaOrganization, scalaArtifacts)
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala
index 19766ac5e..713654f4e 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala
@@ -40,7 +40,7 @@ final class ScmInfo private (
 }
 object ScmInfo {
   
-  def apply(browseUrl: java.net.URL, connection: String): ScmInfo = new ScmInfo(browseUrl, connection, None)
+  def apply(browseUrl: java.net.URL, connection: String): ScmInfo = new ScmInfo(browseUrl, connection)
   def apply(browseUrl: java.net.URL, connection: String, devConnection: Option[String]): ScmInfo = new ScmInfo(browseUrl, connection, devConnection)
   def apply(browseUrl: java.net.URL, connection: String, devConnection: String): ScmInfo = new ScmInfo(browseUrl, connection, Option(devConnection))
 }
diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfiguration.scala
index b62d6e719..39fce50be 100644
--- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfiguration.scala
+++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfiguration.scala
@@ -76,7 +76,7 @@ final class UpdateConfiguration private (
 }
 object UpdateConfiguration {
   
-  def apply(): UpdateConfiguration = new UpdateConfiguration(None, false, sbt.librarymanagement.UpdateLogging.Default, sbt.librarymanagement.LogicalClock.unknown, None, None, false, false)
+  def apply(): UpdateConfiguration = new UpdateConfiguration()
   def apply(retrieveManaged: Option[sbt.librarymanagement.RetrieveConfiguration], missingOk: Boolean, logging: sbt.librarymanagement.UpdateLogging, logicalClock: sbt.librarymanagement.LogicalClock, metadataDirectory: Option[java.io.File], artifactFilter: Option[sbt.librarymanagement.ArtifactTypeFilter], offline: Boolean, frozen: Boolean): UpdateConfiguration = new UpdateConfiguration(retrieveManaged, missingOk, logging, logicalClock, metadataDirectory, artifactFilter, offline, frozen)
   def apply(retrieveManaged: sbt.librarymanagement.RetrieveConfiguration, missingOk: Boolean, logging: sbt.librarymanagement.UpdateLogging, logicalClock: sbt.librarymanagement.LogicalClock, metadataDirectory: java.io.File, artifactFilter: sbt.librarymanagement.ArtifactTypeFilter, offline: Boolean, frozen: Boolean): UpdateConfiguration = new UpdateConfiguration(Option(retrieveManaged), missingOk, logging, logicalClock, Option(metadataDirectory), Option(artifactFilter), offline, frozen)
 }
diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfiguration.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfiguration.scala
index 02456951f..a0293ea63 100644
--- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfiguration.scala
+++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfiguration.scala
@@ -60,7 +60,7 @@ final class ExternalIvyConfiguration private (
 }
 object ExternalIvyConfiguration {
   
-  def apply(): ExternalIvyConfiguration = new ExternalIvyConfiguration(None, None, sbt.librarymanagement.ivy.UpdateOptions(), None, None, Vector())
+  def apply(): ExternalIvyConfiguration = new ExternalIvyConfiguration()
   def apply(lock: Option[xsbti.GlobalLock], log: Option[xsbti.Logger], updateOptions: sbt.librarymanagement.ivy.UpdateOptions, baseDirectory: Option[java.io.File], uri: Option[java.net.URI], extraResolvers: Vector[sbt.librarymanagement.Resolver]): ExternalIvyConfiguration = new ExternalIvyConfiguration(lock, log, updateOptions, baseDirectory, uri, extraResolvers)
   def apply(lock: xsbti.GlobalLock, log: xsbti.Logger, updateOptions: sbt.librarymanagement.ivy.UpdateOptions, baseDirectory: java.io.File, uri: java.net.URI, extraResolvers: Vector[sbt.librarymanagement.Resolver]): ExternalIvyConfiguration = new ExternalIvyConfiguration(Option(lock), Option(log), updateOptions, Option(baseDirectory), Option(uri), extraResolvers)
 }
diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfiguration.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfiguration.scala
index 0d781c437..1baa4aeb3 100644
--- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfiguration.scala
+++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfiguration.scala
@@ -98,7 +98,7 @@ object InlineIvyConfiguration {
     .withResolutionCacheDir(resolutionCacheDir)
     .withLog(log)
   }
-  def apply(): InlineIvyConfiguration = new InlineIvyConfiguration(None, None, sbt.librarymanagement.ivy.UpdateOptions(), None, sbt.librarymanagement.Resolver.defaults, Vector.empty, Vector.empty, sbt.librarymanagement.ivy.IvyDefaults.defaultChecksums, false, None)
+  def apply(): InlineIvyConfiguration = new InlineIvyConfiguration()
   def apply(lock: Option[xsbti.GlobalLock], log: Option[xsbti.Logger], updateOptions: sbt.librarymanagement.ivy.UpdateOptions, paths: Option[sbt.librarymanagement.ivy.IvyPaths], resolvers: Vector[sbt.librarymanagement.Resolver], otherResolvers: Vector[sbt.librarymanagement.Resolver], moduleConfigurations: Vector[sbt.librarymanagement.ModuleConfiguration], checksums: Vector[String], managedChecksums: Boolean, resolutionCacheDir: Option[java.io.File]): InlineIvyConfiguration = new InlineIvyConfiguration(lock, log, updateOptions, paths, resolvers, otherResolvers, moduleConfigurations, checksums, managedChecksums, resolutionCacheDir)
   def apply(lock: xsbti.GlobalLock, log: xsbti.Logger, updateOptions: sbt.librarymanagement.ivy.UpdateOptions, paths: sbt.librarymanagement.ivy.IvyPaths, resolvers: Vector[sbt.librarymanagement.Resolver], otherResolvers: Vector[sbt.librarymanagement.Resolver], moduleConfigurations: Vector[sbt.librarymanagement.ModuleConfiguration], checksums: Vector[String], managedChecksums: Boolean, resolutionCacheDir: java.io.File): InlineIvyConfiguration = new InlineIvyConfiguration(Option(lock), Option(log), updateOptions, Option(paths), resolvers, otherResolvers, moduleConfigurations, checksums, managedChecksums, Option(resolutionCacheDir))
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 8e2abce43..d2c95eb4c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
 addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.5")
-addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.2")
+addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.3")
 
 scalacOptions += "-language:postfixOps"