From 1f45d25ec3c22c6802c31b9c87bf6ca1104526c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Tue, 8 Oct 2024 00:24:05 +0100 Subject: [PATCH 1/4] upgrade and enable contraband --- build.sbt | 2 +- .../internal/librarymanagement/ConfigurationReportLite.scala | 4 ++-- .../sbt/internal/librarymanagement/SemComparator.scala | 4 ++-- .../sbt/internal/librarymanagement/SemSelAndChunk.scala | 4 ++-- .../sbt/internal/librarymanagement/UpdateReportLite.scala | 4 ++-- .../contraband-scala/sbt/librarymanagement/Artifact.scala | 4 ++-- .../sbt/librarymanagement/ArtifactFormats.scala | 2 +- .../sbt/librarymanagement/ArtifactTypeFilter.scala | 4 ++-- .../sbt/librarymanagement/ArtifactTypeFilterFormats.scala | 2 +- .../main/contraband-scala/sbt/librarymanagement/Caller.scala | 4 ++-- .../sbt/librarymanagement/CallerFormats.scala | 2 +- .../sbt/librarymanagement/ChainedResolver.scala | 4 ++-- .../sbt/librarymanagement/ChainedResolverFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/Checksum.scala | 4 ++-- .../sbt/librarymanagement/ChecksumFormats.scala | 2 +- .../sbt/librarymanagement/ConfigurationReport.scala | 4 ++-- .../sbt/librarymanagement/ConfigurationReportFormats.scala | 2 +- .../librarymanagement/ConfigurationReportLiteFormats.scala | 2 +- .../sbt/librarymanagement/ConflictManager.scala | 4 ++-- .../sbt/librarymanagement/ConflictManagerFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/Developer.scala | 4 ++-- .../sbt/librarymanagement/DeveloperFormats.scala | 2 +- .../sbt/librarymanagement/FileConfiguration.scala | 4 ++-- .../sbt/librarymanagement/FileConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/FileRepository.scala | 4 ++-- .../sbt/librarymanagement/FileRepositoryFormats.scala | 2 +- .../sbt/librarymanagement/GetClassifiersConfiguration.scala | 4 ++-- .../GetClassifiersConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/GetClassifiersModule.scala | 4 ++-- .../sbt/librarymanagement/GetClassifiersModuleFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/InclExclRule.scala | 4 ++-- .../sbt/librarymanagement/InclExclRuleFormats.scala | 2 +- .../sbt/librarymanagement/IvyFileConfiguration.scala | 4 ++-- .../sbt/librarymanagement/IvyFileConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/KeyFileAuthentication.scala | 4 ++-- .../sbt/librarymanagement/KeyFileAuthenticationFormats.scala | 2 +- .../sbt/librarymanagement/LibraryManagementCodec.scala | 2 +- .../sbt/librarymanagement/MakePomConfiguration.scala | 4 ++-- .../contraband-scala/sbt/librarymanagement/MavenCache.scala | 4 ++-- .../sbt/librarymanagement/MavenCacheFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/MavenRepo.scala | 4 ++-- .../sbt/librarymanagement/MavenRepoFormats.scala | 2 +- .../sbt/librarymanagement/MavenRepository.scala | 2 +- .../sbt/librarymanagement/MavenRepositoryFormats.scala | 2 +- .../sbt/librarymanagement/ModuleConfiguration.scala | 4 ++-- .../sbt/librarymanagement/ModuleConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/ModuleDescriptorConfiguration.scala | 4 ++-- .../ModuleDescriptorConfigurationFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/ModuleID.scala | 4 ++-- .../sbt/librarymanagement/ModuleIDFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/ModuleInfo.scala | 4 ++-- .../sbt/librarymanagement/ModuleInfoFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/ModuleReport.scala | 4 ++-- .../sbt/librarymanagement/ModuleReportFormats.scala | 2 +- .../sbt/librarymanagement/ModuleSettings.scala | 2 +- .../sbt/librarymanagement/ModuleSettingsFormats.scala | 2 +- .../sbt/librarymanagement/OrganizationArtifactReport.scala | 4 ++-- .../librarymanagement/OrganizationArtifactReportFormats.scala | 2 +- .../sbt/librarymanagement/PasswordAuthentication.scala | 4 ++-- .../sbt/librarymanagement/PasswordAuthenticationFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/Patterns.scala | 4 ++-- .../sbt/librarymanagement/PatternsBasedRepository.scala | 2 +- .../librarymanagement/PatternsBasedRepositoryFormats.scala | 2 +- .../sbt/librarymanagement/PatternsFormats.scala | 2 +- .../sbt/librarymanagement/PomConfiguration.scala | 4 ++-- .../sbt/librarymanagement/PomConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/PublishConfiguration.scala | 4 ++-- .../sbt/librarymanagement/PublishConfigurationFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/Resolver.scala | 2 +- .../sbt/librarymanagement/ResolverFormats.scala | 2 +- .../sbt/librarymanagement/RetrieveConfiguration.scala | 4 ++-- .../sbt/librarymanagement/RetrieveConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/ScalaModuleInfo.scala | 4 ++-- .../sbt/librarymanagement/ScalaModuleInfoFormats.scala | 2 +- .../main/contraband-scala/sbt/librarymanagement/ScmInfo.scala | 4 ++-- .../sbt/librarymanagement/ScmInfoFormats.scala | 2 +- .../sbt/librarymanagement/SemanticSelector.scala | 4 ++-- .../sbt/librarymanagement/SftpRepository.scala | 4 ++-- .../sbt/librarymanagement/SftpRepositoryFormats.scala | 2 +- .../sbt/librarymanagement/SshAuthentication.scala | 2 +- .../sbt/librarymanagement/SshAuthenticationFormats.scala | 2 +- .../sbt/librarymanagement/SshBasedRepository.scala | 2 +- .../sbt/librarymanagement/SshBasedRepositoryFormats.scala | 2 +- .../sbt/librarymanagement/SshConnection.scala | 4 ++-- .../sbt/librarymanagement/SshConnectionFormats.scala | 2 +- .../sbt/librarymanagement/SshRepository.scala | 4 ++-- .../sbt/librarymanagement/SshRepositoryFormats.scala | 2 +- .../sbt/librarymanagement/URLRepository.scala | 4 ++-- .../sbt/librarymanagement/URLRepositoryFormats.scala | 2 +- .../sbt/librarymanagement/UpdateConfiguration.scala | 4 ++-- .../sbt/librarymanagement/UpdateConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/UpdateLogging.scala | 2 +- .../sbt/librarymanagement/UpdateLoggingFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/UpdateReport.scala | 4 ++-- .../sbt/librarymanagement/UpdateReportFormats.scala | 2 +- .../sbt/librarymanagement/UpdateReportLiteFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/UpdateStats.scala | 4 ++-- .../sbt/librarymanagement/UpdateStatsFormats.scala | 2 +- project/plugins.sbt | 2 +- 99 files changed, 142 insertions(+), 142 deletions(-) diff --git a/build.sbt b/build.sbt index a4ecadc13..0453c258e 100644 --- a/build.sbt +++ b/build.sbt @@ -111,7 +111,7 @@ lazy val lmRoot = (project in file(".")) ) lazy val lmCore = (project in file("core")) - // .enablePlugins(ContrabandPlugin, JsonCodecPlugin) + .enablePlugins(ContrabandPlugin, JsonCodecPlugin) .settings( commonSettings, name := "librarymanagement-core", diff --git a/core/src/main/contraband-scala/sbt/internal/librarymanagement/ConfigurationReportLite.scala b/core/src/main/contraband-scala/sbt/internal/librarymanagement/ConfigurationReportLite.scala index d277f7ca2..290009e68 100644 --- a/core/src/main/contraband-scala/sbt/internal/librarymanagement/ConfigurationReportLite.scala +++ b/core/src/main/contraband-scala/sbt/internal/librarymanagement/ConfigurationReportLite.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -20,7 +20,7 @@ final class ConfigurationReportLite private ( override def toString: String = { "ConfigurationReportLite(" + configuration + ", " + details + ")" } - private[this] def copy(configuration: String = configuration, details: Vector[sbt.librarymanagement.OrganizationArtifactReport] = details): ConfigurationReportLite = { + private def copy(configuration: String = configuration, details: Vector[sbt.librarymanagement.OrganizationArtifactReport] = details): ConfigurationReportLite = { new ConfigurationReportLite(configuration, details) } def withConfiguration(configuration: String): ConfigurationReportLite = { diff --git a/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala b/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala index 25765e8f8..ffe90a92a 100644 --- a/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala +++ b/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -31,7 +31,7 @@ final class SemComparator private ( override def toString: String = { this.toStringImpl } - private[this] def copy(op: sbt.internal.librarymanagement.SemSelOperator = op, major: Option[Long] = major, minor: Option[Long] = minor, patch: Option[Long] = patch, tags: Seq[String] = tags): SemComparator = { + private def copy(op: sbt.internal.librarymanagement.SemSelOperator = op, major: Option[Long] = major, minor: Option[Long] = minor, patch: Option[Long] = patch, tags: Seq[String] = tags): SemComparator = { new SemComparator(op, major, minor, patch, tags) } def withOp(op: sbt.internal.librarymanagement.SemSelOperator): SemComparator = { diff --git a/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemSelAndChunk.scala b/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemSelAndChunk.scala index 820fc3231..6d59ca185 100644 --- a/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemSelAndChunk.scala +++ b/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemSelAndChunk.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -19,7 +19,7 @@ final class SemSelAndChunk private ( override def toString: String = { comparators.map(_.toString).mkString(" ") } - private[this] def copy(comparators: Seq[sbt.internal.librarymanagement.SemComparator] = comparators): SemSelAndChunk = { + private def copy(comparators: Seq[sbt.internal.librarymanagement.SemComparator] = comparators): SemSelAndChunk = { new SemSelAndChunk(comparators) } def withComparators(comparators: Seq[sbt.internal.librarymanagement.SemComparator]): SemSelAndChunk = { diff --git a/core/src/main/contraband-scala/sbt/internal/librarymanagement/UpdateReportLite.scala b/core/src/main/contraband-scala/sbt/internal/librarymanagement/UpdateReportLite.scala index f5040d97f..070f411dd 100644 --- a/core/src/main/contraband-scala/sbt/internal/librarymanagement/UpdateReportLite.scala +++ b/core/src/main/contraband-scala/sbt/internal/librarymanagement/UpdateReportLite.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -19,7 +19,7 @@ final class UpdateReportLite private ( override def toString: String = { "UpdateReportLite(" + configurations + ")" } - private[this] def copy(configurations: Vector[sbt.internal.librarymanagement.ConfigurationReportLite] = configurations): UpdateReportLite = { + private def copy(configurations: Vector[sbt.internal.librarymanagement.ConfigurationReportLite] = configurations): UpdateReportLite = { new UpdateReportLite(configurations) } def withConfigurations(configurations: Vector[sbt.internal.librarymanagement.ConfigurationReportLite]): UpdateReportLite = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala index e7d033043..80b4fabd7 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/Artifact.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -28,7 +28,7 @@ final class Artifact private ( override def toString: String = { "Artifact(" + name + ", " + `type` + ", " + extension + ", " + classifier + ", " + configurations + ", " + url + ", " + extraAttributes + ", " + checksum + ", " + allowInsecureProtocol + ")" } - private[this] def copy(name: String = name, `type`: String = `type`, extension: String = extension, classifier: Option[String] = classifier, configurations: Vector[sbt.librarymanagement.ConfigRef] = configurations, url: Option[java.net.URI] = url, extraAttributes: Map[String, String] = extraAttributes, checksum: Option[sbt.librarymanagement.Checksum] = checksum, allowInsecureProtocol: Boolean = allowInsecureProtocol): Artifact = { + private def copy(name: String = name, `type`: String = `type`, extension: String = extension, classifier: Option[String] = classifier, configurations: Vector[sbt.librarymanagement.ConfigRef] = configurations, url: Option[java.net.URI] = url, extraAttributes: Map[String, String] = extraAttributes, checksum: Option[sbt.librarymanagement.Checksum] = checksum, allowInsecureProtocol: Boolean = allowInsecureProtocol): Artifact = { new Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes, checksum, allowInsecureProtocol) } def withName(name: String): Artifact = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala index 6b92852cf..cc405ff08 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilter.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilter.scala index 6d9676e75..e578f9d98 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilter.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilter.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -27,7 +27,7 @@ final class ArtifactTypeFilter private ( override def toString: String = { "ArtifactTypeFilter(" + types + ", " + inverted + ")" } - private[this] def copy(types: Set[String] = types, inverted: Boolean = inverted): ArtifactTypeFilter = { + private def copy(types: Set[String] = types, inverted: Boolean = inverted): ArtifactTypeFilter = { new ArtifactTypeFilter(types, inverted) } def withTypes(types: Set[String]): ArtifactTypeFilter = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilterFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilterFormats.scala index 75e185a13..e04a51efb 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilterFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilterFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Caller.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Caller.scala index 30b0b9372..28ee66e3c 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/Caller.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/Caller.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -25,7 +25,7 @@ final class Caller private ( override def toString: String = { s"$caller" } - private[this] def copy(caller: sbt.librarymanagement.ModuleID = caller, callerConfigurations: Vector[sbt.librarymanagement.ConfigRef] = callerConfigurations, callerExtraAttributes: Map[String, String] = callerExtraAttributes, isForceDependency: Boolean = isForceDependency, isChangingDependency: Boolean = isChangingDependency, isTransitiveDependency: Boolean = isTransitiveDependency, isDirectlyForceDependency: Boolean = isDirectlyForceDependency): Caller = { + private def copy(caller: sbt.librarymanagement.ModuleID = caller, callerConfigurations: Vector[sbt.librarymanagement.ConfigRef] = callerConfigurations, callerExtraAttributes: Map[String, String] = callerExtraAttributes, isForceDependency: Boolean = isForceDependency, isChangingDependency: Boolean = isChangingDependency, isTransitiveDependency: Boolean = isTransitiveDependency, isDirectlyForceDependency: Boolean = isDirectlyForceDependency): Caller = { new Caller(caller, callerConfigurations, callerExtraAttributes, isForceDependency, isChangingDependency, isTransitiveDependency, isDirectlyForceDependency) } def withCaller(caller: sbt.librarymanagement.ModuleID): Caller = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/CallerFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/CallerFormats.scala index 5b3f57d80..cb093cde7 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/CallerFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/CallerFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolver.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolver.scala index b91c5db8e..ae4ca37f7 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolver.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolver.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -20,7 +20,7 @@ final class ChainedResolver private ( override def toString: String = { "ChainedResolver(" + name + ", " + resolvers + ")" } - private[this] def copy(name: String = name, resolvers: Vector[sbt.librarymanagement.Resolver] = resolvers): ChainedResolver = { + private def copy(name: String = name, resolvers: Vector[sbt.librarymanagement.Resolver] = resolvers): ChainedResolver = { new ChainedResolver(name, resolvers) } def withName(name: String): ChainedResolver = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala index 61cf796da..ba532a25a 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Checksum.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Checksum.scala index 13676bc3d..1deb61e7e 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/Checksum.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/Checksum.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -20,7 +20,7 @@ final class Checksum private ( override def toString: String = { "Checksum(" + digest + ", " + `type` + ")" } - private[this] def copy(digest: String = digest, `type`: String = `type`): Checksum = { + private def copy(digest: String = digest, `type`: String = `type`): Checksum = { new Checksum(digest, `type`) } def withDigest(digest: String): Checksum = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ChecksumFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ChecksumFormats.scala index 365bf5770..c0d8ec705 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ChecksumFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ChecksumFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReport.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReport.scala index 99b421dd7..123a55c13 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReport.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReport.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -29,7 +29,7 @@ final class ConfigurationReport private ( (if (details.isEmpty) modules.mkString + details.flatMap(_.modules).filter(_.evicted).map("\t\t(EVICTED) " + _ + "\n").mkString else details.mkString) } - private[this] def copy(configuration: sbt.librarymanagement.ConfigRef = configuration, modules: Vector[sbt.librarymanagement.ModuleReport] = modules, details: Vector[sbt.librarymanagement.OrganizationArtifactReport] = details): ConfigurationReport = { + private def copy(configuration: sbt.librarymanagement.ConfigRef = configuration, modules: Vector[sbt.librarymanagement.ModuleReport] = modules, details: Vector[sbt.librarymanagement.OrganizationArtifactReport] = details): ConfigurationReport = { new ConfigurationReport(configuration, modules, details) } def withConfiguration(configuration: sbt.librarymanagement.ConfigRef): ConfigurationReport = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala index c8090c6e1..b2965bea0 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportLiteFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportLiteFormats.scala index b0181f495..d2c3d9e16 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportLiteFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportLiteFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManager.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManager.scala index cef310494..1b0d2b2e4 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManager.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManager.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -22,7 +22,7 @@ final class ConflictManager private ( override def toString: String = { "ConflictManager(" + name + ", " + organization + ", " + module + ")" } - private[this] def copy(name: String = name, organization: String = organization, module: String = module): ConflictManager = { + private def copy(name: String = name, organization: String = organization, module: String = module): ConflictManager = { new ConflictManager(name, organization, module) } def withName(name: String): ConflictManager = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManagerFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManagerFormats.scala index 7511f4c4b..a9affc151 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManagerFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ConflictManagerFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Developer.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Developer.scala index 0afb34a0f..aca66f10d 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/Developer.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/Developer.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -22,7 +22,7 @@ final class Developer private ( override def toString: String = { "Developer(" + id + ", " + name + ", " + email + ", " + url + ")" } - private[this] def copy(id: String = id, name: String = name, email: String = email, url: java.net.URI = url): Developer = { + private def copy(id: String = id, name: String = name, email: String = email, url: java.net.URI = url): Developer = { new Developer(id, name, email, url) } def withId(id: String): Developer = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala index 3a7cdbf60..3c4649e1d 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/FileConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/FileConfiguration.scala index daf2e6d3c..02bc17f81 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/FileConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/FileConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -21,7 +21,7 @@ final class FileConfiguration private ( override def toString: String = { "FileConfiguration(" + isLocal + ", " + isTransactional + ")" } - private[this] def copy(isLocal: Boolean = isLocal, isTransactional: Option[Boolean] = isTransactional): FileConfiguration = { + private def copy(isLocal: Boolean = isLocal, isTransactional: Option[Boolean] = isTransactional): FileConfiguration = { new FileConfiguration(isLocal, isTransactional) } def withIsLocal(isLocal: Boolean): FileConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/FileConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/FileConfigurationFormats.scala index be208ebec..904c5333e 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/FileConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/FileConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/FileRepository.scala b/core/src/main/contraband-scala/sbt/librarymanagement/FileRepository.scala index ca1fb7b7c..bdc15c27e 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/FileRepository.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/FileRepository.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -23,7 +23,7 @@ final class FileRepository private ( override def toString: String = { "FileRepository(" + name + ", " + patterns + ", " + configuration + ")" } - private[this] def copy(name: String = name, patterns: sbt.librarymanagement.Patterns = patterns, configuration: sbt.librarymanagement.FileConfiguration = configuration): FileRepository = { + private def copy(name: String = name, patterns: sbt.librarymanagement.Patterns = patterns, configuration: sbt.librarymanagement.FileConfiguration = configuration): FileRepository = { new FileRepository(name, patterns, configuration) } def withName(name: String): FileRepository = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/FileRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/FileRepositoryFormats.scala index da1e0c26f..22cdc4293 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/FileRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/FileRepositoryFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfiguration.scala index 85deb700c..4c4b19718 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -23,7 +23,7 @@ final class GetClassifiersConfiguration private ( override def toString: String = { "GetClassifiersConfiguration(" + module + ", " + excludes + ", " + updateConfiguration + ", " + sourceArtifactTypes + ", " + docArtifactTypes + ")" } - private[this] def copy(module: sbt.librarymanagement.GetClassifiersModule = module, excludes: Vector[scala.Tuple2[sbt.librarymanagement.ModuleID, scala.Vector[sbt.librarymanagement.ConfigRef]]] = excludes, updateConfiguration: sbt.librarymanagement.UpdateConfiguration = updateConfiguration, sourceArtifactTypes: Vector[String] = sourceArtifactTypes, docArtifactTypes: Vector[String] = docArtifactTypes): GetClassifiersConfiguration = { + private def copy(module: sbt.librarymanagement.GetClassifiersModule = module, excludes: Vector[scala.Tuple2[sbt.librarymanagement.ModuleID, scala.Vector[sbt.librarymanagement.ConfigRef]]] = excludes, updateConfiguration: sbt.librarymanagement.UpdateConfiguration = updateConfiguration, sourceArtifactTypes: Vector[String] = sourceArtifactTypes, docArtifactTypes: Vector[String] = docArtifactTypes): GetClassifiersConfiguration = { new GetClassifiersConfiguration(module, excludes, updateConfiguration, sourceArtifactTypes, docArtifactTypes) } def withModule(module: sbt.librarymanagement.GetClassifiersModule): GetClassifiersConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfigurationFormats.scala index c76d4686a..3e99d7b8b 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModule.scala b/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModule.scala index dfdaa72c1..47f2bfe38 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModule.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModule.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -23,7 +23,7 @@ final class GetClassifiersModule private ( override def toString: String = { "GetClassifiersModule(" + id + ", " + scalaModuleInfo + ", " + dependencies + ", " + configurations + ", " + classifiers + ")" } - private[this] def copy(id: sbt.librarymanagement.ModuleID = id, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo] = scalaModuleInfo, dependencies: Vector[sbt.librarymanagement.ModuleID] = dependencies, configurations: Vector[sbt.librarymanagement.Configuration] = configurations, classifiers: Vector[String] = classifiers): GetClassifiersModule = { + private def copy(id: sbt.librarymanagement.ModuleID = id, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo] = scalaModuleInfo, dependencies: Vector[sbt.librarymanagement.ModuleID] = dependencies, configurations: Vector[sbt.librarymanagement.Configuration] = configurations, classifiers: Vector[String] = classifiers): GetClassifiersModule = { new GetClassifiersModule(id, scalaModuleInfo, dependencies, configurations, classifiers) } def withId(id: sbt.librarymanagement.ModuleID): GetClassifiersModule = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModuleFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModuleFormats.scala index bd9475f86..723024c5d 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModuleFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModuleFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRule.scala b/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRule.scala index 23da54f26..6aaa4ff18 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRule.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRule.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -32,7 +32,7 @@ final class InclExclRule private ( override def toString: String = { "InclExclRule(" + organization + ", " + name + ", " + artifact + ", " + configurations + ", " + crossVersion + ")" } - private[this] def copy(organization: String = organization, name: String = name, artifact: String = artifact, configurations: Vector[sbt.librarymanagement.ConfigRef] = configurations, crossVersion: sbt.librarymanagement.CrossVersion = crossVersion): InclExclRule = { + private def copy(organization: String = organization, name: String = name, artifact: String = artifact, configurations: Vector[sbt.librarymanagement.ConfigRef] = configurations, crossVersion: sbt.librarymanagement.CrossVersion = crossVersion): InclExclRule = { new InclExclRule(organization, name, artifact, configurations, crossVersion) } def withOrganization(organization: String): InclExclRule = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRuleFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRuleFormats.scala index 837b478e9..ca2976627 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRuleFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/InclExclRuleFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfiguration.scala index 0611fbabf..6dd5d8342 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -22,7 +22,7 @@ final class IvyFileConfiguration private ( override def toString: String = { "IvyFileConfiguration(" + validate + ", " + scalaModuleInfo + ", " + file + ", " + autoScalaTools + ")" } - private[this] def copy(validate: Boolean = validate, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo] = scalaModuleInfo, file: java.io.File = file, autoScalaTools: Boolean = autoScalaTools): IvyFileConfiguration = { + private def copy(validate: Boolean = validate, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo] = scalaModuleInfo, file: java.io.File = file, autoScalaTools: Boolean = autoScalaTools): IvyFileConfiguration = { new IvyFileConfiguration(validate, scalaModuleInfo, file, autoScalaTools) } def withValidate(validate: Boolean): IvyFileConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfigurationFormats.scala index 990f2b9c0..a7b9eeb37 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthentication.scala b/core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthentication.scala index 7366734e7..b76bfc526 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthentication.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthentication.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -21,7 +21,7 @@ final class KeyFileAuthentication private ( override def toString: String = { "KeyFileAuthentication(" + user + ", " + keyfile + ", " + password + ")" } - private[this] def copy(user: String = user, keyfile: java.io.File = keyfile, password: Option[String] = password): KeyFileAuthentication = { + private def copy(user: String = user, keyfile: java.io.File = keyfile, password: Option[String] = password): KeyFileAuthentication = { new KeyFileAuthentication(user, keyfile, password) } def withUser(user: String): KeyFileAuthentication = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthenticationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthenticationFormats.scala index 8f99b0e10..6f682043f 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthenticationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthenticationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/LibraryManagementCodec.scala b/core/src/main/contraband-scala/sbt/librarymanagement/LibraryManagementCodec.scala index 7334fd859..8ae764426 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/LibraryManagementCodec.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/LibraryManagementCodec.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/MakePomConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/MakePomConfiguration.scala index 320fe3722..02f42c0c3 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/MakePomConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/MakePomConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -26,7 +26,7 @@ final class MakePomConfiguration private ( override def toString: String = { "MakePomConfiguration(" + file + ", " + moduleInfo + ", " + configurations + ", " + extra + ", " + process + ", " + filterRepositories + ", " + allRepositories + ", " + includeTypes + ")" } - private[this] def copy(file: Option[java.io.File] = file, moduleInfo: Option[sbt.librarymanagement.ModuleInfo] = moduleInfo, configurations: Option[scala.Vector[sbt.librarymanagement.Configuration]] = configurations, extra: Option[scala.xml.NodeSeq] = extra, process: scala.Function1[scala.xml.Node, scala.xml.Node] = process, filterRepositories: scala.Function1[sbt.librarymanagement.MavenRepository, Boolean] = filterRepositories, allRepositories: Boolean = allRepositories, includeTypes: Set[String] = includeTypes): MakePomConfiguration = { + private def copy(file: Option[java.io.File] = file, moduleInfo: Option[sbt.librarymanagement.ModuleInfo] = moduleInfo, configurations: Option[scala.Vector[sbt.librarymanagement.Configuration]] = configurations, extra: Option[scala.xml.NodeSeq] = extra, process: scala.Function1[scala.xml.Node, scala.xml.Node] = process, filterRepositories: scala.Function1[sbt.librarymanagement.MavenRepository, Boolean] = filterRepositories, allRepositories: Boolean = allRepositories, includeTypes: Set[String] = includeTypes): MakePomConfiguration = { new MakePomConfiguration(file, moduleInfo, configurations, extra, process, filterRepositories, allRepositories, includeTypes) } def withFile(file: Option[java.io.File]): MakePomConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/MavenCache.scala b/core/src/main/contraband-scala/sbt/librarymanagement/MavenCache.scala index dc69f0abe..3e74b39fe 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/MavenCache.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/MavenCache.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -28,7 +28,7 @@ final class MavenCache private ( override def toString: String = { s"cache:$name: ${rootFile.getAbsolutePath}" } - private[this] def copy(name: String = name, root: String = root, localIfFile: Boolean = localIfFile, rootFile: java.io.File = rootFile): MavenCache = { + private def copy(name: String = name, root: String = root, localIfFile: Boolean = localIfFile, rootFile: java.io.File = rootFile): MavenCache = { new MavenCache(name, root, localIfFile, rootFile) } def withName(name: String): MavenCache = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/MavenCacheFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/MavenCacheFormats.scala index 9b28abfda..800f797b5 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/MavenCacheFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/MavenCacheFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepo.scala b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepo.scala index b8fa71575..87bcfccf7 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepo.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepo.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -26,7 +26,7 @@ final class MavenRepo private ( override def toString: String = { s"$name: $root" } - private[this] def copy(name: String = name, root: String = root, localIfFile: Boolean = localIfFile, _allowInsecureProtocol: Boolean = _allowInsecureProtocol): MavenRepo = { + private def copy(name: String = name, root: String = root, localIfFile: Boolean = localIfFile, _allowInsecureProtocol: Boolean = _allowInsecureProtocol): MavenRepo = { new MavenRepo(name, root, localIfFile, _allowInsecureProtocol) } def withName(name: String): MavenRepo = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepoFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepoFormats.scala index 21da41dcd..df4a00341 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepoFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepoFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepository.scala b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepository.scala index 7618f2b02..02c441bea 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepository.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepository.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepositoryFormats.scala index 34e8f0975..013d2cb06 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/MavenRepositoryFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfiguration.scala index 7b4075929..6b8ca16c7 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -22,7 +22,7 @@ final class ModuleConfiguration private ( override def toString: String = { "ModuleConfiguration(" + organization + ", " + name + ", " + revision + ", " + resolver + ")" } - private[this] def copy(organization: String = organization, name: String = name, revision: String = revision, resolver: sbt.librarymanagement.Resolver = resolver): ModuleConfiguration = { + private def copy(organization: String = organization, name: String = name, revision: String = revision, resolver: sbt.librarymanagement.Resolver = resolver): ModuleConfiguration = { new ModuleConfiguration(organization, name, revision, resolver) } def withOrganization(organization: String): ModuleConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala index 1f34ab28f..dcbf9c1fd 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfiguration.scala index 11d51997d..49a381490 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -29,7 +29,7 @@ final class ModuleDescriptorConfiguration private ( override def toString: String = { "ModuleDescriptorConfiguration(" + validate + ", " + scalaModuleInfo + ", " + module + ", " + moduleInfo + ", " + dependencies + ", " + overrides + ", " + excludes + ", " + ivyXML + ", " + configurations + ", " + defaultConfiguration + ", " + conflictManager + ")" } - private[this] def copy(validate: Boolean = validate, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo] = scalaModuleInfo, module: sbt.librarymanagement.ModuleID = module, moduleInfo: sbt.librarymanagement.ModuleInfo = moduleInfo, dependencies: Vector[sbt.librarymanagement.ModuleID] = dependencies, overrides: Vector[sbt.librarymanagement.ModuleID] = overrides, excludes: Vector[sbt.librarymanagement.InclExclRule] = excludes, ivyXML: scala.xml.NodeSeq = ivyXML, configurations: Vector[sbt.librarymanagement.Configuration] = configurations, defaultConfiguration: Option[sbt.librarymanagement.Configuration] = defaultConfiguration, conflictManager: sbt.librarymanagement.ConflictManager = conflictManager): ModuleDescriptorConfiguration = { + private def copy(validate: Boolean = validate, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo] = scalaModuleInfo, module: sbt.librarymanagement.ModuleID = module, moduleInfo: sbt.librarymanagement.ModuleInfo = moduleInfo, dependencies: Vector[sbt.librarymanagement.ModuleID] = dependencies, overrides: Vector[sbt.librarymanagement.ModuleID] = overrides, excludes: Vector[sbt.librarymanagement.InclExclRule] = excludes, ivyXML: scala.xml.NodeSeq = ivyXML, configurations: Vector[sbt.librarymanagement.Configuration] = configurations, defaultConfiguration: Option[sbt.librarymanagement.Configuration] = defaultConfiguration, conflictManager: sbt.librarymanagement.ConflictManager = conflictManager): ModuleDescriptorConfiguration = { new ModuleDescriptorConfiguration(validate, scalaModuleInfo, module, moduleInfo, dependencies, overrides, excludes, ivyXML, configurations, defaultConfiguration, conflictManager) } def withValidate(validate: Boolean): ModuleDescriptorConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfigurationFormats.scala index e774c1a5c..71449e582 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleID.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleID.scala index ed282ac6e..099427d66 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleID.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleID.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -33,7 +33,7 @@ final class ModuleID private ( override def toString: String = { this.toStringImpl } - private[this] def copy(organization: String = organization, name: String = name, revision: String = revision, configurations: Option[String] = configurations, isChanging: Boolean = isChanging, isTransitive: Boolean = isTransitive, isForce: Boolean = isForce, explicitArtifacts: Vector[sbt.librarymanagement.Artifact] = explicitArtifacts, inclusions: Vector[sbt.librarymanagement.InclExclRule] = inclusions, exclusions: Vector[sbt.librarymanagement.InclExclRule] = exclusions, extraAttributes: Map[String, String] = extraAttributes, crossVersion: sbt.librarymanagement.CrossVersion = crossVersion, branchName: Option[String] = branchName, platformOpt: Option[String] = platformOpt): ModuleID = { + private def copy(organization: String = organization, name: String = name, revision: String = revision, configurations: Option[String] = configurations, isChanging: Boolean = isChanging, isTransitive: Boolean = isTransitive, isForce: Boolean = isForce, explicitArtifacts: Vector[sbt.librarymanagement.Artifact] = explicitArtifacts, inclusions: Vector[sbt.librarymanagement.InclExclRule] = inclusions, exclusions: Vector[sbt.librarymanagement.InclExclRule] = exclusions, extraAttributes: Map[String, String] = extraAttributes, crossVersion: sbt.librarymanagement.CrossVersion = crossVersion, branchName: Option[String] = branchName, platformOpt: Option[String] = platformOpt): ModuleID = { new ModuleID(organization, name, revision, configurations, isChanging, isTransitive, isForce, explicitArtifacts, inclusions, exclusions, extraAttributes, crossVersion, branchName, platformOpt) } def withOrganization(organization: String): ModuleID = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleIDFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleIDFormats.scala index 62e93e147..f72f151b7 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleIDFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleIDFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala index 46f2d6f7f..e445fa46c 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfo.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -28,7 +28,7 @@ final class ModuleInfo private ( override def toString: String = { "ModuleInfo(" + nameFormal + ", " + description + ", " + homepage + ", " + startYear + ", " + licenses + ", " + organizationName + ", " + organizationHomepage + ", " + scmInfo + ", " + developers + ")" } - private[this] def copy(nameFormal: String = nameFormal, description: String = description, homepage: Option[java.net.URI] = homepage, startYear: Option[Int] = startYear, licenses: Vector[scala.Tuple2[String, java.net.URI]] = licenses, organizationName: String = organizationName, organizationHomepage: Option[java.net.URI] = organizationHomepage, scmInfo: Option[sbt.librarymanagement.ScmInfo] = scmInfo, developers: Vector[sbt.librarymanagement.Developer] = developers): ModuleInfo = { + private def copy(nameFormal: String = nameFormal, description: String = description, homepage: Option[java.net.URI] = homepage, startYear: Option[Int] = startYear, licenses: Vector[scala.Tuple2[String, java.net.URI]] = licenses, organizationName: String = organizationName, organizationHomepage: Option[java.net.URI] = organizationHomepage, scmInfo: Option[sbt.librarymanagement.ScmInfo] = scmInfo, developers: Vector[sbt.librarymanagement.Developer] = developers): ModuleInfo = { new ModuleInfo(nameFormal, description, homepage, startYear, licenses, organizationName, organizationHomepage, scmInfo, developers) } def withNameFormal(nameFormal: String): ModuleInfo = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala index aa586ebca..a5ce87a6d 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReport.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReport.scala index 2c3386942..d3c068f03 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReport.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReport.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -41,7 +41,7 @@ final class ModuleReport private ( s"\t\t$module: " + (if (arts.size <= 1) "" else "\n\t\t\t") + arts.mkString("\n\t\t\t") + "\n" } - private[this] def copy(module: sbt.librarymanagement.ModuleID = module, artifacts: Vector[scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]] = artifacts, missingArtifacts: Vector[sbt.librarymanagement.Artifact] = missingArtifacts, status: Option[String] = status, publicationDate: Option[java.util.Calendar] = publicationDate, resolver: Option[String] = resolver, artifactResolver: Option[String] = artifactResolver, evicted: Boolean = evicted, evictedData: Option[String] = evictedData, evictedReason: Option[String] = evictedReason, problem: Option[String] = problem, homepage: Option[String] = homepage, extraAttributes: Map[String, String] = extraAttributes, isDefault: Option[Boolean] = isDefault, branch: Option[String] = branch, configurations: Vector[sbt.librarymanagement.ConfigRef] = configurations, licenses: Vector[scala.Tuple2[String, Option[String]]] = licenses, callers: Vector[sbt.librarymanagement.Caller] = callers): ModuleReport = { + private def copy(module: sbt.librarymanagement.ModuleID = module, artifacts: Vector[scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]] = artifacts, missingArtifacts: Vector[sbt.librarymanagement.Artifact] = missingArtifacts, status: Option[String] = status, publicationDate: Option[java.util.Calendar] = publicationDate, resolver: Option[String] = resolver, artifactResolver: Option[String] = artifactResolver, evicted: Boolean = evicted, evictedData: Option[String] = evictedData, evictedReason: Option[String] = evictedReason, problem: Option[String] = problem, homepage: Option[String] = homepage, extraAttributes: Map[String, String] = extraAttributes, isDefault: Option[Boolean] = isDefault, branch: Option[String] = branch, configurations: Vector[sbt.librarymanagement.ConfigRef] = configurations, licenses: Vector[scala.Tuple2[String, Option[String]]] = licenses, callers: Vector[sbt.librarymanagement.Caller] = callers): ModuleReport = { new ModuleReport(module, artifacts, missingArtifacts, status, publicationDate, resolver, artifactResolver, evicted, evictedData, evictedReason, problem, homepage, extraAttributes, isDefault, branch, configurations, licenses, callers) } def withModule(module: sbt.librarymanagement.ModuleID): ModuleReport = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReportFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReportFormats.scala index 43d2a196f..5b4a857a8 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReportFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleReportFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettings.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettings.scala index 5fac9f2f3..f00b13b1e 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettings.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettings.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettingsFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettingsFormats.scala index f72bc1a96..d5fc3f90e 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettingsFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettingsFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReport.scala b/core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReport.scala index 83624f2c8..63c47a3cf 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReport.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReport.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -33,7 +33,7 @@ final class OrganizationArtifactReport private ( val details = modules map { _.detailReport } s"\t$organization:$name\n${details.mkString}\n" } - private[this] def copy(organization: String = organization, name: String = name, modules: Vector[sbt.librarymanagement.ModuleReport] = modules): OrganizationArtifactReport = { + private def copy(organization: String = organization, name: String = name, modules: Vector[sbt.librarymanagement.ModuleReport] = modules): OrganizationArtifactReport = { new OrganizationArtifactReport(organization, name, modules) } def withOrganization(organization: String): OrganizationArtifactReport = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReportFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReportFormats.scala index 2744325a2..5abf84766 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReportFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReportFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthentication.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthentication.scala index 56a07dc60..3d563a657 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthentication.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthentication.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -20,7 +20,7 @@ final class PasswordAuthentication private ( override def toString: String = { "PasswordAuthentication(" + user + ", " + password + ")" } - private[this] def copy(user: String = user, password: Option[String] = password): PasswordAuthentication = { + private def copy(user: String = user, password: Option[String] = password): PasswordAuthentication = { new PasswordAuthentication(user, password) } def withUser(user: String): PasswordAuthentication = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthenticationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthenticationFormats.scala index 646853d49..e88a93263 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthenticationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthenticationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Patterns.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Patterns.scala index a87caca63..59704ad8c 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/Patterns.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/Patterns.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -24,7 +24,7 @@ final class Patterns private ( "Patterns(ivyPatterns=%s, artifactPatterns=%s, isMavenCompatible=%s, descriptorOptional=%s, skipConsistencyCheck=%s)".format( ivyPatterns, artifactPatterns, isMavenCompatible, descriptorOptional, skipConsistencyCheck) } - private[this] def copy(ivyPatterns: Vector[String] = ivyPatterns, artifactPatterns: Vector[String] = artifactPatterns, isMavenCompatible: Boolean = isMavenCompatible, descriptorOptional: Boolean = descriptorOptional, skipConsistencyCheck: Boolean = skipConsistencyCheck): Patterns = { + private def copy(ivyPatterns: Vector[String] = ivyPatterns, artifactPatterns: Vector[String] = artifactPatterns, isMavenCompatible: Boolean = isMavenCompatible, descriptorOptional: Boolean = descriptorOptional, skipConsistencyCheck: Boolean = skipConsistencyCheck): Patterns = { new Patterns(ivyPatterns, artifactPatterns, isMavenCompatible, descriptorOptional, skipConsistencyCheck) } def withIvyPatterns(ivyPatterns: Vector[String]): Patterns = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepository.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepository.scala index 494baf2e4..1375a9d55 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepository.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepository.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala index 843e70f3d..35ca96912 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsFormats.scala index fe190bc92..371467cd2 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PomConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PomConfiguration.scala index 441ce8b64..e00bbd295 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PomConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PomConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -22,7 +22,7 @@ final class PomConfiguration private ( override def toString: String = { "PomConfiguration(" + validate + ", " + scalaModuleInfo + ", " + file + ", " + autoScalaTools + ")" } - private[this] def copy(validate: Boolean = validate, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo] = scalaModuleInfo, file: java.io.File = file, autoScalaTools: Boolean = autoScalaTools): PomConfiguration = { + private def copy(validate: Boolean = validate, scalaModuleInfo: Option[sbt.librarymanagement.ScalaModuleInfo] = scalaModuleInfo, file: java.io.File = file, autoScalaTools: Boolean = autoScalaTools): PomConfiguration = { new PomConfiguration(validate, scalaModuleInfo, file, autoScalaTools) } def withValidate(validate: Boolean): PomConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PomConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PomConfigurationFormats.scala index 229957379..12e9921f9 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PomConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PomConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfiguration.scala index 63864882c..5ec1686d6 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -27,7 +27,7 @@ final class PublishConfiguration private ( override def toString: String = { "PublishConfiguration(" + publishMavenStyle + ", " + deliverIvyPattern + ", " + status + ", " + configurations + ", " + resolverName + ", " + artifacts + ", " + checksums + ", " + logging + ", " + overwrite + ")" } - private[this] def copy(publishMavenStyle: Boolean = publishMavenStyle, deliverIvyPattern: Option[String] = deliverIvyPattern, status: Option[String] = status, configurations: Option[scala.Vector[sbt.librarymanagement.ConfigRef]] = configurations, resolverName: Option[String] = resolverName, artifacts: Vector[scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]] = artifacts, checksums: scala.Vector[String] = checksums, logging: Option[sbt.librarymanagement.UpdateLogging] = logging, overwrite: Boolean = overwrite): PublishConfiguration = { + private def copy(publishMavenStyle: Boolean = publishMavenStyle, deliverIvyPattern: Option[String] = deliverIvyPattern, status: Option[String] = status, configurations: Option[scala.Vector[sbt.librarymanagement.ConfigRef]] = configurations, resolverName: Option[String] = resolverName, artifacts: Vector[scala.Tuple2[sbt.librarymanagement.Artifact, java.io.File]] = artifacts, checksums: scala.Vector[String] = checksums, logging: Option[sbt.librarymanagement.UpdateLogging] = logging, overwrite: Boolean = overwrite): PublishConfiguration = { new PublishConfiguration(publishMavenStyle, deliverIvyPattern, status, configurations, resolverName, artifacts, checksums, logging, overwrite) } def withPublishMavenStyle(publishMavenStyle: Boolean): PublishConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala index d1fde3d18..05bebe5bd 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/Resolver.scala b/core/src/main/contraband-scala/sbt/librarymanagement/Resolver.scala index 13c57e0d6..08578e95f 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/Resolver.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/Resolver.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala index 5569ef568..0ca52cf48 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfiguration.scala index 1aa3a2e22..982252da3 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -23,7 +23,7 @@ final class RetrieveConfiguration private ( override def toString: String = { "RetrieveConfiguration(" + retrieveDirectory + ", " + outputPattern + ", " + sync + ", " + configurationsToRetrieve + ")" } - private[this] def copy(retrieveDirectory: Option[java.io.File] = retrieveDirectory, outputPattern: Option[String] = outputPattern, sync: Boolean = sync, configurationsToRetrieve: Option[scala.Vector[sbt.librarymanagement.ConfigRef]] = configurationsToRetrieve): RetrieveConfiguration = { + private def copy(retrieveDirectory: Option[java.io.File] = retrieveDirectory, outputPattern: Option[String] = outputPattern, sync: Boolean = sync, configurationsToRetrieve: Option[scala.Vector[sbt.librarymanagement.ConfigRef]] = configurationsToRetrieve): RetrieveConfiguration = { new RetrieveConfiguration(retrieveDirectory, outputPattern, sync, configurationsToRetrieve) } def withRetrieveDirectory(retrieveDirectory: Option[java.io.File]): RetrieveConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfigurationFormats.scala index 9505bf2ef..64c423a25 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfo.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfo.scala index 0e4db8751..f373016c3 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfo.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfo.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -28,7 +28,7 @@ final class ScalaModuleInfo private ( override def toString: String = { "ScalaModuleInfo(" + scalaFullVersion + ", " + scalaBinaryVersion + ", " + configurations + ", " + checkExplicit + ", " + filterImplicit + ", " + overrideScalaVersion + ", " + scalaOrganization + ", " + scalaArtifacts + ", " + platform + ")" } - private[this] def copy(scalaFullVersion: String = scalaFullVersion, scalaBinaryVersion: String = scalaBinaryVersion, configurations: Vector[sbt.librarymanagement.Configuration] = configurations, checkExplicit: Boolean = checkExplicit, filterImplicit: Boolean = filterImplicit, overrideScalaVersion: Boolean = overrideScalaVersion, scalaOrganization: String = scalaOrganization, scalaArtifacts: scala.Vector[String] = scalaArtifacts, platform: Option[String] = platform): ScalaModuleInfo = { + private def copy(scalaFullVersion: String = scalaFullVersion, scalaBinaryVersion: String = scalaBinaryVersion, configurations: Vector[sbt.librarymanagement.Configuration] = configurations, checkExplicit: Boolean = checkExplicit, filterImplicit: Boolean = filterImplicit, overrideScalaVersion: Boolean = overrideScalaVersion, scalaOrganization: String = scalaOrganization, scalaArtifacts: scala.Vector[String] = scalaArtifacts, platform: Option[String] = platform): ScalaModuleInfo = { new ScalaModuleInfo(scalaFullVersion, scalaBinaryVersion, configurations, checkExplicit, filterImplicit, overrideScalaVersion, scalaOrganization, scalaArtifacts, platform) } def withScalaFullVersion(scalaFullVersion: String): ScalaModuleInfo = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfoFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfoFormats.scala index 2c2602605..6c5846248 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfoFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfoFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala index f91a5bbf1..20dc4dcb6 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfo.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -22,7 +22,7 @@ final class ScmInfo private ( override def toString: String = { "ScmInfo(" + browseUrl + ", " + connection + ", " + devConnection + ")" } - private[this] def copy(browseUrl: java.net.URI = browseUrl, connection: String = connection, devConnection: Option[String] = devConnection): ScmInfo = { + private def copy(browseUrl: java.net.URI = browseUrl, connection: String = connection, devConnection: Option[String] = devConnection): ScmInfo = { new ScmInfo(browseUrl, connection, devConnection) } def withBrowseUrl(browseUrl: java.net.URI): ScmInfo = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala index 70e7f40f0..6cc7e8931 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SemanticSelector.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SemanticSelector.scala index 6ebc65a99..9bf64431f 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SemanticSelector.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SemanticSelector.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -73,7 +73,7 @@ final class SemanticSelector private ( override def toString: String = { selectors.map(_.toString).mkString(" || ") } - private[this] def copy(selectors: Seq[sbt.internal.librarymanagement.SemSelAndChunk] = selectors): SemanticSelector = { + private def copy(selectors: Seq[sbt.internal.librarymanagement.SemSelAndChunk] = selectors): SemanticSelector = { new SemanticSelector(selectors) } def withSelectors(selectors: Seq[sbt.internal.librarymanagement.SemSelAndChunk]): SemanticSelector = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepository.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepository.scala index b20a2f25b..2ebf67d4c 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepository.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepository.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -23,7 +23,7 @@ final class SftpRepository private ( override def toString: String = { "SftpRepository(" + name + ", " + patterns + ", " + connection + ")" } - private[this] def copy(name: String = name, patterns: sbt.librarymanagement.Patterns = patterns, connection: sbt.librarymanagement.SshConnection = connection): SftpRepository = { + private def copy(name: String = name, patterns: sbt.librarymanagement.Patterns = patterns, connection: sbt.librarymanagement.SshConnection = connection): SftpRepository = { new SftpRepository(name, patterns, connection) } def withName(name: String): SftpRepository = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala index 9441ada31..747fdc2a4 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshAuthentication.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshAuthentication.scala index eaeb29bf5..33b5f2654 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshAuthentication.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshAuthentication.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshAuthenticationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshAuthenticationFormats.scala index 2783143ec..1935b7363 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshAuthenticationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshAuthenticationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepository.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepository.scala index ec3af1b7a..a066c7015 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepository.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepository.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala index 8143d7239..ec8ea2a79 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshConnection.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshConnection.scala index 68161ac8c..632fffb3b 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshConnection.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshConnection.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -21,7 +21,7 @@ final class SshConnection private ( override def toString: String = { "SshConnection(" + authentication + ", " + hostname + ", " + port + ")" } - private[this] def copy(authentication: Option[sbt.librarymanagement.SshAuthentication] = authentication, hostname: Option[String] = hostname, port: Option[Int] = port): SshConnection = { + private def copy(authentication: Option[sbt.librarymanagement.SshAuthentication] = authentication, hostname: Option[String] = hostname, port: Option[Int] = port): SshConnection = { new SshConnection(authentication, hostname, port) } def withAuthentication(authentication: Option[sbt.librarymanagement.SshAuthentication]): SshConnection = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala index 9daea2940..f1446ee38 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshRepository.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshRepository.scala index 0c7a4c5ef..b449de685 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshRepository.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshRepository.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -24,7 +24,7 @@ final class SshRepository private ( override def toString: String = { "SshRepository(" + name + ", " + patterns + ", " + connection + ", " + publishPermissions + ")" } - private[this] def copy(name: String = name, patterns: sbt.librarymanagement.Patterns = patterns, connection: sbt.librarymanagement.SshConnection = connection, publishPermissions: Option[String] = publishPermissions): SshRepository = { + private def copy(name: String = name, patterns: sbt.librarymanagement.Patterns = patterns, connection: sbt.librarymanagement.SshConnection = connection, publishPermissions: Option[String] = publishPermissions): SshRepository = { new SshRepository(name, patterns, connection, publishPermissions) } def withName(name: String): SshRepository = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala index 861d359b1..d4008f221 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/URLRepository.scala b/core/src/main/contraband-scala/sbt/librarymanagement/URLRepository.scala index 6bdb70fd2..6cb18955d 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/URLRepository.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/URLRepository.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -21,7 +21,7 @@ final class URLRepository private ( override def toString: String = { "URLRepository(" + name + ", " + patterns + ", " + allowInsecureProtocol + ")" } - private[this] def copy(name: String = name, patterns: sbt.librarymanagement.Patterns = patterns, allowInsecureProtocol: Boolean = allowInsecureProtocol): URLRepository = { + private def copy(name: String = name, patterns: sbt.librarymanagement.Patterns = patterns, allowInsecureProtocol: Boolean = allowInsecureProtocol): URLRepository = { new URLRepository(name, patterns, allowInsecureProtocol) } def withName(name: String): URLRepository = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/URLRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/URLRepositoryFormats.scala index d9bb6f32b..ed25f6e37 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/URLRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/URLRepositoryFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfiguration.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfiguration.scala index 69b7e6968..271b32810 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfiguration.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -35,7 +35,7 @@ final class UpdateConfiguration private ( override def toString: String = { "UpdateConfiguration(" + retrieveManaged + ", " + missingOk + ", " + logging + ", " + logicalClock + ", " + metadataDirectory + ", " + artifactFilter + ", " + offline + ", " + frozen + ")" } - private[this] def copy(retrieveManaged: Option[sbt.librarymanagement.RetrieveConfiguration] = retrieveManaged, missingOk: Boolean = missingOk, logging: sbt.librarymanagement.UpdateLogging = logging, logicalClock: sbt.librarymanagement.LogicalClock = logicalClock, metadataDirectory: Option[java.io.File] = metadataDirectory, artifactFilter: Option[sbt.librarymanagement.ArtifactTypeFilter] = artifactFilter, offline: Boolean = offline, frozen: Boolean = frozen): UpdateConfiguration = { + private def copy(retrieveManaged: Option[sbt.librarymanagement.RetrieveConfiguration] = retrieveManaged, missingOk: Boolean = missingOk, logging: sbt.librarymanagement.UpdateLogging = logging, logicalClock: sbt.librarymanagement.LogicalClock = logicalClock, metadataDirectory: Option[java.io.File] = metadataDirectory, artifactFilter: Option[sbt.librarymanagement.ArtifactTypeFilter] = artifactFilter, offline: Boolean = offline, frozen: Boolean = frozen): UpdateConfiguration = { new UpdateConfiguration(retrieveManaged, missingOk, logging, logicalClock, metadataDirectory, artifactFilter, offline, frozen) } def withRetrieveManaged(retrieveManaged: Option[sbt.librarymanagement.RetrieveConfiguration]): UpdateConfiguration = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfigurationFormats.scala index 70f7d3994..c0a53f9d7 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateLogging.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateLogging.scala index ee1db908a..0448648e4 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateLogging.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateLogging.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateLoggingFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateLoggingFormats.scala index 8da04c8ee..483456509 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateLoggingFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateLoggingFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReport.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReport.scala index 3e8bcbe1a..fd783d6f9 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReport.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReport.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -30,7 +30,7 @@ final class UpdateReport private ( override def toString: String = { "Update report:\n\t" + stats + "\n" + configurations.mkString } - private[this] def copy(cachedDescriptor: java.io.File = cachedDescriptor, configurations: Vector[sbt.librarymanagement.ConfigurationReport] = configurations, stats: sbt.librarymanagement.UpdateStats = stats, stamps: Map[String, Long] = stamps): UpdateReport = { + private def copy(cachedDescriptor: java.io.File = cachedDescriptor, configurations: Vector[sbt.librarymanagement.ConfigurationReport] = configurations, stats: sbt.librarymanagement.UpdateStats = stats, stamps: Map[String, Long] = stamps): UpdateReport = { new UpdateReport(cachedDescriptor, configurations, stats, stamps) } def withCachedDescriptor(cachedDescriptor: java.io.File): UpdateReport = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala index 36ea7c27a..72d5526a8 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportLiteFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportLiteFormats.scala index f28ed6713..eab0ecc23 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportLiteFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportLiteFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateStats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateStats.scala index a2ea73ced..caf69b88d 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateStats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateStats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -22,7 +22,7 @@ final class UpdateStats private ( override def toString: String = { Seq("Resolve time: " + resolveTime + " ms", "Download time: " + downloadTime + " ms", "Download size: " + downloadSize + " bytes").mkString(", ") } - private[this] def copy(resolveTime: Long = resolveTime, downloadTime: Long = downloadTime, downloadSize: Long = downloadSize, cached: Boolean = cached): UpdateStats = { + private def copy(resolveTime: Long = resolveTime, downloadTime: Long = downloadTime, downloadSize: Long = downloadSize, cached: Boolean = cached): UpdateStats = { new UpdateStats(resolveTime, downloadTime, downloadSize, cached) } def withResolveTime(resolveTime: Long): UpdateStats = { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateStatsFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateStatsFormats.scala index 7457c7a23..72ace0898 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateStatsFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateStatsFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/project/plugins.sbt b/project/plugins.sbt index e671db810..65ae50320 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,6 +2,6 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3") +addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.6.0") scalacOptions += "-language:postfixOps" From b048b24864a37b7e44612293b7ad972b56f17c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Tue, 8 Oct 2024 00:25:52 +0100 Subject: [PATCH 2/4] upgrade and enable contraband in ivy project --- build.sbt | 2 +- .../sbt/librarymanagement/ivy/ExternalIvyConfiguration.scala | 4 ++-- .../ivy/ExternalIvyConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/ivy/InlineIvyConfiguration.scala | 4 ++-- .../librarymanagement/ivy/InlineIvyConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/ivy/IvyConfiguration.scala | 2 +- .../sbt/librarymanagement/ivy/IvyConfigurationFormats.scala | 2 +- .../contraband-scala/sbt/librarymanagement/ivy/IvyPaths.scala | 4 ++-- .../sbt/librarymanagement/ivy/IvyPathsFormats.scala | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.sbt b/build.sbt index 0453c258e..232a80051 100644 --- a/build.sbt +++ b/build.sbt @@ -274,7 +274,7 @@ lazy val lmCore = (project in file("core")) .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache, addSbtCompilerInterface) lazy val lmIvy = (project in file("ivy")) - // .enablePlugins(ContrabandPlugin, JsonCodecPlugin) + .enablePlugins(ContrabandPlugin, JsonCodecPlugin) .dependsOn(lmCore) .settings( commonSettings, 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 d99050794..1eaff6620 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfiguration.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -24,7 +24,7 @@ final class ExternalIvyConfiguration private ( override def toString: String = { "ExternalIvyConfiguration(" + lock + ", " + log + ", " + updateOptions + ", " + baseDirectory + ", " + uri + ", " + extraResolvers + ")" } - private[this] def copy(lock: Option[xsbti.GlobalLock] = lock, log: Option[xsbti.Logger] = log, updateOptions: sbt.librarymanagement.ivy.UpdateOptions = updateOptions, baseDirectory: Option[java.io.File] = baseDirectory, uri: Option[java.net.URI] = uri, extraResolvers: Vector[sbt.librarymanagement.Resolver] = extraResolvers): ExternalIvyConfiguration = { + private def copy(lock: Option[xsbti.GlobalLock] = lock, log: Option[xsbti.Logger] = log, updateOptions: sbt.librarymanagement.ivy.UpdateOptions = updateOptions, baseDirectory: Option[java.io.File] = baseDirectory, uri: Option[java.net.URI] = uri, extraResolvers: Vector[sbt.librarymanagement.Resolver] = extraResolvers): ExternalIvyConfiguration = { new ExternalIvyConfiguration(lock, log, updateOptions, baseDirectory, uri, extraResolvers) } def withLock(lock: Option[xsbti.GlobalLock]): ExternalIvyConfiguration = { 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 553943e65..e7ad9b762 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY 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 5455978f7..470d796a3 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfiguration.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -28,7 +28,7 @@ final class InlineIvyConfiguration private ( override def toString: String = { "InlineIvyConfiguration(" + lock + ", " + log + ", " + updateOptions + ", " + paths + ", " + resolvers + ", " + otherResolvers + ", " + moduleConfigurations + ", " + checksums + ", " + managedChecksums + ", " + resolutionCacheDir + ")" } - private[this] def copy(lock: Option[xsbti.GlobalLock] = lock, log: Option[xsbti.Logger] = log, updateOptions: sbt.librarymanagement.ivy.UpdateOptions = updateOptions, paths: Option[sbt.librarymanagement.ivy.IvyPaths] = paths, resolvers: Vector[sbt.librarymanagement.Resolver] = resolvers, otherResolvers: Vector[sbt.librarymanagement.Resolver] = otherResolvers, moduleConfigurations: Vector[sbt.librarymanagement.ModuleConfiguration] = moduleConfigurations, checksums: Vector[String] = checksums, managedChecksums: Boolean = managedChecksums, resolutionCacheDir: Option[java.io.File] = resolutionCacheDir): InlineIvyConfiguration = { + private def copy(lock: Option[xsbti.GlobalLock] = lock, log: Option[xsbti.Logger] = log, updateOptions: sbt.librarymanagement.ivy.UpdateOptions = updateOptions, paths: Option[sbt.librarymanagement.ivy.IvyPaths] = paths, resolvers: Vector[sbt.librarymanagement.Resolver] = resolvers, otherResolvers: Vector[sbt.librarymanagement.Resolver] = otherResolvers, moduleConfigurations: Vector[sbt.librarymanagement.ModuleConfiguration] = moduleConfigurations, checksums: Vector[String] = checksums, managedChecksums: Boolean = managedChecksums, resolutionCacheDir: Option[java.io.File] = resolutionCacheDir): InlineIvyConfiguration = { new InlineIvyConfiguration(lock, log, updateOptions, paths, resolvers, otherResolvers, moduleConfigurations, checksums, managedChecksums, resolutionCacheDir) } def withLock(lock: Option[xsbti.GlobalLock]): InlineIvyConfiguration = { 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 22f92e099..0386a8d84 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfiguration.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfiguration.scala index c515b3747..d6b50e7a9 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfiguration.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfiguration.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY 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 324710d4f..2069fe236 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyPaths.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyPaths.scala index 74268a9d3..132cafe66 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyPaths.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyPaths.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY @@ -20,7 +20,7 @@ final class IvyPaths private ( override def toString: String = { "IvyPaths(" + baseDirectory + ", " + ivyHome + ")" } - private[this] def copy(baseDirectory: String = baseDirectory, ivyHome: Option[String] = ivyHome): IvyPaths = { + private def copy(baseDirectory: String = baseDirectory, ivyHome: Option[String] = ivyHome): IvyPaths = { new IvyPaths(baseDirectory, ivyHome) } def withBaseDirectory(baseDirectory: String): IvyPaths = { diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyPathsFormats.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyPathsFormats.scala index 1483f1d91..c62a0e30f 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyPathsFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyPathsFormats.scala @@ -1,5 +1,5 @@ /** - * This code is generated using [[https://www.scala-sbt.org/contraband/ sbt-contraband]]. + * This code is generated using [[https://www.scala-sbt.org/contraband]]. */ // DO NOT EDIT MANUALLY From 28adb99031714e6dfcd3b2d0a6cf5467387757bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Tue, 8 Oct 2024 00:55:45 +0100 Subject: [PATCH 3/4] use managedSourceDirectories --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 232a80051..2e6281252 100644 --- a/build.sbt +++ b/build.sbt @@ -143,7 +143,7 @@ lazy val lmCore = (project in file("core")) case v if v.startsWith("2.12.") => List("-Ywarn-unused:-locals,-explicits,-privates") case _ => List() }), - Compile / unmanagedSourceDirectories += + Compile / managedSourceDirectories += baseDirectory.value / "src" / "main" / "contraband-scala", Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-scala", Compile / generateContrabands / contrabandFormatsForType := DatatypeConfig.getFormats, @@ -288,7 +288,7 @@ lazy val lmIvy = (project in file("ivy")) scalaCheck % Test, scalaVerify % Test, ), - Compile / unmanagedSourceDirectories += + Compile / managedSourceDirectories += baseDirectory.value / "src" / "main" / "contraband-scala", Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-scala", Compile / generateContrabands / contrabandFormatsForType := DatatypeConfig.getFormats, From 8a21e0d9421fd56baacfa94e36f88fa4c96ff984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Tue, 8 Oct 2024 01:15:44 +0100 Subject: [PATCH 4/4] tweak SemComparator.expandWildcard to fix indentation --- .../librarymanagement/SemComparator.scala | 16 ++++++++-------- core/src/main/contraband/librarymanagement2.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala b/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala index ffe90a92a..61fd96ebf 100644 --- a/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala +++ b/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala @@ -12,15 +12,15 @@ final class SemComparator private ( val tags: Seq[String]) extends sbt.internal.librarymanagement.SemComparatorExtra with Serializable { def matches(version: sbt.librarymanagement.VersionNumber): Boolean = this.matchesImpl(version) def expandWildcard: Seq[SemComparator] = { - if (op == sbt.internal.librarymanagement.SemSelOperator.Eq && !allFieldsSpecified) { - Seq( - this.withOp(sbt.internal.librarymanagement.SemSelOperator.Gte), - this.withOp(sbt.internal.librarymanagement.SemSelOperator.Lte) - ) - } else { Seq(this) } + if (op == sbt.internal.librarymanagement.SemSelOperator.Eq && !allFieldsSpecified) + Seq( + this.withOp(sbt.internal.librarymanagement.SemSelOperator.Gte), + this.withOp(sbt.internal.librarymanagement.SemSelOperator.Lte) + ) + else Seq(this) } - - + + override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { case x: SemComparator => (this.op == x.op) && (this.major == x.major) && (this.minor == x.minor) && (this.patch == x.patch) && (this.tags == x.tags) case _ => false diff --git a/core/src/main/contraband/librarymanagement2.json b/core/src/main/contraband/librarymanagement2.json index ffdee8da4..5e955fa73 100644 --- a/core/src/main/contraband/librarymanagement2.json +++ b/core/src/main/contraband/librarymanagement2.json @@ -126,12 +126,12 @@ "extra": [ "def matches(version: sbt.librarymanagement.VersionNumber): Boolean = this.matchesImpl(version)", "def expandWildcard: Seq[SemComparator] = {", - " if (op == sbt.internal.librarymanagement.SemSelOperator.Eq && !allFieldsSpecified) {", + " if (op == sbt.internal.librarymanagement.SemSelOperator.Eq && !allFieldsSpecified)", " Seq(", " this.withOp(sbt.internal.librarymanagement.SemSelOperator.Gte),", " this.withOp(sbt.internal.librarymanagement.SemSelOperator.Lte)", " )", - " } else { Seq(this) }", + " else Seq(this)", "}" ], "extraCompanion": [