Upgrade scalac-scoverage-plugin version used from 1.4.1 to latest 1.4.11

Author: gslowikowski

pom.xml

@@ -28,7 +28,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage</groupId>
     <artifactId>scoverage-maven-plugin</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>SCoverage Maven Plugin</name>
@@ -90,13 +90,14 @@ under the License.
         <maven.version>2.2.1</maven.version>
         <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
 
-        <scalac-scoverage-plugin.version>1.4.1</scalac-scoverage-plugin.version>
+        <scalac-scoverage-plugin.version>1.4.11</scalac-scoverage-plugin.version>
+        <scalac-scoverage-plugin.scala.version>2.12.15</scalac-scoverage-plugin.scala.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.scoverage</groupId>
-            <artifactId>scalac-scoverage-plugin_2.12</artifactId>
+            <artifactId>scalac-scoverage-plugin_${scalac-scoverage-plugin.scala.version}</artifactId>
             <version>${scalac-scoverage-plugin.version}</version>
         </dependency>
 

src/main/java/org/scoverage/plugin/SCoverageCheckMojo.java

@@ -29,6 +29,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
+import scala.Tuple2;
 import scala.collection.JavaConverters;
 
 import scoverage.Coverage;
@@ -149,7 +150,8 @@ public void execute() throws MojoFailureException
 
         Coverage coverage = Serializer.deserialize( coverageFile );
         List<File> measurementFiles = Arrays.asList( IOUtils.findMeasurementFiles( dataDirectory ) );
-        scala.collection.Set<Object> measurements = IOUtils.invoked( JavaConverters.asScalaBuffer( measurementFiles ) );
+        scala.collection.Set<Tuple2<Object, String>> measurements =
+                IOUtils.invoked( JavaConverters.asScalaBuffer( measurementFiles ) );
         coverage.apply( measurements );
 
         int branchCount = coverage.branchCount();

src/main/java/org/scoverage/plugin/SCoverageReportMojo.java

@@ -44,6 +44,7 @@
 import org.codehaus.plexus.util.StringUtils;
 
 import scala.Option;
+import scala.Tuple2;
 import scala.collection.JavaConverters;
 import scala.collection.Seq;
 
@@ -422,7 +423,8 @@ private void generateReports()
         getLog().info( String.format( "Reading scoverage measurements [%s*]...",
                                       new File( dataDirectory, Constants.MeasurementsPrefix() ).getAbsolutePath() ) );
         List<File> measurementFiles = Arrays.asList( IOUtils.findMeasurementFiles( dataDirectory ) );
-        scala.collection.Set<Object> measurements = IOUtils.invoked( JavaConverters.asScalaBuffer( measurementFiles ) );
+        scala.collection.Set<Tuple2<Object, String>> measurements =
+                IOUtils.invoked( JavaConverters.asScalaBuffer( measurementFiles ) );
         coverage.apply( measurements );
 
         getLog().info( "Generating coverage reports..." );