Cleanup multiple depreacted collection API calls

Author: JanBessai

scalac-scoverage-plugin/src/main/scala/scoverage/plugin.scala

@@ -18,15 +18,19 @@ class ScoveragePlugin(val global: Global) extends Plugin {
   val instrumentationComponent = new ScoverageInstrumentationComponent(global, extraAfterPhase, extraBeforePhase)
   override val components: List[PluginComponent] = List(instrumentationComponent)
 
+  private def parseExclusionEntry(entryName: String, inOption: String): Seq[String] =
+    inOption.substring(entryName.length).split(";").map(_.trim).toIndexedSeq.filterNot(_.isEmpty)
+
   override def processOptions(opts: List[String], error: String => Unit): Unit = {
     val options = new ScoverageOptions
+
     for (opt <- opts) {
       if (opt.startsWith("excludedPackages:")) {
-        options.excludedPackages = opt.substring("excludedPackages:".length).split(";").map(_.trim).filterNot(_.isEmpty)
+        options.excludedPackages = parseExclusionEntry("excludedPackages", opt)
       } else if (opt.startsWith("excludedFiles:")) {
-        options.excludedFiles = opt.substring("excludedFiles:".length).split(";").map(_.trim).filterNot(_.isEmpty)
+        options.excludedFiles = parseExclusionEntry("excludedFiles", opt)
       } else if (opt.startsWith("excludedSymbols:")) {
-        options.excludedSymbols = opt.substring("excludedSymbols:".length).split(";").map(_.trim).filterNot(_.isEmpty)
+        options.excludedSymbols = parseExclusionEntry("excludedSymbols", opt)
       } else if (opt.startsWith("dataDir:")) {
         options.dataDir = opt.substring("dataDir:".length)
       } else if (opt.startsWith("extraAfterPhase:") || opt.startsWith("extraBeforePhase:")) {

scalac-scoverage-plugin/src/test/scala/scoverage/IOUtilsTest.scala

@@ -36,7 +36,7 @@ class IOUtilsTest extends FreeSpec with MockitoSugar with OneInstancePerTest wit
       writer2.close()
 
       val files = IOUtils.findMeasurementFiles(file1.getParent)
-      val invoked = IOUtils.invoked(files)
+      val invoked = IOUtils.invoked(files.toIndexedSeq)
       assert(invoked.toSet === Set(1, 2, 5, 7, 9, 10, 14))
 
       file1.delete()

scalac-scoverage-runtime/shared/src/test/scala/scoverage/InvokerMultiModuleTest.scala

@@ -27,12 +27,12 @@ class InvokerMultiModuleTest extends FunSuite with BeforeAndAfter {
 
     // Verify measurements went to correct directory
     val measurementFiles0 = Invoker.findMeasurementFiles(measurementDir(0))
-    val idsFromFile0 = Invoker.invoked(measurementFiles0).toSet
+    val idsFromFile0 = Invoker.invoked(measurementFiles0.toIndexedSeq).toSet
 
     idsFromFile0 === testIds.filter { i: Int => i % 2 == 0 }
 
     val measurementFiles1 = Invoker.findMeasurementFiles(measurementDir(0))
-    val idsFromFile1 = Invoker.invoked(measurementFiles1).toSet
+    val idsFromFile1 = Invoker.invoked(measurementFiles1.toIndexedSeq).toSet
     idsFromFile1 === testIds.filter { i: Int => i % 2 == 1 }
   }