Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,25 @@ object MimaBuild {
// add task functional-tests that depends on all functional tests
functionalTests := allTests(functionalTests in _).value,
test in IntegrationTest := allTests(test in IntegrationTest in _).value,
mainClass in assembly := Some("com.typesafe.tools.mima.cli.Main")

mimaBinaryIssueFilters ++= {
import com.typesafe.tools.mima.core._
Seq(
// Removed because unused
ProblemFilters.exclude[MissingClassProblem]("com.typesafe.tools.mima.lib.license.License"),
ProblemFilters.exclude[MissingClassProblem]("com.typesafe.tools.mima.lib.license.License$"),

// Removed because CLI dropped
ProblemFilters.exclude[MissingClassProblem]("com.typesafe.tools.mima.cli.MimaSpec"),
ProblemFilters.exclude[MissingClassProblem]("com.typesafe.tools.mima.cli.MimaSpec$"),
ProblemFilters.exclude[MissingClassProblem]("com.typesafe.tools.mima.cli.Main"),
ProblemFilters.exclude[MissingClassProblem]("com.typesafe.tools.mima.cli.Main$"),

// Moved (to functional-tests) because otherwise unused
ProblemFilters.exclude[MissingClassProblem]("com.typesafe.tools.mima.cli.ProblemFiltersConfig"),
ProblemFilters.exclude[MissingClassProblem]("com.typesafe.tools.mima.cli.ProblemFiltersConfig$")
)
}
)
)

Expand Down
3 changes: 0 additions & 3 deletions reporter/build.sbt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import com.typesafe.tools.mima.core.{asClassPathString, baseClassPath}
import java.io.{BufferedInputStream, File, FileInputStream}

import com.typesafe.config.ConfigFactory
import com.typesafe.tools.mima.cli.ProblemFiltersConfig
import com.typesafe.tools.mima.core.Config

import scala.io.Source
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package com.typesafe.tools.mima
package cli
package lib

import com.typesafe.tools.mima.core.{ProblemFilter, ProblemFilters}
import com.typesafe.config._
Expand All @@ -25,16 +25,4 @@ object ProblemFiltersConfig {
ProblemFilters.exclude(problemClassName, matchName)
}
}

/**
* Generates Config definition that filters passed collection of problems.
*/
def problemsToProblemFilterConfig(problems: Seq[core.Problem]): Config = {
val configValues = for {
p <- problems
matchName <- p.matchName
problemName = p.getClass.getSimpleName
} yield Map(problemNameKey -> problemName, matchNameKey -> matchName).asJava
ConfigValueFactory.fromIterable(configValues.asJava).atPath(filterProblemsPath)
}
}
155 changes: 0 additions & 155 deletions reporter/src/main/scala/com/typesafe/tools/mima/cli/Main.scala

This file was deleted.

This file was deleted.