Skip to content

Commit

Permalink
Remove EvictionsProcessor and corresponding test
Browse files Browse the repository at this point in the history
Issue with evictions could not be solved with SBT import. It needs to be
done in compilation process.

Counter-example:

    project A has lib-1.0
    project B depends on A and has lib-1.1
    project C depends on A and has lib-1.2
  • Loading branch information
Nikolay Obedin committed Oct 27, 2015
1 parent f044cc9 commit 5b1fed7
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 1,438 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def newProject(projectName: String): Project =
.settings(
name := "sbt-structure-" + projectName,
organization := "org.jetbrains",
version := "4.3.1",
version := "4.3.2",
licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html")),
unmanagedSourceDirectories in Compile += baseDirectory.value.getParentFile / "shared" / "src" / "main" / "scala",
publishMavenStyle := false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.jetbrains.sbt
package extractors

import org.jetbrains.sbt.processors.{UnusedLibrariesProcessor, EvictionsProcessor}
import org.jetbrains.sbt.structure.StructureData
import sbt._

Expand All @@ -24,10 +23,8 @@ object StructureExtractor extends Extractor {
}

private def extract(acceptedProjectRefs: Seq[ProjectRef])(implicit state: State, options: Options): StructureData = {
val projectsData =
EvictionsProcessor.apply(acceptedProjectRefs, acceptedProjectRefs.flatMap(ProjectExtractor.apply(_)))
val repositoryData =
RepositoryExtractor.apply(acceptedProjectRefs).map(UnusedLibrariesProcessor.apply(projectsData))
val projectsData = acceptedProjectRefs.flatMap(ProjectExtractor.apply(_))
val repositoryData = RepositoryExtractor.apply(acceptedProjectRefs)
val sbtVersion = setting(Keys.sbtVersion).get
val localCachePath = Option(System.getProperty("sbt.ivy.home", System.getProperty("ivy.home")))
StructureData(sbtVersion, projectsData, repositoryData, localCachePath)
Expand Down

This file was deleted.

This file was deleted.

17 changes: 0 additions & 17 deletions extractor/src/test/data/0.13/eviction/project/Build.scala

This file was deleted.

Loading

0 comments on commit 5b1fed7

Please sign in to comment.