From 5992c1d2d71004c3e17d21f56a5f4cc20a5fcfad Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sun, 21 Jan 2018 22:28:05 +0100 Subject: [PATCH] Remove deprecated "source repository" stuff --- .../main/scala-2.11/coursier/cli/Helper.scala | 47 +------------------ .../scala-2.11/coursier/cli/Options.scala | 3 -- 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/cli/src/main/scala-2.11/coursier/cli/Helper.scala b/cli/src/main/scala-2.11/coursier/cli/Helper.scala index e4133e901..2ae88bf5a 100644 --- a/cli/src/main/scala-2.11/coursier/cli/Helper.scala +++ b/cli/src/main/scala-2.11/coursier/cli/Helper.scala @@ -118,18 +118,6 @@ class Helper( MavenRepository("https://repo1.maven.org/maven2") ) - val sourceDirectories = common.sources.map { path => - val subDir = "target/repository" - val dir = new File(path) - val repoDir = new File(dir, subDir) - if (!dir.exists()) - Console.err.println(s"Warning: sources $path not found") - else if (!repoDir.exists()) - Console.err.println(s"Warning: directory $subDir not found under sources path $path") - - repoDir - } - val repositoriesValidation = CacheParse.repositories(common.repository).map { repos0 => var repos = (if (common.noDefault) Nil else defaultRepositories) ++ repos0 @@ -150,10 +138,7 @@ class Helper( val repositories = repositoriesValidation match { case Success(repos) => - val sourceRepositories = sourceDirectories.map(dir => - MavenRepository(dir.toURI.toString, changing = Some(true)) - ) - sourceRepositories ++ repos + repos case Failure(errors) => prematureExit( s"Error with repositories:\n${errors.list.toList.map(" "+_).mkString("\n")}" @@ -256,36 +241,8 @@ class Helper( s"Cannot parse forced versions:\n" + forceVersionErrors.map(" "+_).mkString("\n") } - val sourceRepositoryForceVersions = sourceDirectories.flatMap { base => - - // FIXME Also done in the plugin module - - def pomDirComponents(f: File, components: Vector[String]): Stream[Vector[String]] = - if (f.isDirectory) { - val components0 = components :+ f.getName - Option(f.listFiles()).toStream.flatten.flatMap(pomDirComponents(_, components0)) - } else if (f.getName.endsWith(".pom")) - Stream(components) - else - Stream.empty - - Option(base.listFiles()) - .toVector - .flatten - .flatMap(pomDirComponents(_, Vector())) - // at least 3 for org / name / version - the contrary should not happen, but who knows - .filter(_.length >= 3) - .map { components => - val org = components.dropRight(2).mkString(".") - val name = components(components.length - 2) - val version = components.last - - Module(org, name) -> version - } - } - val forceVersions = { - val grouped = (forceVersions0 ++ sourceRepositoryForceVersions) + val grouped = forceVersions0 .groupBy { case (mod, _) => mod } .map { case (mod, l) => mod -> l.map { case (_, version) => version } } diff --git a/cli/src/main/scala-2.11/coursier/cli/Options.scala b/cli/src/main/scala-2.11/coursier/cli/Options.scala index 1b1cee8b8..13d6d3776 100644 --- a/cli/src/main/scala-2.11/coursier/cli/Options.scala +++ b/cli/src/main/scala-2.11/coursier/cli/Options.scala @@ -33,9 +33,6 @@ final case class CommonOptions( @Value("maven|sonatype:$repo|ivy2local|bintray:$org/$repo|bintray-ivy:$org/$repo|typesafe:ivy-$repo|typesafe:$repo|sbt-plugin:$repo|ivy:$pattern") @Short("r") repository: List[String] = Nil, - @Help("Source repository - for multiple repositories, separate with comma and/or add this option multiple times") - @Short("R") - sources: List[String] = Nil, @Help("Do not add default repositories (~/.ivy2/local, and Central)") noDefault: Boolean = false, @Help("Modify names in Maven repository paths for SBT plugins")