Use Configuration type in licenseConfigurations

Author: mdedetrich

src/main/scala/sbtlicensereport/SbtLicenseReport.scala

@@ -37,7 +37,7 @@ object SbtLicenseReport extends AutoPlugin {
     val licenseReportDir = settingKey[File]("The location where we'll write the license reports.")
     val licenseReportStyleRules = settingKey[Option[String]]("The style rules for license report styling.")
     val licenseReportTitle = settingKey[String]("The name of the license report.")
-    val licenseConfigurations = settingKey[Set[String]]("The ivy configurations we wish a report of.")
+    val licenseConfigurations = settingKey[Set[Configuration]]("The ivy configurations we wish a report of.")
     val licenseSelection = settingKey[Seq[LicenseCategory]](
       "A priority-order list mechanism we can use to select licenses for builds that have more than one."
     )
@@ -130,7 +130,7 @@ object SbtLicenseReport extends AutoPlugin {
 
   override lazy val globalSettings = Seq(
     licenseSelection := LicenseCategory.all,
-    licenseConfigurations := Set("compile", "test"),
+    licenseConfigurations := Set(Compile, Test),
     // Here we use an empty partial function
     licenseReportNotes := PartialFunction.empty,
     licenseOverrides := PartialFunction.empty,

src/main/scala/sbtlicensereport/license/LicenseReport.scala

@@ -80,7 +80,7 @@ object LicenseReport {
 
   def makeReport(
       module: IvySbt#Module,
-      configs: Set[String],
+      configs: Set[Configuration],
       licenseSelection: Seq[LicenseCategory],
       overrides: DepModuleInfo => Option[LicenseInfo],
       exclusions: DepModuleInfo => Option[Boolean],
@@ -117,13 +117,13 @@ object LicenseReport {
   /** Picks a single license (or none) for this dependency. */
   private def pickLicenseForDep(
       dep: IvyNode,
-      configs: Set[String],
+      configs: Set[Configuration],
       categories: Seq[LicenseCategory]
   ): Option[DepLicense] =
     for {
       d <- Option(dep)
       cs = dep.getRootModuleConfigurations.toSet
-      filteredConfigs = if (cs.isEmpty) cs else cs.filter(configs)
+      filteredConfigs = if (cs.isEmpty) cs else cs.filter(configs.map(_.name))
       if !filteredConfigs.isEmpty
       if !filteredConfigs.forall(d.isEvicted)
       desc <- Option(dep.getDescriptor)
@@ -142,7 +142,7 @@ object LicenseReport {
 
   private def getLicenses(
       report: ResolveReport,
-      configs: Set[String] = Set.empty,
+      configs: Set[Configuration] = Set.empty,
       categories: Seq[LicenseCategory] = LicenseCategory.all
   ): Seq[DepLicense] = {
     import collection.JavaConverters._
@@ -154,7 +154,7 @@ object LicenseReport {
 
   private def makeReportImpl(
       report: ResolveReport,
-      configs: Set[String],
+      configs: Set[Configuration],
       categories: Seq[LicenseCategory],
       overrides: DepModuleInfo => Option[LicenseInfo],
       exclusions: DepModuleInfo => Option[Boolean],

src/sbt-test/dumpLicenseReport/custom-report/example.sbt

@@ -2,7 +2,7 @@ name := "example"
 
 licenseReportTitle := "lreport"
 
-licenseConfigurations := Set("compile")
+licenseConfigurations := Set(Compile)
 
 licenseSelection := Seq(LicenseCategory.BSD)