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] 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