Take care of deprecation warnings (#332)

ckipp01 · web-flow · commit 3a02728bf861 · 2021-05-11T14:27:40.000+02:00
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/IOUtils.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/IOUtils.scala
@@ -80,6 +80,9 @@ object IOUtils {
           acc += (line.split(" ").toList match {
             case List(idx, clazz) => (idx.toInt, clazz)
             case List(idx) => (idx.toInt, "")
+            // This should never really happen but to avoid a match error we'll default to a 0
+            // index here since we start with 1 anyways.
+            case _ => (0, "")
           })
         }
       }
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala
@@ -75,32 +75,32 @@ object Serializer {
   def coverageFile(dataDir: String): File = new File(dataDir, Constants.CoverageFileName)
 
   def deserialize(file: File): Coverage = {
-    deserialize(Source.fromFile(file)(Codec.UTF8).getLines)
+    deserialize(Source.fromFile(file)(Codec.UTF8).getLines())
   }
 
   def deserialize(lines: Iterator[String]): Coverage = {
     def toStatement(lines: Iterator[String]): Statement = {
-      val id: Int = lines.next.toInt
-      val sourcePath = lines.next
-      val packageName = lines.next
-      val className = lines.next
-      val classType = lines.next
-      val fullClassName = lines.next
-      val method = lines.next
+      val id: Int = lines.next().toInt
+      val sourcePath = lines.next()
+      val packageName = lines.next()
+      val className = lines.next()
+      val classType = lines.next()
+      val fullClassName = lines.next()
+      val method = lines.next()
       val loc = Location(packageName, className, fullClassName, ClassType.fromString(classType), method, sourcePath)
-      val start: Int = lines.next.toInt
-      val end: Int = lines.next.toInt
-      val lineNo: Int = lines.next.toInt
-      val symbolName: String = lines.next
-      val treeName: String = lines.next
-      val branch: Boolean = lines.next.toBoolean
-      val count: Int = lines.next.toInt
-      val ignored: Boolean = lines.next.toBoolean
+      val start: Int = lines.next().toInt
+      val end: Int = lines.next().toInt
+      val lineNo: Int = lines.next().toInt
+      val symbolName: String = lines.next()
+      val treeName: String = lines.next()
+      val branch: Boolean = lines.next().toBoolean
+      val count: Int = lines.next().toInt
+      val ignored: Boolean = lines.next().toBoolean
       val desc = lines.toList.mkString("\n")
       Statement(loc, id, start, end, lineNo, desc, symbolName, treeName, branch, count, ignored)
     }
 
-    val headerFirstLine = lines.next
+    val headerFirstLine = lines.next()
     require(headerFirstLine == "# Coverage data, format version: 2.0", "Wrong file format")
 
     val linesWithoutHeader = lines.dropWhile(_.startsWith("#"))
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala
@@ -10,7 +10,7 @@ import scala.xml.{Node, PrettyPrinter}
 /** @author Stephen Samuel */
 class CoberturaXmlWriter(sourceDirectories: Seq[File], outputDir: File) extends BaseReportWriter(sourceDirectories, outputDir) {
 
-  def this (baseDir: File, outputDir: File) {
+  def this (baseDir: File, outputDir: File) = {
     this(Seq(baseDir), outputDir)
   }
 
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/CodeGrid.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/CodeGrid.scala
@@ -8,7 +8,7 @@ import scala.io.Source
 class CodeGrid(mFile: MeasuredFile, sourceEncoding: Option[String]) {
 
   // for backward compatibility only
-  def this (mFile: MeasuredFile) {
+  def this (mFile: MeasuredFile) = {
     this(mFile, None);
   }
 
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala
@@ -11,17 +11,17 @@ import scala.xml.Node
 class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File, sourceEncoding: Option[String]) extends BaseReportWriter(sourceDirectories, outputDir) {
 
   // to be used by gradle-scoverage plugin
-  def this (sourceDirectories: Array[File], outputDir: File, sourceEncoding: Option[String]) {
+  def this (sourceDirectories: Array[File], outputDir: File, sourceEncoding: Option[String]) = {
     this (sourceDirectories.toSeq, outputDir, sourceEncoding)
   }
 
   // for backward compatibility only
-  def this (sourceDirectories: Seq[File], outputDir: File) {
+  def this (sourceDirectories: Seq[File], outputDir: File) = {
     this(sourceDirectories, outputDir, None);
   }
   
   // for backward compatibility only
-  def this (sourceDirectory: File, outputDir: File) {
+  def this (sourceDirectory: File, outputDir: File) = {
     this(Seq(sourceDirectory), outputDir)
   }
   
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala
@@ -9,7 +9,7 @@ import scala.xml.{Node, PrettyPrinter}
 /** @author Stephen Samuel */
 class ScoverageXmlWriter(sourceDirectories: Seq[File], outputDir: File, debug: Boolean) extends BaseReportWriter(sourceDirectories, outputDir) {
 
-  def this (sourceDir: File, outputDir: File, debug: Boolean) {
+  def this (sourceDir: File, outputDir: File, debug: Boolean) = {
     this(Seq(sourceDir), outputDir, debug)
   }
 
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala
@@ -29,7 +29,7 @@ object ScoverageCompiler {
 
     val path = s"./scalac-scoverage-plugin/target/scala-$ScalaVersion/test-generated-classes"
     new File(path).mkdirs()
-    s.d.value = path
+    s.outdir.value = path
     s
   }
 
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageHtmlWriterTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageHtmlWriterTest.scala
@@ -59,7 +59,7 @@ class ScoverageHtmlWriterTest extends AnyFunSuite {
     val htmls = List("overview.html", "coverage.sample.html")
 
     for (html <- htmls) {
-      val xml = XML.loadString(Source.fromFile(new File(outputDir, html)).getLines.mkString)
+      val xml = XML.loadString(Source.fromFile(new File(outputDir, html)).getLines().mkString)
       val links = for (node <- xml \\ "a") yield {
         node.attribute("href") match {
           case Some(url) => url.toString
@@ -77,7 +77,7 @@ class ScoverageHtmlWriterTest extends AnyFunSuite {
     coverage.add(statementForClassContainingHtml)
     val outputDir = writeCoverageToTemporaryDir(coverage)
 
-    val contentsOfFileWithEmbeddedHtml = Source.fromFile(new File(outputDir, "ClassContainingHtml.scala.html")).getLines.mkString
+    val contentsOfFileWithEmbeddedHtml = Source.fromFile(new File(outputDir, "ClassContainingHtml.scala.html")).getLines().mkString
     assert( !contentsOfFileWithEmbeddedHtml.contains("<div>HTML content</div>") )
     assert( contentsOfFileWithEmbeddedHtml.contains("&lt;div&gt;HTML content&lt;/div&gt;") )
   }
diff --git a/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/FileWriter.scala b/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/FileWriter.scala
@@ -9,7 +9,7 @@ class FileWriter(file: File, append: Boolean) {
   def this(file: String, append: Boolean) = this(new File(file), append)
 
   def append(csq: CharSequence) = {
-    File.write(file.getPath, csq.toString)
+    File.write(file.getPath(), csq.toString)
     this
   }
 
diff --git a/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/Source.scala b/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/Source.scala
@@ -10,7 +10,7 @@ object Source {
   def fromFile(file: File) = {
     new OrigSource {
 
-      val iter = file.readFile.toCharArray.iterator
+      val iter = file.readFile().toCharArray.iterator
     }
   }
-}
+}
diff --git a/scalac-scoverage-runtime/shared/src/main/scala/scoverage/Invoker.scala b/scalac-scoverage-runtime/shared/src/main/scala/scoverage/Invoker.scala
@@ -68,12 +68,12 @@ object Invoker {
       .find(name => name.endsWith("suite") || name.endsWith("spec") || name.endsWith("test"))
       .getOrElse("")
 
-  def measurementFile(dataDir: File): File = measurementFile(dataDir.getAbsolutePath)
+  def measurementFile(dataDir: File): File = measurementFile(dataDir.getAbsolutePath())
   def measurementFile(dataDir: String): File = new File(dataDir, MeasurementsPrefix + runtimeUUID + "."  + Thread.currentThread.getId)
 
   def findMeasurementFiles(dataDir: String): Array[File] = findMeasurementFiles(new File(dataDir))
   def findMeasurementFiles(dataDir: File): Array[File] = dataDir.listFiles(new FileFilter {
-    override def accept(pathname: File): Boolean = pathname.getName.startsWith(MeasurementsPrefix)
+    override def accept(pathname: File): Boolean = pathname.getName().startsWith(MeasurementsPrefix)
   })
 
   // loads all the invoked statement ids from the given files
diff --git a/scalac-scoverage-runtime/shared/src/test/scala/scoverage/InvokerMultiModuleTest.scala b/scalac-scoverage-runtime/shared/src/test/scala/scoverage/InvokerMultiModuleTest.scala
@@ -39,12 +39,12 @@ class InvokerMultiModuleTest extends AnyFunSuite with BeforeAndAfter {
 
   after {
     deleteMeasurementFiles()
-    measurementDir.foreach(_.delete)
+    measurementDir.foreach(_.delete())
   }
 
   private def deleteMeasurementFiles(): Unit = {
     measurementDir.foreach((md) => {
-      if (md.isDirectory)
+      if (md.isDirectory())
         md.listFiles().foreach(_.delete())
     })
   }

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@ object IOUtils {`
`80`	`80`	`acc += (line.split(" ").toList match {`
`81`	`81`	`case List(idx, clazz) => (idx.toInt, clazz)`
`82`	`82`	`case List(idx) => (idx.toInt, "")`
	`83`	`+ // This should never really happen but to avoid a match error we'll default to a 0`
	`84`	`+ // index here since we start with 1 anyways.`
	`85`	`+ case _ => (0, "")`
`83`	`86`	`})`
`84`	`87`	`}`
`85`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import scala.xml.{Node, PrettyPrinter}`
`10`	`10`	`/** @author Stephen Samuel */`
`11`	`11`	`class CoberturaXmlWriter(sourceDirectories: Seq[File], outputDir: File) extends BaseReportWriter(sourceDirectories, outputDir) {`
`12`	`12`
`13`		`- def this (baseDir: File, outputDir: File) {`
	`13`	`+ def this (baseDir: File, outputDir: File) = {`
`14`	`14`	`this(Seq(baseDir), outputDir)`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import scala.io.Source`
`8`	`8`	`class CodeGrid(mFile: MeasuredFile, sourceEncoding: Option[String]) {`
`9`	`9`
`10`	`10`	`// for backward compatibility only`
`11`		`- def this (mFile: MeasuredFile) {`
	`11`	`+ def this (mFile: MeasuredFile) = {`
`12`	`12`	`this(mFile, None);`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,17 @@ import scala.xml.Node`
`11`	`11`	`class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File, sourceEncoding: Option[String]) extends BaseReportWriter(sourceDirectories, outputDir) {`
`12`	`12`
`13`	`13`	`// to be used by gradle-scoverage plugin`
`14`		`- def this (sourceDirectories: Array[File], outputDir: File, sourceEncoding: Option[String]) {`
	`14`	`+ def this (sourceDirectories: Array[File], outputDir: File, sourceEncoding: Option[String]) = {`
`15`	`15`	`this (sourceDirectories.toSeq, outputDir, sourceEncoding)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`// for backward compatibility only`
`19`		`- def this (sourceDirectories: Seq[File], outputDir: File) {`
	`19`	`+ def this (sourceDirectories: Seq[File], outputDir: File) = {`
`20`	`20`	`this(sourceDirectories, outputDir, None);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`// for backward compatibility only`
`24`		`- def this (sourceDirectory: File, outputDir: File) {`
	`24`	`+ def this (sourceDirectory: File, outputDir: File) = {`
`25`	`25`	`this(Seq(sourceDirectory), outputDir)`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import scala.xml.{Node, PrettyPrinter}`
`9`	`9`	`/** @author Stephen Samuel */`
`10`	`10`	`class ScoverageXmlWriter(sourceDirectories: Seq[File], outputDir: File, debug: Boolean) extends BaseReportWriter(sourceDirectories, outputDir) {`
`11`	`11`
`12`		`- def this (sourceDir: File, outputDir: File, debug: Boolean) {`
	`12`	`+ def this (sourceDir: File, outputDir: File, debug: Boolean) = {`
`13`	`13`	`this(Seq(sourceDir), outputDir, debug)`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ object ScoverageCompiler {`
`29`	`29`
`30`	`30`	`val path = s"./scalac-scoverage-plugin/target/scala-$ScalaVersion/test-generated-classes"`
`31`	`31`	`new File(path).mkdirs()`
`32`		`- s.d.value = path`
	`32`	`+ s.outdir.value = path`
`33`	`33`	`s`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class FileWriter(file: File, append: Boolean) {`
`9`	`9`	`def this(file: String, append: Boolean) = this(new File(file), append)`
`10`	`10`
`11`	`11`	`def append(csq: CharSequence) = {`
`12`		`- File.write(file.getPath, csq.toString)`
	`12`	`+ File.write(file.getPath(), csq.toString)`
`13`	`13`	`this`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ object Source {`
`10`	`10`	`def fromFile(file: File) = {`
`11`	`11`	`new OrigSource {`
`12`	`12`
`13`		`- val iter = file.readFile.toCharArray.iterator`
	`13`	`+ val iter = file.readFile().toCharArray.iterator`
`14`	`14`	`}`
`15`	`15`	`}`
`16`		`-}`
	`16`	`+}`