From 610bbf1113dd82f01eacc38548fc81ccabfd173b Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 10:18:01 +0100 Subject: [PATCH 1/7] Minor tweaking --- .../coursier/sbtcoursier/DisplayTasks.scala | 55 +++++++++---------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala index ac4d23c95..a47caa085 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala @@ -33,44 +33,41 @@ object DisplayTasks { proj.copy(publications = publications) } - Def.taskDyn { + val resolutionsTask = + if (sbtClassifiers) + Def.task { + val currentProject = currentProjectTask.value + val classifiersRes = coursierSbtClassifiersResolution.value + Map(currentProject.configurations.keySet -> classifiersRes) + } + else + Def.task(coursierResolutions.value) + + Def.task { + + val currentProject = currentProjectTask.value val config = Configuration(configuration.value.name) val configs = coursierConfigurations.value val includedConfigs = configs.getOrElse(config, Set.empty) + config - Def.taskDyn { - val currentProject = currentProjectTask.value + val resolutions = resolutionsTask.value - val resolutionsTask = - if (sbtClassifiers) - Def.task { - val classifiersRes = coursierSbtClassifiersResolution.value - Map(currentProject.configurations.keySet -> classifiersRes) - } - else - Def.task(coursierResolutions.value) + for { + (subGraphConfigs, res) <- resolutions.toSeq + if subGraphConfigs.exists(includedConfigs) + } yield { - Def.task { - val resolutions = resolutionsTask.value - - for { - (subGraphConfigs, res) <- resolutions.toSeq - if subGraphConfigs.exists(includedConfigs) - } yield { - - val dependencies0 = currentProject.dependencies.collect { - case (cfg, dep) if includedConfigs(cfg) && subGraphConfigs(cfg) => dep - }.sortBy { dep => - (dep.module.organization, dep.module.name, dep.version) - } - - val subRes = res.subset(dependencies0.toSet) - - ResolutionResult(subGraphConfigs, subRes, dependencies0) - } + val dependencies0 = currentProject.dependencies.collect { + case (cfg, dep) if includedConfigs(cfg) && subGraphConfigs(cfg) => dep + }.sortBy { dep => + (dep.module.organization, dep.module.name, dep.version) } + + val subRes = res.subset(dependencies0.toSet) + + ResolutionResult(subGraphConfigs, subRes, dependencies0) } } } From 55f457a6f73f2919373cc8a2b89073af30c3d5f4 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 10:31:34 +0100 Subject: [PATCH 2/7] Add DependencyResolutionInterface implementation in lm-coursier Originally based on https://github.com/sbt/librarymanagement/pull/270 --- .travis.yml | 1 + build.sbt | 15 +- .../coursier/CoursierConfiguration.scala | 75 +++++++ .../CoursierConfigurationFormats.scala | 43 ++++ .../src/main/contraband/lm-coursier.json | 67 ++++++ .../CoursierDependencyResolution.scala | 209 ++++++++++++++++++ .../CoursierLibraryManagementCodec.scala | 12 + .../coursier/CoursierModuleDescriptor.scala | 24 ++ .../coursier/CoursierModuleSettings.scala | 5 + .../CustomLibraryManagementCodec.scala | 37 ++++ .../coursier/Resolvers.scala | 51 +++++ .../coursier/ResolutionSpec.scala | 166 ++++++++++++++ project/DatatypeConfig.scala | 75 +++++++ project/plugins.sbt | 1 + scripts/travis.sh | 15 +- 15 files changed, 793 insertions(+), 3 deletions(-) create mode 100644 modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala create mode 100644 modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala create mode 100644 modules/lm-coursier/src/main/contraband/lm-coursier.json create mode 100644 modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala create mode 100644 modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala create mode 100644 modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala create mode 100644 modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala create mode 100644 modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala create mode 100644 modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala create mode 100644 modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala create mode 100644 project/DatatypeConfig.scala diff --git a/.travis.yml b/.travis.yml index 98e82b35f..75061c45b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ jobs: - env: SBT_COURSIER=1 SBT_COURSIER_TEST_GROUP=2 - env: SBT_SHADING=1 - env: SBT_PGP_COURSIER=1 + - env: LM_COURSIER=1 - stage: release script: sbt ci-release branches: diff --git a/build.sbt b/build.sbt index 87d993210..c659064cb 100644 --- a/build.sbt +++ b/build.sbt @@ -19,14 +19,25 @@ val coursierVersion = "1.1.0-M8" lazy val `lm-coursier` = project .in(file("modules/lm-coursier")) + .enablePlugins(ContrabandPlugin, JsonCodecPlugin) .settings( shared, libraryDependencies ++= Seq( "io.get-coursier" %% "coursier" % coursierVersion, "io.get-coursier" %% "coursier-cache" % coursierVersion, "io.get-coursier" %% "coursier-extra" % coursierVersion, - "org.scala-sbt" %% "librarymanagement-core" % "1.0.2" - ) + // We depend on librarymanagement-ivy rather than just + // librarymanagement-core to handle the ModuleDescriptor passed + // to DependencyResolutionInterface.update, which is an + // IvySbt#Module (seems DependencyResolutionInterface.moduleDescriptor + // is ignored). + "org.scala-sbt" %% "librarymanagement-ivy" % "1.0.2", + "org.scalatest" %% "scalatest" % "3.0.5" % Test + ), + managedSourceDirectories in Compile += + baseDirectory.value / "src" / "main" / "contraband-scala", + sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala", + contrabandFormatsForType in generateContrabands in Compile := DatatypeConfig.getFormats ) lazy val `sbt-coursier` = project diff --git a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala b/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala new file mode 100644 index 000000000..9ee641e34 --- /dev/null +++ b/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala @@ -0,0 +1,75 @@ +/** + * This code is generated using [[http://www.scala-sbt.org/contraband/ sbt-contraband]]. + */ + +// DO NOT EDIT MANUALLY +package sbt.librarymanagement.coursier +final class CoursierConfiguration private ( + val log: Option[xsbti.Logger], + val resolvers: Vector[sbt.librarymanagement.Resolver], + val otherResolvers: Vector[sbt.librarymanagement.Resolver], + val reorderResolvers: Boolean, + val parallelDownloads: Int, + val maxIterations: Int, + val sbtScalaOrganization: Option[String], + val sbtScalaVersion: Option[String], + val sbtScalaJars: Vector[java.io.File]) extends Serializable { + + private def this() = this(None, sbt.librarymanagement.Resolver.defaults, Vector.empty, true, 6, 100, None, None, Vector.empty) + + override def equals(o: Any): Boolean = o match { + case x: CoursierConfiguration => (this.log == x.log) && (this.resolvers == x.resolvers) && (this.otherResolvers == x.otherResolvers) && (this.reorderResolvers == x.reorderResolvers) && (this.parallelDownloads == x.parallelDownloads) && (this.maxIterations == x.maxIterations) && (this.sbtScalaOrganization == x.sbtScalaOrganization) && (this.sbtScalaVersion == x.sbtScalaVersion) && (this.sbtScalaJars == x.sbtScalaJars) + case _ => false + } + override def hashCode: Int = { + 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "sbt.librarymanagement.coursier.CoursierConfiguration".##) + log.##) + resolvers.##) + otherResolvers.##) + reorderResolvers.##) + parallelDownloads.##) + maxIterations.##) + sbtScalaOrganization.##) + sbtScalaVersion.##) + sbtScalaJars.##) + } + override def toString: String = { + "CoursierConfiguration(" + log + ", " + resolvers + ", " + otherResolvers + ", " + reorderResolvers + ", " + parallelDownloads + ", " + maxIterations + ", " + sbtScalaOrganization + ", " + sbtScalaVersion + ", " + sbtScalaJars + ")" + } + private[this] def copy(log: Option[xsbti.Logger] = log, resolvers: Vector[sbt.librarymanagement.Resolver] = resolvers, otherResolvers: Vector[sbt.librarymanagement.Resolver] = otherResolvers, reorderResolvers: Boolean = reorderResolvers, parallelDownloads: Int = parallelDownloads, maxIterations: Int = maxIterations, sbtScalaOrganization: Option[String] = sbtScalaOrganization, sbtScalaVersion: Option[String] = sbtScalaVersion, sbtScalaJars: Vector[java.io.File] = sbtScalaJars): CoursierConfiguration = { + new CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, sbtScalaOrganization, sbtScalaVersion, sbtScalaJars) + } + def withLog(log: Option[xsbti.Logger]): CoursierConfiguration = { + copy(log = log) + } + def withLog(log: xsbti.Logger): CoursierConfiguration = { + copy(log = Option(log)) + } + def withResolvers(resolvers: Vector[sbt.librarymanagement.Resolver]): CoursierConfiguration = { + copy(resolvers = resolvers) + } + def withOtherResolvers(otherResolvers: Vector[sbt.librarymanagement.Resolver]): CoursierConfiguration = { + copy(otherResolvers = otherResolvers) + } + def withReorderResolvers(reorderResolvers: Boolean): CoursierConfiguration = { + copy(reorderResolvers = reorderResolvers) + } + def withParallelDownloads(parallelDownloads: Int): CoursierConfiguration = { + copy(parallelDownloads = parallelDownloads) + } + def withMaxIterations(maxIterations: Int): CoursierConfiguration = { + copy(maxIterations = maxIterations) + } + def withSbtScalaOrganization(sbtScalaOrganization: Option[String]): CoursierConfiguration = { + copy(sbtScalaOrganization = sbtScalaOrganization) + } + def withSbtScalaOrganization(sbtScalaOrganization: String): CoursierConfiguration = { + copy(sbtScalaOrganization = Option(sbtScalaOrganization)) + } + def withSbtScalaVersion(sbtScalaVersion: Option[String]): CoursierConfiguration = { + copy(sbtScalaVersion = sbtScalaVersion) + } + def withSbtScalaVersion(sbtScalaVersion: String): CoursierConfiguration = { + copy(sbtScalaVersion = Option(sbtScalaVersion)) + } + def withSbtScalaJars(sbtScalaJars: Vector[java.io.File]): CoursierConfiguration = { + copy(sbtScalaJars = sbtScalaJars) + } +} +object CoursierConfiguration { + + def apply(): CoursierConfiguration = new CoursierConfiguration() + def apply(log: Option[xsbti.Logger], resolvers: Vector[sbt.librarymanagement.Resolver], otherResolvers: Vector[sbt.librarymanagement.Resolver], reorderResolvers: Boolean, parallelDownloads: Int, maxIterations: Int, sbtScalaOrganization: Option[String], sbtScalaVersion: Option[String], sbtScalaJars: Vector[java.io.File]): CoursierConfiguration = new CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, sbtScalaOrganization, sbtScalaVersion, sbtScalaJars) + def apply(log: xsbti.Logger, resolvers: Vector[sbt.librarymanagement.Resolver], otherResolvers: Vector[sbt.librarymanagement.Resolver], reorderResolvers: Boolean, parallelDownloads: Int, maxIterations: Int, sbtScalaOrganization: String, sbtScalaVersion: String, sbtScalaJars: Vector[java.io.File]): CoursierConfiguration = new CoursierConfiguration(Option(log), resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, Option(sbtScalaOrganization), Option(sbtScalaVersion), sbtScalaJars) +} diff --git a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala b/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala new file mode 100644 index 000000000..0dc5733b2 --- /dev/null +++ b/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala @@ -0,0 +1,43 @@ +/** + * This code is generated using [[http://www.scala-sbt.org/contraband/ sbt-contraband]]. + */ + +// DO NOT EDIT MANUALLY +package sbt.librarymanagement.coursier +import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } +trait CoursierConfigurationFormats { self: sbt.internal.librarymanagement.formats.LoggerFormat with sbt.librarymanagement.ResolverFormats with sjsonnew.BasicJsonProtocol => +implicit lazy val CoursierConfigurationFormat: JsonFormat[sbt.librarymanagement.coursier.CoursierConfiguration] = new JsonFormat[sbt.librarymanagement.coursier.CoursierConfiguration] { + override def read[J](jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.coursier.CoursierConfiguration = { + jsOpt match { + case Some(js) => + unbuilder.beginObject(js) + val log = unbuilder.readField[Option[xsbti.Logger]]("log") + val resolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("resolvers") + val otherResolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("otherResolvers") + val reorderResolvers = unbuilder.readField[Boolean]("reorderResolvers") + val parallelDownloads = unbuilder.readField[Int]("parallelDownloads") + val maxIterations = unbuilder.readField[Int]("maxIterations") + val sbtScalaOrganization = unbuilder.readField[Option[String]]("sbtScalaOrganization") + val sbtScalaVersion = unbuilder.readField[Option[String]]("sbtScalaVersion") + val sbtScalaJars = unbuilder.readField[Vector[java.io.File]]("sbtScalaJars") + unbuilder.endObject() + sbt.librarymanagement.coursier.CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, sbtScalaOrganization, sbtScalaVersion, sbtScalaJars) + case None => + deserializationError("Expected JsObject but found None") + } + } + override def write[J](obj: sbt.librarymanagement.coursier.CoursierConfiguration, builder: Builder[J]): Unit = { + builder.beginObject() + builder.addField("log", obj.log) + builder.addField("resolvers", obj.resolvers) + builder.addField("otherResolvers", obj.otherResolvers) + builder.addField("reorderResolvers", obj.reorderResolvers) + builder.addField("parallelDownloads", obj.parallelDownloads) + builder.addField("maxIterations", obj.maxIterations) + builder.addField("sbtScalaOrganization", obj.sbtScalaOrganization) + builder.addField("sbtScalaVersion", obj.sbtScalaVersion) + builder.addField("sbtScalaJars", obj.sbtScalaJars) + builder.endObject() + } +} +} diff --git a/modules/lm-coursier/src/main/contraband/lm-coursier.json b/modules/lm-coursier/src/main/contraband/lm-coursier.json new file mode 100644 index 000000000..a5c7351ee --- /dev/null +++ b/modules/lm-coursier/src/main/contraband/lm-coursier.json @@ -0,0 +1,67 @@ +{ + "codecNamespace": "sbt.librarymanagement.coursier", + "types": [ + { + "name": "CoursierConfiguration", + "namespace": "sbt.librarymanagement.coursier", + "target": "Scala", + "type": "record", + "fields": [ + { + "name": "log", + "type": "xsbti.Logger?", + "default": "None", + "since": "0.0.1" + }, + { + "name": "resolvers", + "type": "sbt.librarymanagement.Resolver*", + "default": "sbt.librarymanagement.Resolver.defaults", + "since": "0.0.1" + }, + { + "name": "otherResolvers", + "type": "sbt.librarymanagement.Resolver*", + "default": "Vector.empty", + "since": "0.0.1" + }, + { + "name": "reorderResolvers", + "type": "Boolean", + "default": "true", + "since": "0.0.1" + }, + { + "name": "parallelDownloads", + "type": "Int", + "default": "6", + "since": "0.0.1" + }, + { + "name": "maxIterations", + "type": "Int", + "default": "100", + "since": "0.0.1" + }, + { + "name": "sbtScalaOrganization", + "type": "String?", + "default": "None", + "since": "0.0.1" + }, + { + "name": "sbtScalaVersion", + "type": "String?", + "default": "None", + "since": "0.0.1" + }, + { + "name": "sbtScalaJars", + "type": "java.io.File*", + "default": "Vector.empty", + "since": "0.0.1" + } + ] + } + ] +} diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala new file mode 100644 index 000000000..61c5e1691 --- /dev/null +++ b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala @@ -0,0 +1,209 @@ +package sbt.librarymanagement.coursier + +import java.io.{File, OutputStreamWriter} + +import _root_.coursier.{Artifact, Cache, CachePolicy, FileError, Organization, Project, Resolution, TermDisplay, organizationString} +import _root_.coursier.core.Configuration +import _root_.coursier.ivy.IvyRepository +import _root_.coursier.sbtcoursier.{ArtifactsParams, ArtifactsRun, FromSbt, Inputs, InterProjectRepository, ResolutionError, ResolutionParams, ResolutionRun, SbtBootJars, UpdateParams, UpdateRun} +import sbt.internal.librarymanagement.IvySbt +import sbt.librarymanagement._ +import sbt.util.Logger + +class CoursierDependencyResolution(conf: CoursierConfiguration) extends DependencyResolutionInterface { + + private def sbtBinaryVersion = "1.0" + + lazy val resolvers = + if (conf.reorderResolvers) + ResolutionParams.reorderResolvers(conf.resolvers) + else + conf.resolvers + + def moduleDescriptor(moduleSetting: ModuleDescriptorConfiguration): CoursierModuleDescriptor = + CoursierModuleDescriptor(moduleSetting, conf) + + def update( + module: ModuleDescriptor, + configuration: UpdateConfiguration, + uwconfig: UnresolvedWarningConfiguration, + log: Logger + ): Either[UnresolvedWarning, UpdateReport] = { + + // TODO Take stuff in configuration into account? uwconfig too? + + val module0 = module match { + case c: CoursierModuleDescriptor => + // seems not to happen, not sure what DependencyResolutionInterface.moduleDescriptor is for + c.descriptor + case i: IvySbt#Module => + i.moduleSettings match { + case d: ModuleDescriptorConfiguration => d + case other => sys.error(s"unrecognized module settings: $other") + } + case _ => + sys.error(s"unrecognized ModuleDescriptor type: $module") + } + + val so = module0.scalaModuleInfo.fold(org"org.scala-lang")(m => Organization(m.scalaOrganization)) + val sv = module0.scalaModuleInfo.map(_.scalaFullVersion) + // FIXME Manage to do stuff below without a scala version? + .getOrElse(scala.util.Properties.versionNumberString) + + val sbv = module0.scalaModuleInfo.map(_.scalaBinaryVersion).getOrElse { + sv.split('.').take(2).mkString(".") + } + + val verbosityLevel = 0 + + val ttl = Cache.defaultTtl + val createLogger = { () => + new TermDisplay(new OutputStreamWriter(System.err), fallbackMode = true) + } + val cache = Cache.default + val cachePolicies = CachePolicy.default + val checksums = Cache.defaultChecksums + val projectName = "" // used for logging only… + + val ivyProperties = ResolutionParams.defaultIvyProperties() + + val mainRepositories = resolvers + .flatMap { resolver => + FromSbt.repository( + resolver, + ivyProperties, + log, + None // FIXME What about authentication? + ) + } + + val globalPluginsRepos = + for (p <- ResolutionParams.globalPluginPatterns(sbtBinaryVersion)) + yield IvyRepository.fromPattern( + p, + withChecksums = false, + withSignatures = false, + withArtifacts = false + ) + + val interProjectDependencies: Seq[Project] = Nil // TODO Don't use Nil here + val interProjectRepo = InterProjectRepository(interProjectDependencies) + + val internalRepositories = globalPluginsRepos :+ interProjectRepo + + val dependencies = module0.dependencies.flatMap { d => + // crossVersion already taken into account, wiping it here + val d0 = d.withCrossVersion(CrossVersion.Disabled()) + FromSbt.dependencies(d0, sv, sbv) + } + + val configGraphs = Inputs.ivyGraphs( + Inputs.configExtends(module0.configurations) + ) + + val resolutionParams = ResolutionParams( + dependencies = dependencies, + fallbackDependencies = Nil, + configGraphs = configGraphs, + autoScalaLib = true, + mainRepositories = mainRepositories, + parentProjectCache = Map.empty, + interProjectDependencies = interProjectDependencies, + internalRepositories = internalRepositories, + userEnabledProfiles = Set.empty, + userForceVersions = Map.empty, + typelevel = false, + so = so, + sv = sv, + sbtClassifiers = false, + parallelDownloads = conf.parallelDownloads, + projectName = projectName, + maxIterations = conf.maxIterations, + createLogger = createLogger, + cache = cache, + cachePolicies = cachePolicies, + ttl = ttl, + checksums = checksums + ) + + def artifactsParams(resolutions: Map[Set[Configuration], Resolution]) = + ArtifactsParams( + classifiers = None, + res = resolutions.values.toSeq, + includeSignatures = false, + parallelDownloads = conf.parallelDownloads, + createLogger = createLogger, + cache = cache, + artifactsChecksums = checksums, + ttl = ttl, + cachePolicies = cachePolicies, + projectName = projectName, + sbtClassifiers = false + ) + + val sbtBootJarOverrides = SbtBootJars( + conf.sbtScalaOrganization.fold(org"org.scala-lang")(Organization(_)), + conf.sbtScalaVersion.getOrElse(sv), + conf.sbtScalaJars + ) + + val configs = Inputs.coursierConfigurations(module0.configurations) + + def updateParams( + resolutions: Map[Set[Configuration], Resolution], + artifacts: Map[Artifact, Either[FileError, File]] + ) = + UpdateParams( + shadedConfigOpt = None, + artifacts = artifacts, + classifiers = None, + configs = configs, + dependencies = dependencies, + res = resolutions, + ignoreArtifactErrors = false, + includeSignatures = false, + sbtBootJarOverrides = sbtBootJarOverrides + ) + + val e = for { + resolutions <- ResolutionRun.resolutions(resolutionParams, verbosityLevel, log) + artifactsParams0 = artifactsParams(resolutions) + artifacts <- ArtifactsRun.artifacts(artifactsParams0, verbosityLevel, log) + updateParams0 = updateParams(resolutions, artifacts) + updateReport <- UpdateRun.update(updateParams0, verbosityLevel, log) + } yield updateReport + + e.left.map(unresolvedWarningOrThrow(uwconfig, _)) + } + + private def resolutionException(ex: ResolutionError): Either[Throwable, ResolveException] = + ex match { + case e: ResolutionError.MetadataDownloadErrors => + val r = new ResolveException( + e.errors.flatMap(_._2), + e.errors.map { + case ((mod, ver), _) => + ModuleID(mod.organization.value, mod.name.value, ver) + .withExtraAttributes(mod.attributes) + } + ) + Right(r) + case _ => Left(ex.exception()) + } + + private def unresolvedWarningOrThrow( + uwconfig: UnresolvedWarningConfiguration, + ex: ResolutionError + ): UnresolvedWarning = + resolutionException(ex) match { + case Left(t) => throw t + case Right(e) => + UnresolvedWarning(e, uwconfig) + } + +} + +object CoursierDependencyResolution { + def apply(configuration: CoursierConfiguration): DependencyResolution = + DependencyResolution(new CoursierDependencyResolution(configuration)) +} diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala new file mode 100644 index 000000000..5bb0f26ba --- /dev/null +++ b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala @@ -0,0 +1,12 @@ +package sbt.librarymanagement +package coursier + +trait CoursierLibraryManagementCodec + extends sjsonnew.BasicJsonProtocol + with LibraryManagementCodec + // with sbt.internal.librarymanagement.formats.GlobalLockFormat + with sbt.internal.librarymanagement.formats.LoggerFormat + with sbt.librarymanagement.ResolverFormats + with CoursierConfigurationFormats + +object CoursierLibraryManagementCodec extends CoursierLibraryManagementCodec diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala new file mode 100644 index 000000000..f3e52f2d4 --- /dev/null +++ b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala @@ -0,0 +1,24 @@ +package sbt.librarymanagement.coursier + +import sbt.librarymanagement._ +import sjsonnew.support.murmurhash.Hasher + +final case class CoursierModuleDescriptor( + descriptor: ModuleDescriptorConfiguration, + conf: CoursierConfiguration +) extends ModuleDescriptor { + + def directDependencies: Vector[ModuleID] = + descriptor.dependencies + + def scalaModuleInfo: Option[ScalaModuleInfo] = + descriptor.scalaModuleInfo + + def moduleSettings: CoursierModuleSettings = + CoursierModuleSettings() + + lazy val extraInputHash: Long = { + import sbt.librarymanagement.coursier.CustomLibraryManagementCodec._ + Hasher.hash(conf).toOption.fold(0L)(_.toLong) + } +} diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala new file mode 100644 index 000000000..cd3f0264c --- /dev/null +++ b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala @@ -0,0 +1,5 @@ +package sbt.librarymanagement.coursier + +import sbt.librarymanagement.ModuleSettings + +case class CoursierModuleSettings() extends ModuleSettings diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala new file mode 100644 index 000000000..68e443e83 --- /dev/null +++ b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala @@ -0,0 +1,37 @@ +package sbt.librarymanagement.coursier + +import sbt.librarymanagement.Resolver +import sjsonnew.JsonFormat + +object CustomLibraryManagementCodec extends CoursierLibraryManagementCodec { + + private type ConfFormat = ( + Vector[Resolver], + Vector[Resolver], + Boolean, + Int, + Int + ) + + private def from(c: CoursierConfiguration): ConfFormat = + ( + c.resolvers, + c.otherResolvers, + c.reorderResolvers, + c.parallelDownloads, + c.maxIterations + ) + + private def to(c: ConfFormat): CoursierConfiguration = + CoursierConfiguration() + .withResolvers(c._1) + .withOtherResolvers(c._2) + .withReorderResolvers(c._3) + .withParallelDownloads(c._4) + .withMaxIterations(c._5) + + // Redefine to use a subset of properties, that are serializable + override implicit lazy val CoursierConfigurationFormat: JsonFormat[CoursierConfiguration] = + projectFormat[CoursierConfiguration, ConfFormat](from, to) + +} diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala new file mode 100644 index 000000000..ac656ac8a --- /dev/null +++ b/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala @@ -0,0 +1,51 @@ +package sbt.librarymanagement.coursier + +import sbt.librarymanagement.{ MavenRepository, Resolver, URLRepository } + +object Resolvers { + + private val slowReposBase = Seq( + "https://repo.typesafe.com/", + "https://repo.scala-sbt.org/", + "http://repo.typesafe.com/", + "http://repo.scala-sbt.org/" + ) + + private val fastReposBase = Seq( + "http://repo1.maven.org/", + "https://repo1.maven.org/" + ) + + private def url(res: Resolver): Option[String] = + res match { + case m: MavenRepository => + Some(m.root) + case u: URLRepository => + u.patterns.artifactPatterns.headOption + .orElse(u.patterns.ivyPatterns.headOption) + case _ => + None + } + + private def filterResolvers(bases: Seq[String], + resolvers: Seq[(Resolver, Option[String])]): Seq[Resolver] = + resolvers + .filter(tuple => tuple._2.exists(url => bases.exists(base => url.startsWith(base)))) + .map(_._1) + + def reorder(resolvers: Seq[Resolver]): Seq[Resolver] = { + + val byUrl = resolvers.map(r => (r, url(r))) + + val fast = filterResolvers(fastReposBase, byUrl) + val slow = filterResolvers(slowReposBase, byUrl) + val rest = resolvers.diff(fast).diff(slow) + + val reordered = fast ++ rest ++ slow + assert(reordered.size == resolvers.size, + "Reordered resolvers should be the same size as the unordered ones.") + + reordered + } + +} diff --git a/modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala b/modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala new file mode 100644 index 000000000..5772eb9d9 --- /dev/null +++ b/modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala @@ -0,0 +1,166 @@ +package sbt.librarymanagement.coursier + +import org.scalatest.{Matchers, PropSpec} +import sbt.internal.librarymanagement.cross.CrossVersionUtil +import sbt.internal.util.ConsoleLogger +import sbt.librarymanagement._ +import sbt.librarymanagement.Configurations.Component +import sbt.librarymanagement.Resolver.{DefaultMavenRepository, JCenterRepository, JavaNet2Repository} +import sbt.librarymanagement.{Resolver, UnresolvedWarningConfiguration, UpdateConfiguration} +import sbt.librarymanagement.syntax._ + +final class ResolutionSpec extends PropSpec with Matchers { + + lazy val log = ConsoleLogger() + + def configurations = Vector(Compile, Test, Runtime, Provided, Optional, Component) + def module( + lmEngine: DependencyResolution, + moduleId: ModuleID, + deps: Vector[ModuleID], + scalaFullVersion: Option[String], + overrideScalaVersion: Boolean = true + ): ModuleDescriptor = { + val scalaModuleInfo = scalaFullVersion map { fv => + ScalaModuleInfo( + scalaFullVersion = fv, + scalaBinaryVersion = CrossVersionUtil.binaryScalaVersion(fv), + configurations = configurations, + checkExplicit = true, + filterImplicit = false, + overrideScalaVersion = overrideScalaVersion + ) + } + + val moduleSetting = ModuleDescriptorConfiguration(moduleId, ModuleInfo("foo")) + .withDependencies(deps) + .withConfigurations(configurations) + .withScalaModuleInfo(scalaModuleInfo) + lmEngine.moduleDescriptor(moduleSetting) + } + + def resolvers = Vector( + DefaultMavenRepository, + JavaNet2Repository, + JCenterRepository, + Resolver.sbtPluginRepo("releases") + ) + + val lmEngine = CoursierDependencyResolution(CoursierConfiguration().withResolvers(resolvers)) + + private final val stubModule = "com.example" % "foo" % "0.1.0" % "compile" + + property("very simple module") { + val dependencies = Vector( + "com.typesafe.scala-logging" % "scala-logging_2.12" % "3.7.2" % "compile", + "org.scalatest" % "scalatest_2.12" % "3.0.4" % "test" + ).map(_.withIsTransitive(false)) + + val coursierModule = module(lmEngine, stubModule, dependencies, Some("2.12.4")) + val resolution = + lmEngine.update(coursierModule, UpdateConfiguration(), UnresolvedWarningConfiguration(), log) + + resolution should be('right) + val r = resolution.right.get + r.configurations.map(_.configuration) should have size configurations.length + + val compileConfig = r.configurations.find(_.configuration == Compile.toConfigRef).get + compileConfig.modules should have size 1 + + val runtimeConfig = r.configurations.find(_.configuration == Runtime.toConfigRef).get + runtimeConfig.modules should have size 1 + + val testConfig = r.configurations.find(_.configuration == Test.toConfigRef).get + testConfig.modules should have size 2 + } + + property("resolve compiler bridge") { + val dependencies = + Vector(("org.scala-sbt" % "compiler-interface" % "1.0.4" % "component").sources()) + val coursierModule = module(lmEngine, stubModule, dependencies, Some("2.12.4")) + val resolution = + lmEngine.update(coursierModule, UpdateConfiguration(), UnresolvedWarningConfiguration(), log) + + val r = resolution.right.get + + val componentConfig = r.configurations.find(_.configuration == Component.toConfigRef).get + componentConfig.modules should have size 2 + componentConfig.modules.head.artifacts should have size 1 + componentConfig.modules.head.artifacts.head._1.classifier should contain("sources") + } + + property("resolve sbt jars") { + val dependencies = + Vector("org.scala-sbt" % "sbt" % "1.1.0" % "provided") + val coursierModule = module(lmEngine, stubModule, dependencies, Some("2.12.4")) + val resolution = + lmEngine.update(coursierModule, UpdateConfiguration(), UnresolvedWarningConfiguration(), log) + + val r = resolution.right.get + + val modules = r.configurations.flatMap(_.modules) + modules.map(_.module.name) should contain("main_2.12") + } + + property("resolve with default resolvers") { + val dependencies = + Vector(("org.scala-sbt" % "compiler-interface" % "1.0.4" % "component").sources()) + val lmEngine = + CoursierDependencyResolution( + CoursierConfiguration() + .withResolvers(Resolver.combineDefaultResolvers(Vector.empty)) + ) + val coursierModule = module(lmEngine, stubModule, dependencies, Some("2.12.4")) + val resolution = + lmEngine.update(coursierModule, UpdateConfiguration(), UnresolvedWarningConfiguration(), log) + + resolution should be('right) + } + + property("resolve plugin") { + val pluginAttributes = Map("scalaVersion" -> "2.12", "sbtVersion" -> "1.0") + val dependencies = + Vector(("org.xerial.sbt" % "sbt-sonatype" % "2.0").withExtraAttributes(pluginAttributes)) + val coursierModule = module(lmEngine, stubModule, dependencies, Some("2.12.4")) + val resolution = + lmEngine.update(coursierModule, UpdateConfiguration(), UnresolvedWarningConfiguration(), log) + + val r = resolution.right.get + + val componentConfig = r.configurations.find(_.configuration == Compile.toConfigRef).get + componentConfig.modules.map(_.module.name) should have size 5 + } + + property("strip e: prefix from plugin attributes") { + val pluginAttributes = Map("e:scalaVersion" -> "2.12", "e:sbtVersion" -> "1.0") + val dependencies = + Vector(("org.xerial.sbt" % "sbt-sonatype" % "2.0").withExtraAttributes(pluginAttributes)) + val coursierModule = module(lmEngine, stubModule, dependencies, Some("2.12.4")) + val resolution = + lmEngine.update(coursierModule, UpdateConfiguration(), UnresolvedWarningConfiguration(), log) + + resolution should be('right) + } + + property("resolve plugins hosted on repo.typesafe.com") { + val pluginAttributes = Map("e:scalaVersion" -> "2.12", "e:sbtVersion" -> "1.0") + val dependencies = + Vector(("com.typesafe.sbt" % "sbt-git" % "0.9.3").withExtraAttributes(pluginAttributes)) + val coursierModule = module(lmEngine, stubModule, dependencies, Some("2.12.4")) + val resolution = + lmEngine.update(coursierModule, UpdateConfiguration(), UnresolvedWarningConfiguration(), log) + + resolution should be('right) + } + + property("reorder fast and slow resolvers") { + val resolvers = Vector( + JavaNet2Repository, + Resolver.sbtPluginRepo("releases"), + DefaultMavenRepository + ) + val engine = new CoursierDependencyResolution(CoursierConfiguration().withResolvers(resolvers)) + engine.resolvers.last.name should be("sbt-plugin-releases") + engine.resolvers should have size resolvers.length + } +} diff --git a/project/DatatypeConfig.scala b/project/DatatypeConfig.scala new file mode 100644 index 000000000..3ddb5261d --- /dev/null +++ b/project/DatatypeConfig.scala @@ -0,0 +1,75 @@ +// from https://github.com/sbt/librarymanagement/blob/4a0a6c77bc24f9db139698cab0a6da78d0893a88/project/DatatypeConfig.scala + +import sbt.contraband.ast._ +import sbt.contraband.CodecCodeGen + +object DatatypeConfig { + + /** Extract the only type parameter from a TpeRef */ + def oneArg(tpe: Type): Type = { + val pat = s"""${tpe.removeTypeParameters.name}[<\\[](.+?)[>\\]]""".r + val pat(arg0) = tpe.name + NamedType(arg0 split '.' toList) + } + + /** Extract the two type parameters from a TpeRef */ + def twoArgs(tpe: Type): List[Type] = { + val pat = s"""${tpe.removeTypeParameters.name}[<\\[](.+?), (.+?)[>\\]]""".r + val pat(arg0, arg1) = tpe.name + NamedType(arg0 split '.' toList) :: NamedType(arg1 split '.' toList) :: Nil + } + + /** Codecs that were manually written. */ + val myCodecs: PartialFunction[String, Type => List[String]] = { + case "scala.xml.NodeSeq" => { _ => + "sbt.internal.librarymanagement.formats.NodeSeqFormat" :: Nil + } + + case "org.apache.ivy.plugins.resolver.DependencyResolver" => { _ => + "sbt.internal.librarymanagement.formats.DependencyResolverFormat" :: Nil + } + + case "xsbti.GlobalLock" => { _ => + "sbt.internal.librarymanagement.formats.GlobalLockFormat" :: Nil + } + case "xsbti.Logger" => { _ => + "sbt.internal.librarymanagement.formats.LoggerFormat" :: Nil + } + + case "sbt.librarymanagement.ivy.UpdateOptions" => { _ => + "sbt.librarymanagement.ivy.formats.UpdateOptionsFormat" :: Nil + } + + case "sbt.librarymanagement.LogicalClock" => { _ => + "sbt.internal.librarymanagement.formats.LogicalClockFormats" :: Nil + } + + // TODO: These are handled by BasicJsonProtocol, and sbt-datatype should handle them by default, imo + case "Option" | "Set" | "scala.Vector" => { tpe => + getFormats(oneArg(tpe)) + } + case "Map" | "Tuple2" | "scala.Tuple2" => { tpe => + twoArgs(tpe).flatMap(getFormats) + } + case "Int" | "Long" => { _ => + Nil + } + } + + /** Types for which we don't include the format -- they're just aliases to InclExclRule */ + val excluded = Set("sbt.librarymanagement.InclusionRule", "sbt.librarymanagement.ExclusionRule") + + /** Returns the list of formats required to encode the given `TpeRef`. */ + val getFormats: Type => List[String] = + CodecCodeGen.extensibleFormatsForType { + case NamedType(List("sbt", "internal", "librarymanagement", "RetrieveConfiguration"), _) => + "sbt.librarymanagement.RetrieveConfigurationFormats" :: Nil + case tpe: Type if myCodecs isDefinedAt tpe.removeTypeParameters.name => + myCodecs(tpe.removeTypeParameters.name)(tpe) + case tpe: Type if excluded contains tpe.removeTypeParameters.name => + Nil + case other => + CodecCodeGen.formatsForType(other) + } + +} diff --git a/project/plugins.sbt b/project/plugins.sbt index 4547a2d5b..836cc287d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,7 @@ plugins_( "com.geirsson" % "sbt-ci-release" % "1.2.1", + "org.scala-sbt" % "sbt-contraband" % "0.4.1", "io.get-coursier" % "sbt-coursier" % coursierVersion, "com.typesafe" % "sbt-mima-plugin" % "0.3.0", "com.jsuereth" % "sbt-pgp" % "1.1.1", diff --git a/scripts/travis.sh b/scripts/travis.sh index 4d73ff70e..af5522f57 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -7,6 +7,10 @@ downloadInstallSbtExtras() { chmod +x bin/sbt } +lmCoursier() { + [ "${LM_COURSIER:-""}" = 1 ] +} + sbtPgpCoursier() { [ "${SBT_PGP_COURSIER:-""}" = 1 ] } @@ -15,8 +19,15 @@ sbtShading() { [ "${SBT_SHADING:-""}" = 1 ] } +runLmCoursierTests() { + sbt ++$TRAVIS_SCALA_VERSION lm-coursier/test +} + runSbtCoursierTests() { - ./metadata/scripts/with-test-repo.sh sbt ++$TRAVIS_SCALA_VERSION sbt-coursier/test "sbt-coursier/scripted sbt-coursier-group-$SBT_COURSIER_TEST_GROUP/*" + ./metadata/scripts/with-test-repo.sh sbt \ + ++$TRAVIS_SCALA_VERSION \ + sbt-coursier/test \ + "sbt-coursier/scripted shared-$SBT_COURSIER_TEST_GROUP/* sbt-coursier-group-$SBT_COURSIER_TEST_GROUP/*" } runSbtShadingTests() { @@ -41,6 +52,8 @@ if sbtShading; then runSbtShadingTests elif sbtPgpCoursier; then runSbtPgpCoursierTests +elif lmCoursier; then + runLmCoursierTests else runSbtCoursierTests fi From df7e529a5991cd72829bd071477fc337d1865ad9 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 10:53:40 +0100 Subject: [PATCH 3/7] Adjust namespace --- .../lmcoursier}/CoursierConfiguration.scala | 4 ++-- .../lmcoursier}/CoursierConfigurationFormats.scala | 10 +++++----- .../lm-coursier/src/main/contraband/lm-coursier.json | 4 ++-- .../{sbtcoursier => lmcoursier}/ArtifactsParams.scala | 2 +- .../{sbtcoursier => lmcoursier}/ArtifactsRun.scala | 2 +- .../lmcoursier}/CoursierDependencyResolution.scala | 3 +-- .../lmcoursier}/CoursierLibraryManagementCodec.scala | 5 +++-- .../lmcoursier}/CoursierModuleDescriptor.scala | 4 ++-- .../lmcoursier}/CoursierModuleSettings.scala | 2 +- .../lmcoursier}/CustomLibraryManagementCodec.scala | 2 +- .../coursier/{sbtcoursier => lmcoursier}/FromSbt.scala | 2 +- .../coursier/{sbtcoursier => lmcoursier}/Inputs.scala | 2 +- .../InterProjectRepository.scala | 2 +- .../coursier/{sbtcoursier => lmcoursier}/Lock.scala | 2 +- .../{sbtcoursier => lmcoursier}/ResolutionError.scala | 2 +- .../ResolutionException.scala | 2 +- .../{sbtcoursier => lmcoursier}/ResolutionParams.scala | 2 +- .../{sbtcoursier => lmcoursier}/ResolutionRun.scala | 2 +- .../coursier => coursier/lmcoursier}/Resolvers.scala | 2 +- .../{sbtcoursier => lmcoursier}/SbtBootJars.scala | 2 +- .../{sbtcoursier => lmcoursier}/SbtCoursierCache.scala | 2 +- .../coursier/{sbtcoursier => lmcoursier}/ToSbt.scala | 2 +- .../{sbtcoursier => lmcoursier}/UpdateParams.scala | 2 +- .../{sbtcoursier => lmcoursier}/UpdateRun.scala | 2 +- .../lmcoursier}/ResolutionSpec.scala | 2 +- .../scala/coursier/sbtcoursier/ArtifactsTasks.scala | 1 + .../scala/coursier/sbtcoursier/CoursierPlugin.scala | 1 + .../main/scala/coursier/sbtcoursier/DisplayTasks.scala | 1 + .../main/scala/coursier/sbtcoursier/InputsTasks.scala | 1 + .../scala/coursier/sbtcoursier/RepositoriesTasks.scala | 1 + .../scala/coursier/sbtcoursier/ResolutionTasks.scala | 1 + .../main/scala/coursier/sbtcoursier/UpdateTasks.scala | 1 + .../clean/project/{helper.scala => Helper.scala} | 4 ++-- 33 files changed, 43 insertions(+), 36 deletions(-) rename modules/lm-coursier/src/main/contraband-scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierConfiguration.scala (94%) rename modules/lm-coursier/src/main/contraband-scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierConfigurationFormats.scala (76%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ArtifactsParams.scala (94%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ArtifactsRun.scala (99%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierDependencyResolution.scala (96%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierLibraryManagementCodec.scala (83%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierModuleDescriptor.scala (83%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CoursierModuleSettings.scala (72%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/CustomLibraryManagementCodec.scala (95%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/FromSbt.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/Inputs.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/InterProjectRepository.scala (95%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/Lock.scala (89%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ResolutionError.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ResolutionException.scala (88%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ResolutionParams.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ResolutionRun.scala (99%) rename modules/lm-coursier/src/main/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/Resolvers.scala (97%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/SbtBootJars.scala (94%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/SbtCoursierCache.scala (98%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/ToSbt.scala (99%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/UpdateParams.scala (94%) rename modules/lm-coursier/src/main/scala/coursier/{sbtcoursier => lmcoursier}/UpdateRun.scala (99%) rename modules/lm-coursier/src/test/scala/{sbt/librarymanagement/coursier => coursier/lmcoursier}/ResolutionSpec.scala (99%) rename modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/{helper.scala => Helper.scala} (52%) diff --git a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala b/modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfiguration.scala similarity index 94% rename from modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala rename to modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfiguration.scala index 9ee641e34..138d8d99a 100644 --- a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfiguration.scala +++ b/modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfiguration.scala @@ -3,7 +3,7 @@ */ // DO NOT EDIT MANUALLY -package sbt.librarymanagement.coursier +package coursier.lmcoursier final class CoursierConfiguration private ( val log: Option[xsbti.Logger], val resolvers: Vector[sbt.librarymanagement.Resolver], @@ -22,7 +22,7 @@ final class CoursierConfiguration private ( case _ => false } override def hashCode: Int = { - 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "sbt.librarymanagement.coursier.CoursierConfiguration".##) + log.##) + resolvers.##) + otherResolvers.##) + reorderResolvers.##) + parallelDownloads.##) + maxIterations.##) + sbtScalaOrganization.##) + sbtScalaVersion.##) + sbtScalaJars.##) + 37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "coursier.lmcoursier.CoursierConfiguration".##) + log.##) + resolvers.##) + otherResolvers.##) + reorderResolvers.##) + parallelDownloads.##) + maxIterations.##) + sbtScalaOrganization.##) + sbtScalaVersion.##) + sbtScalaJars.##) } override def toString: String = { "CoursierConfiguration(" + log + ", " + resolvers + ", " + otherResolvers + ", " + reorderResolvers + ", " + parallelDownloads + ", " + maxIterations + ", " + sbtScalaOrganization + ", " + sbtScalaVersion + ", " + sbtScalaJars + ")" diff --git a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala b/modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfigurationFormats.scala similarity index 76% rename from modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala rename to modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfigurationFormats.scala index 0dc5733b2..f394dfb87 100644 --- a/modules/lm-coursier/src/main/contraband-scala/sbt/librarymanagement/coursier/CoursierConfigurationFormats.scala +++ b/modules/lm-coursier/src/main/contraband-scala/coursier/lmcoursier/CoursierConfigurationFormats.scala @@ -3,11 +3,11 @@ */ // DO NOT EDIT MANUALLY -package sbt.librarymanagement.coursier +package coursier.lmcoursier import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CoursierConfigurationFormats { self: sbt.internal.librarymanagement.formats.LoggerFormat with sbt.librarymanagement.ResolverFormats with sjsonnew.BasicJsonProtocol => -implicit lazy val CoursierConfigurationFormat: JsonFormat[sbt.librarymanagement.coursier.CoursierConfiguration] = new JsonFormat[sbt.librarymanagement.coursier.CoursierConfiguration] { - override def read[J](jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.coursier.CoursierConfiguration = { +implicit lazy val CoursierConfigurationFormat: JsonFormat[coursier.lmcoursier.CoursierConfiguration] = new JsonFormat[coursier.lmcoursier.CoursierConfiguration] { + override def read[J](jsOpt: Option[J], unbuilder: Unbuilder[J]): coursier.lmcoursier.CoursierConfiguration = { jsOpt match { case Some(js) => unbuilder.beginObject(js) @@ -21,12 +21,12 @@ implicit lazy val CoursierConfigurationFormat: JsonFormat[sbt.librarymanagement. val sbtScalaVersion = unbuilder.readField[Option[String]]("sbtScalaVersion") val sbtScalaJars = unbuilder.readField[Vector[java.io.File]]("sbtScalaJars") unbuilder.endObject() - sbt.librarymanagement.coursier.CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, sbtScalaOrganization, sbtScalaVersion, sbtScalaJars) + coursier.lmcoursier.CoursierConfiguration(log, resolvers, otherResolvers, reorderResolvers, parallelDownloads, maxIterations, sbtScalaOrganization, sbtScalaVersion, sbtScalaJars) case None => deserializationError("Expected JsObject but found None") } } - override def write[J](obj: sbt.librarymanagement.coursier.CoursierConfiguration, builder: Builder[J]): Unit = { + override def write[J](obj: coursier.lmcoursier.CoursierConfiguration, builder: Builder[J]): Unit = { builder.beginObject() builder.addField("log", obj.log) builder.addField("resolvers", obj.resolvers) diff --git a/modules/lm-coursier/src/main/contraband/lm-coursier.json b/modules/lm-coursier/src/main/contraband/lm-coursier.json index a5c7351ee..b86485a59 100644 --- a/modules/lm-coursier/src/main/contraband/lm-coursier.json +++ b/modules/lm-coursier/src/main/contraband/lm-coursier.json @@ -1,9 +1,9 @@ { - "codecNamespace": "sbt.librarymanagement.coursier", + "codecNamespace": "coursier.lmcoursier", "types": [ { "name": "CoursierConfiguration", - "namespace": "sbt.librarymanagement.coursier", + "namespace": "coursier.lmcoursier", "target": "Scala", "type": "record", "fields": [ diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsParams.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsParams.scala similarity index 94% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsParams.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsParams.scala index 9d03f2e85..6f9786624 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsParams.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsParams.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsRun.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala index d24dd5cfb..60b63a501 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File import java.util.concurrent.ExecutorService diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala similarity index 96% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala index 61c5e1691..6698042cd 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala @@ -1,11 +1,10 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import java.io.{File, OutputStreamWriter} import _root_.coursier.{Artifact, Cache, CachePolicy, FileError, Organization, Project, Resolution, TermDisplay, organizationString} import _root_.coursier.core.Configuration import _root_.coursier.ivy.IvyRepository -import _root_.coursier.sbtcoursier.{ArtifactsParams, ArtifactsRun, FromSbt, Inputs, InterProjectRepository, ResolutionError, ResolutionParams, ResolutionRun, SbtBootJars, UpdateParams, UpdateRun} import sbt.internal.librarymanagement.IvySbt import sbt.librarymanagement._ import sbt.util.Logger diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierLibraryManagementCodec.scala similarity index 83% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierLibraryManagementCodec.scala index 5bb0f26ba..b5cfc104d 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierLibraryManagementCodec.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierLibraryManagementCodec.scala @@ -1,5 +1,6 @@ -package sbt.librarymanagement -package coursier +package coursier.lmcoursier + +import sbt.librarymanagement.LibraryManagementCodec trait CoursierLibraryManagementCodec extends sjsonnew.BasicJsonProtocol diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleDescriptor.scala similarity index 83% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleDescriptor.scala index f3e52f2d4..4e8311045 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleDescriptor.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleDescriptor.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import sbt.librarymanagement._ import sjsonnew.support.murmurhash.Hasher @@ -18,7 +18,7 @@ final case class CoursierModuleDescriptor( CoursierModuleSettings() lazy val extraInputHash: Long = { - import sbt.librarymanagement.coursier.CustomLibraryManagementCodec._ + import CustomLibraryManagementCodec._ Hasher.hash(conf).toOption.fold(0L)(_.toLong) } } diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleSettings.scala similarity index 72% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleSettings.scala index cd3f0264c..a4d45fb3f 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierModuleSettings.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierModuleSettings.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import sbt.librarymanagement.ModuleSettings diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CustomLibraryManagementCodec.scala similarity index 95% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/CustomLibraryManagementCodec.scala index 68e443e83..0a608c129 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/CustomLibraryManagementCodec.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CustomLibraryManagementCodec.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import sbt.librarymanagement.Resolver import sjsonnew.JsonFormat diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/FromSbt.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/FromSbt.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala index f8f5e1ccc..e0a14a8d1 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/FromSbt.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import coursier.ivy.IvyRepository import coursier.ivy.IvyXml.{mappings => ivyXmlMappings} diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Inputs.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Inputs.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Inputs.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/Inputs.scala index e7175397d..932bf680e 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Inputs.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Inputs.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import coursier.core.{Configuration, ModuleName, Organization, Project} import sbt.librarymanagement.{InclExclRule, ModuleID} diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/InterProjectRepository.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/InterProjectRepository.scala similarity index 95% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/InterProjectRepository.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/InterProjectRepository.scala index e1226c4c9..6748ea87d 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/InterProjectRepository.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/InterProjectRepository.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import coursier.Fetch import coursier.core._ diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Lock.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Lock.scala similarity index 89% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Lock.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/Lock.scala index bbfb2c0a2..fd5e96ed3 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/Lock.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Lock.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier object Lock { diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionError.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionError.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionError.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionError.scala index 629f10a6f..d61081277 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionError.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionError.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import coursier.FileError import coursier.core.Module diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionException.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionException.scala similarity index 88% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionException.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionException.scala index a600328d1..903dba9bc 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionException.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionException.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier final class ResolutionException( val error: ResolutionError diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionParams.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionParams.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala index cf01b8a95..e73ee3cdc 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionParams.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File import java.net.URL diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionRun.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala index 1a7bef161..256a5ece6 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ResolutionRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.util.concurrent.ExecutorService diff --git a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Resolvers.scala similarity index 97% rename from modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/Resolvers.scala index ac656ac8a..ff65c2688 100644 --- a/modules/lm-coursier/src/main/scala/sbt/librarymanagement/coursier/Resolvers.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/Resolvers.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import sbt.librarymanagement.{ MavenRepository, Resolver, URLRepository } diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtBootJars.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtBootJars.scala similarity index 94% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtBootJars.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtBootJars.scala index 7adfae875..ea9be1d6f 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtBootJars.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtBootJars.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtCoursierCache.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtCoursierCache.scala similarity index 98% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtCoursierCache.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtCoursierCache.scala index e0de8ea5c..1c0959505 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/SbtCoursierCache.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/SbtCoursierCache.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.util.concurrent.ConcurrentHashMap diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ToSbt.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ToSbt.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ToSbt.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/ToSbt.scala index 99d73aaf8..7ac41ac6d 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/ToSbt.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ToSbt.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File import java.net.URL diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateParams.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateParams.scala similarity index 94% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateParams.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateParams.scala index fc7ee5b72..7700a75dd 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateParams.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateParams.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File diff --git a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateRun.scala similarity index 99% rename from modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateRun.scala rename to modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateRun.scala index 5bc233e20..7ea5a1b78 100644 --- a/modules/lm-coursier/src/main/scala/coursier/sbtcoursier/UpdateRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/UpdateRun.scala @@ -1,4 +1,4 @@ -package coursier.sbtcoursier +package coursier.lmcoursier import java.io.File diff --git a/modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala b/modules/lm-coursier/src/test/scala/coursier/lmcoursier/ResolutionSpec.scala similarity index 99% rename from modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala rename to modules/lm-coursier/src/test/scala/coursier/lmcoursier/ResolutionSpec.scala index 5772eb9d9..d034e7c11 100644 --- a/modules/lm-coursier/src/test/scala/sbt/librarymanagement/coursier/ResolutionSpec.scala +++ b/modules/lm-coursier/src/test/scala/coursier/lmcoursier/ResolutionSpec.scala @@ -1,4 +1,4 @@ -package sbt.librarymanagement.coursier +package coursier.lmcoursier import org.scalatest.{Matchers, PropSpec} import sbt.internal.librarymanagement.cross.CrossVersionUtil diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala index 7b190dbf0..15d261b92 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala @@ -4,6 +4,7 @@ import java.io.File import coursier.{Artifact, FileError} import coursier.core._ +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import coursier.sbtcoursier.Structure._ import sbt.librarymanagement.{Artifact => _, Configuration => _, _} diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala index a413561ad..63326c448 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala @@ -4,6 +4,7 @@ import java.io.OutputStreamWriter import coursier.{Cache, CachePolicy, TermDisplay} import coursier.core.{Configuration, ResolutionProcess} +import coursier.lmcoursier.SbtCoursierCache import sbt.librarymanagement.{Configuration => _, Resolver => _, _} import sbt.{Cache => _, Configuration => _, _} import sbt.Keys._ diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala index a47caa085..a949e43a2 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala @@ -1,6 +1,7 @@ package coursier.sbtcoursier import coursier.core._ +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import coursier.util.Print.Colors import coursier.util.{Parse, Print} diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/InputsTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/InputsTasks.scala index c75fb9847..28d6cf9c8 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/InputsTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/InputsTasks.scala @@ -4,6 +4,7 @@ import java.net.URL import coursier.ProjectCache import coursier.core._ +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import coursier.sbtcoursier.Structure._ import sbt.librarymanagement.{Configuration => _, _} diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/RepositoriesTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/RepositoriesTasks.scala index 7b6e375a8..ddf3bfe87 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/RepositoriesTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/RepositoriesTasks.scala @@ -1,5 +1,6 @@ package coursier.sbtcoursier +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import coursier.sbtcoursier.Structure._ import sbt.{Classpaths, Def} diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala index 0c2805989..115d643cb 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala @@ -6,6 +6,7 @@ import coursier.{Cache, ProjectCache} import coursier.core._ import coursier.extra.Typelevel import coursier.ivy.IvyRepository +import coursier.lmcoursier._ import coursier.maven.MavenRepository import coursier.sbtcoursier.Keys._ import sbt.Def diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/UpdateTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/UpdateTasks.scala index 64e85fb54..0a0e38d56 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/UpdateTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/UpdateTasks.scala @@ -1,6 +1,7 @@ package coursier.sbtcoursier import coursier.core._ +import coursier.lmcoursier._ import coursier.sbtcoursier.Keys._ import sbt.Def import sbt.Keys._ diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/Helper.scala similarity index 52% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/Helper.scala index 5e57a26bc..b567f06bf 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/Helper.scala @@ -3,6 +3,6 @@ package coursier object Helper { def checkEmpty(): Boolean = - coursier.sbtcoursier.SbtCoursierCache.default.isEmpty + coursier.lmcoursier.SbtCoursierCache.default.isEmpty -} \ No newline at end of file +} From 91cb55cc2e4ad18625ee49905b16a4a6c96a878e Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 11:14:55 +0100 Subject: [PATCH 4/7] Make all plugins.sbt files in scripted tests the same --- .../sbt-coursier-group-2/neo-sbt-scalafmt/project/extra.sbt | 1 + .../sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt | 2 -- .../sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt | 2 +- .../sbt-coursier-group-2/publish-local-signed/project/extra.sbt | 1 + .../publish-local-signed/project/plugins.sbt | 2 -- .../publish-local-sources-javadoc-conf/project/plugins.sbt | 2 +- .../sbt-coursier-group-2/sbt-assembly/project/extra.sbt | 1 + .../sbt-coursier-group-2/sbt-assembly/project/plugins.sbt | 2 -- .../sbt-test/sbt-coursier-group-2/scala-js/project/extra.sbt | 1 + .../sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt | 2 -- .../scala-sources-javadoc-jars/project/plugins.sbt | 2 +- .../src/sbt-test/sbt-coursier-group-2/unidoc/project/extra.sbt | 1 + .../sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt | 2 -- .../update-sbt-classifiers/project/plugins.sbt | 2 +- 14 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/extra.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/extra.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/extra.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/extra.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/extra.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/extra.sbt new file mode 100644 index 000000000..4aa3881f4 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/extra.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt index 74fe8317e..152225a9e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt @@ -9,5 +9,3 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) } - -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt index 8d902e4dc..152225a9e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt @@ -8,4 +8,4 @@ ) addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} \ No newline at end of file +} diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/extra.sbt new file mode 100644 index 000000000..15a80bc35 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/extra.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt index 6e19fd0da..152225a9e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt @@ -9,5 +9,3 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) } - -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt index 8d902e4dc..152225a9e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt @@ -8,4 +8,4 @@ ) addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} \ No newline at end of file +} diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/extra.sbt new file mode 100644 index 000000000..652a3b93b --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/extra.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt index a0c118db1..152225a9e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt @@ -9,5 +9,3 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) } - -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/extra.sbt new file mode 100644 index 000000000..4f6de4f49 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/extra.sbt @@ -0,0 +1 @@ +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt index 6abe6ecfb..152225a9e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt @@ -9,5 +9,3 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) } - -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt index 8d902e4dc..152225a9e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt @@ -8,4 +8,4 @@ ) addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} \ No newline at end of file +} diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/extra.sbt new file mode 100644 index 000000000..ade7d89a5 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/extra.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt index ed7c665fe..152225a9e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt @@ -9,5 +9,3 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) } - -addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt index 8d902e4dc..152225a9e 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt @@ -8,4 +8,4 @@ ) addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} \ No newline at end of file +} From 4cbb9082ccac1622b36bba04d96474afcd04dc2b Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 11:18:44 +0100 Subject: [PATCH 5/7] Allow to adjust plugin name in scripted tests --- .../aar-packaging/project/plugins.sbt | 18 ++++++++++-------- .../auto-scala-library/project/plugins.sbt | 18 ++++++++++-------- .../classifiers/project/plugins.sbt | 18 ++++++++++-------- .../clean/project/plugins.sbt | 18 ++++++++++-------- .../config-deps-resolution/project/plugins.sbt | 18 ++++++++++-------- .../credentials-from-file/project/plugins.sbt | 18 ++++++++++-------- .../credentials-sbt/project/plugins.sbt | 18 ++++++++++-------- .../credentials/project/plugins.sbt | 18 ++++++++++-------- .../dependency-graph/project/plugins.sbt | 18 ++++++++++-------- .../exclude-dependencies/project/plugins.sbt | 18 ++++++++++-------- .../project/plugins.sbt | 18 ++++++++++-------- .../from-no-head/project/plugins.sbt | 18 ++++++++++-------- .../from-wrong-url/project/plugins.sbt | 18 ++++++++++-------- .../from/project/plugins.sbt | 18 ++++++++++-------- .../project/plugins.sbt | 18 ++++++++++-------- .../in-memory-cache/project/plugins.sbt | 18 ++++++++++-------- .../project/plugins.sbt | 18 ++++++++++-------- .../inter-project/project/plugins.sbt | 18 ++++++++++-------- .../logger/project/plugins.sbt | 18 ++++++++++-------- .../maven-compatible/project/plugins.sbt | 18 ++++++++++-------- .../missing-credentials/project/plugins.sbt | 18 ++++++++++-------- .../neo-sbt-scalafmt/project/plugins.sbt | 18 ++++++++++-------- .../no-pom-artifact/project/plugins.sbt | 18 ++++++++++-------- .../profiles/project/plugins.sbt | 18 ++++++++++-------- .../publish-local-signed/project/plugins.sbt | 18 ++++++++++-------- .../project/plugins.sbt | 18 ++++++++++-------- .../sbt-assembly/project/plugins.sbt | 18 ++++++++++-------- .../scala-jars/project/plugins.sbt | 18 ++++++++++-------- .../scala-js/project/plugins.sbt | 18 ++++++++++-------- .../project/plugins.sbt | 18 ++++++++++-------- .../simple/project/plugins.sbt | 18 ++++++++++-------- .../tests-classifier/project/plugins.sbt | 18 ++++++++++-------- .../project/plugins.sbt | 18 ++++++++++-------- .../project/plugins.sbt | 18 ++++++++++-------- .../typelevel/project/plugins.sbt | 18 ++++++++++-------- .../unidoc/project/plugins.sbt | 18 ++++++++++-------- .../update-sbt-classifiers/project/plugins.sbt | 18 ++++++++++-------- .../zookeeper/project/plugins.sbt | 18 ++++++++++-------- project/Settings.scala | 1 + 39 files changed, 381 insertions(+), 304 deletions(-) diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt index 152225a9e..71a44ffd3 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt @@ -1,11 +1,13 @@ -{ - val pluginVersion = sys.props.getOrElse( +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( "plugin.version", - throw new RuntimeException( - """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin - ) + sys.error("plugin.version Java property not set") ) - addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) -} + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/project/Settings.scala b/project/Settings.scala index 7a3687849..44b387f80 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -29,6 +29,7 @@ object Settings { Seq( scriptedLaunchOpts ++= Seq( "-Xmx1024M", + "-Dplugin.name=" + name.value, "-Dplugin.version=" + version.value, "-Dsbttest.base=" + (sourceDirectory.value / "sbt-test").getAbsolutePath ), From ecee7fab99a0ae40c64868ed4908896b1db47db3 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 11:38:41 +0100 Subject: [PATCH 6/7] Add sbt-lm-coursier plugin --- build.sbt | 17 +++++++ .../sbtlmcoursier/LmCoursierPlugin.scala | 45 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala diff --git a/build.sbt b/build.sbt index c659064cb..e3593c3e1 100644 --- a/build.sbt +++ b/build.sbt @@ -40,6 +40,22 @@ lazy val `lm-coursier` = project contrabandFormatsForType in generateContrabands in Compile := DatatypeConfig.getFormats ) +lazy val `sbt-lm-coursier` = project + .in(file("modules/sbt-lm-coursier")) + .enablePlugins(ScriptedPlugin) + .dependsOn(`lm-coursier`) + .settings( + plugin, + sbtTestDirectory := sbtTestDirectory.in(`sbt-coursier`).value, + scriptedDependencies := { + scriptedDependencies.value + + // TODO Get those automatically + // (but shouldn't scripted itself handle that…?) + publishLocal.in(`lm-coursier`).value + } + ) + lazy val `sbt-coursier` = project .in(file("modules/sbt-coursier")) .enablePlugins(ScriptedPlugin) @@ -104,6 +120,7 @@ lazy val `sbt-coursier-root` = project .aggregate( `lm-coursier`, `sbt-coursier`, + `sbt-lm-coursier`, `sbt-pgp-coursier`, `sbt-shading` ) diff --git a/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala b/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala new file mode 100644 index 000000000..86dcc8d07 --- /dev/null +++ b/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala @@ -0,0 +1,45 @@ +package coursier.sbtlmcoursier + +import coursier.lmcoursier.{CoursierConfiguration, CoursierDependencyResolution} +import sbt.{AutoPlugin, Classpaths, Def, Task, taskKey} +import sbt.KeyRanks.DTask +import sbt.Keys.{dependencyResolution, fullResolvers, otherResolvers, streams} +import sbt.librarymanagement.DependencyResolution + +object LmCoursierPlugin extends AutoPlugin { + + object autoImport { + val coursierConfiguration = taskKey[CoursierConfiguration]("General dependency management (Coursier) settings, such as the resolvers and options to use.").withRank(DTask) + } + + import autoImport._ + + + override def trigger = allRequirements + + // requiring IvyPlugin… to override it, and so that it doesn't override us :| + override def requires = sbt.plugins.IvyPlugin + + // putting this in projectSettings like sbt.plugins.IvyPlugin does :| + override def projectSettings = Seq( + dependencyResolution := mkDependencyResolution.value, + coursierConfiguration := mkCoursierConfiguration.value + ) + + + private def mkCoursierConfiguration: Def.Initialize[Task[CoursierConfiguration]] = + Def.task { + val (rs, other) = (fullResolvers.value.toVector, otherResolvers.value.toVector) + val s = streams.value + Classpaths.warnResolversConflict(rs ++: other, s.log) + CoursierConfiguration() + .withResolvers(rs) + .withOtherResolvers(other) + .withLog(s.log) + } + private def mkDependencyResolution: Def.Initialize[Task[DependencyResolution]] = + Def.task { + CoursierDependencyResolution(coursierConfiguration.value) + } + +} From d63e328665727acfa1e56fa0d50b6d1c9eb8c140 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 11:48:19 +0100 Subject: [PATCH 7/7] Start to run scripted tests for sbt-lm-coursier --- appveyor.yml | 2 +- .../aar-packaging/build.sbt | 0 .../aar-packaging/project/plugins.sbt | 0 .../aar-packaging/src/main/scala/Main.scala | 0 .../{sbt-coursier-group-1 => shared-1}/aar-packaging/test | 0 .../config-deps-resolution/build.sbt | 0 .../config-deps-resolution/project/plugins.sbt | 0 .../project/src/main/scala/sbt/MyPlugin.scala | 0 .../config-deps-resolution/src/main/scala/App.scala | 0 .../config-deps-resolution/test | 0 .../from-wrong-url/build.sbt | 0 .../from-wrong-url/project/plugins.sbt | 0 .../from-wrong-url/src/main/scala/Main.scala | 0 .../{sbt-coursier-group-1 => shared-1}/from-wrong-url/test | 0 .../hadoop-yarn-server-resourcemanager/build.sbt | 0 .../hadoop-yarn-server-resourcemanager/project/plugins.sbt | 0 .../src/main/scala/Main.scala | 0 .../hadoop-yarn-server-resourcemanager/test | 0 .../maven-compatible/build.sbt | 0 .../maven-compatible/project/plugins.sbt | 0 .../maven-compatible/src/main/scala/Main.scala | 0 .../{sbt-coursier-group-2 => shared-2}/maven-compatible/test | 0 .../missing-credentials/build.sbt | 0 .../missing-credentials/project/plugins.sbt | 0 .../missing-credentials/src/main/scala/Main.scala | 0 .../missing-credentials/test | 0 .../neo-sbt-scalafmt/build.sbt | 0 .../neo-sbt-scalafmt/project/extra.sbt | 0 .../neo-sbt-scalafmt/project/plugins.sbt | 0 .../neo-sbt-scalafmt/src/main/scala/Main.scala | 0 .../{sbt-coursier-group-2 => shared-2}/neo-sbt-scalafmt/test | 0 .../no-pom-artifact/build.sbt | 0 .../no-pom-artifact/project/plugins.sbt | 0 .../{sbt-coursier-group-2 => shared-2}/no-pom-artifact/test | 0 .../{sbt-coursier-group-2 => shared-2}/scala-jars/build.sbt | 0 .../scala-jars/project/plugins.sbt | 0 .../scala-jars/src/main/scala/Main.scala | 0 .../{sbt-coursier-group-2 => shared-2}/scala-jars/test | 0 .../{sbt-coursier-group-2 => shared-2}/scala-js/build.sbt | 0 .../scala-js/project/extra.sbt | 0 .../scala-js/project/plugins.sbt | 0 .../{sbt-coursier-group-2 => shared-2}/scala-js/test | 0 .../{sbt-coursier-group-2 => shared-2}/simple/build.sbt | 0 .../simple/project/plugins.sbt | 0 .../simple/src/main/scala/Main.scala | 0 .../sbt-test/{sbt-coursier-group-2 => shared-2}/simple/test | 0 .../typelevel-force-version-stdlib/build.sbt | 0 .../typelevel-force-version-stdlib/project/plugins.sbt | 0 .../typelevel-force-version-stdlib/src/main/scala/Main.scala | 0 .../typelevel-force-version-stdlib/test | 0 .../{sbt-coursier-group-2 => shared-2}/typelevel/build.sbt | 0 .../typelevel/project/plugins.sbt | 0 .../typelevel/src/main/scala/Main.scala | 0 .../{sbt-coursier-group-2 => shared-2}/typelevel/test | 0 .../{sbt-coursier-group-2 => shared-2}/unidoc/build.sbt | 0 .../unidoc/project/extra.sbt | 0 .../unidoc/project/plugins.sbt | 0 .../unidoc/src/main/scala/Foo.scala | 0 .../sbt-test/{sbt-coursier-group-2 => shared-2}/unidoc/test | 0 .../{sbt-coursier-group-2 => shared-2}/zookeeper/build.sbt | 0 .../zookeeper/project/plugins.sbt | 0 .../zookeeper/src/main/scala/Main.scala | 0 .../{sbt-coursier-group-2 => shared-2}/zookeeper/test | 0 scripts/travis.sh | 5 ++++- 64 files changed, 5 insertions(+), 2 deletions(-) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/aar-packaging/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/aar-packaging/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/aar-packaging/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/aar-packaging/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/config-deps-resolution/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/config-deps-resolution/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/config-deps-resolution/src/main/scala/App.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/config-deps-resolution/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/from-wrong-url/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/from-wrong-url/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/from-wrong-url/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/from-wrong-url/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/hadoop-yarn-server-resourcemanager/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/hadoop-yarn-server-resourcemanager/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/hadoop-yarn-server-resourcemanager/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/maven-compatible/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/maven-compatible/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/maven-compatible/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/maven-compatible/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/missing-credentials/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/missing-credentials/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/missing-credentials/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/missing-credentials/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/neo-sbt-scalafmt/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/neo-sbt-scalafmt/project/extra.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/neo-sbt-scalafmt/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/neo-sbt-scalafmt/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/neo-sbt-scalafmt/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/no-pom-artifact/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/no-pom-artifact/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/no-pom-artifact/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/scala-jars/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/scala-jars/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/scala-jars/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/scala-jars/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/scala-js/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/scala-js/project/extra.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/scala-js/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/scala-js/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/simple/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/simple/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/simple/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/simple/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/typelevel-force-version-stdlib/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/typelevel-force-version-stdlib/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/typelevel-force-version-stdlib/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/typelevel-force-version-stdlib/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/typelevel/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/typelevel/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/typelevel/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/typelevel/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/unidoc/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/unidoc/project/extra.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/unidoc/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/unidoc/src/main/scala/Foo.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/unidoc/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/zookeeper/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/zookeeper/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/zookeeper/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-2 => shared-2}/zookeeper/test (100%) diff --git a/appveyor.yml b/appveyor.yml index 04d77a095..257dac8c4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,7 @@ environment: build_script: - ps: Start-Job -filepath .\metadata\scripts\start-it-auth-server.ps1 -ArgumentList $pwd\metadata, $env:TEST_REPOSITORY_HOST, $env:TEST_REPOSITORY_PORT, $env:TEST_REPOSITORY_USER, $env:TEST_REPOSITORY_PASSWORD test_script: - - sbt ++2.12.7 sbt-coursier/scripted sbt-shading/scripted + - sbt ++2.12.7 "sbt-lm-coursier/scripted shared-1/*" "sbt-lm-coursier/scripted shared-2/*" sbt-coursier/scripted sbt-shading/scripted branches: only: - master diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/test b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/test rename to modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/src/main/scala/App.scala b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/src/main/scala/App.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/src/main/scala/App.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/src/main/scala/App.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/test b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/test rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/test b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/test rename to modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/test b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/test rename to modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/test b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/test rename to modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/test b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/test rename to modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/extra.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/extra.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/extra.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/test b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/test rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/test b/modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/test rename to modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/test b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/test rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-js/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/extra.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/extra.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/extra.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/test b/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/test rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-js/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/simple/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/simple/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/test b/modules/sbt-coursier/src/sbt-test/shared-2/simple/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/test rename to modules/sbt-coursier/src/sbt-test/shared-2/simple/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/test b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/test rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/test b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/test rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/extra.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/extra.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/extra.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/src/main/scala/Foo.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/src/main/scala/Foo.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/src/main/scala/Foo.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/test b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/test rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/test b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/test rename to modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/test diff --git a/scripts/travis.sh b/scripts/travis.sh index af5522f57..1cc647126 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -20,7 +20,10 @@ sbtShading() { } runLmCoursierTests() { - sbt ++$TRAVIS_SCALA_VERSION lm-coursier/test + ./metadata/scripts/with-test-repo.sh sbt \ + ++$TRAVIS_SCALA_VERSION \ + lm-coursier/test \ + "sbt-lm-coursier/scripted shared-1/* shared-2/*" } runSbtCoursierTests() {