Resolve scala library version according to the resolved compilation classpath

This commit adds support for any plugin which manipulates the configuration via resolution strategy.

Author: eyalroth

src/functionalTest/java/org.scoverage/DetectScalaLibraryTest.java

@@ -11,9 +11,11 @@
 @RunWith(Parameterized.class)
 public class DetectScalaLibraryTest extends ScoverageFunctionalTest {
 
-    private static final String SCALA_VERSION = "0.0";
-    private static final String SCALA_LIBRARY_PARAMETER = "-PdetectedScalaLibraryVersion=" + SCALA_VERSION + ".0";
-    private static final String EXPECTED_OUTPUT = "Using scoverage scalac plugin version '" + SCALA_VERSION;
+    private static final String SCALA_VERSION = "2.12";
+    private static final String SCALA_LIBRARY_PARAMETER = "-PdetectedScalaLibraryVersion=";
+
+    private static final String EXPECTED_OUTPUT_A = "Detected scala library in compilation classpath";
+    private static final String EXPECTED_OUTPUT_B = "Using scoverage scalac plugin version '" + SCALA_VERSION;
 
     @Parameterized.Parameter(0)
     public String projectDir;
@@ -31,13 +33,15 @@ public DetectScalaLibraryTest() {
     @Test
     public void test() {
         setProjectName("detect-scala-library" + projectDir);
+        testWithParameter(SCALA_LIBRARY_PARAMETER + SCALA_VERSION + ".0");
+        testWithParameter(SCALA_LIBRARY_PARAMETER + SCALA_VERSION + ".+");
+    }
 
-        // build supposed to fail since repositories are not configured
-        AssertableBuildResult result = runAndFail("clean", SCALA_LIBRARY_PARAMETER, "--info");
-
-        // all we want to know is that the plugin detected our configured library version
+    private void testWithParameter(String parameter) {
+        AssertableBuildResult result = dryRun("clean", parameter, "--info");
         String output = result.getResult().getOutput();
-        Assert.assertTrue(output.contains(EXPECTED_OUTPUT));
+        Assert.assertTrue(output.contains(EXPECTED_OUTPUT_A));
+        Assert.assertTrue(output.contains(EXPECTED_OUTPUT_B));
     }
 
 }

src/functionalTest/resources/projects/detect-scala-library/compile/build.gradle

@@ -2,6 +2,10 @@ plugins {
     id 'org.scoverage'
 }
 
+repositories {
+    jcenter()
+}
+
 description = 'defines scala library using the "compile" configuration'
 
 dependencies {

src/functionalTest/resources/projects/detect-scala-library/compileOnly/build.gradle

@@ -2,6 +2,10 @@ plugins {
     id 'org.scoverage'
 }
 
+repositories {
+    jcenter()
+}
+
 description = 'defines scala library using the "compileOnly" configuration'
 
 dependencies {

src/functionalTest/resources/projects/detect-scala-library/dependency-management/build.gradle

@@ -3,6 +3,10 @@ plugins {
     id 'org.scoverage'
 }
 
+repositories {
+    jcenter()
+}
+
 description = 'defines scala library using the "implementation" configuration and the dependency-management plugin'
 
 dependencyManagement {

src/functionalTest/resources/projects/detect-scala-library/implementation/build.gradle

@@ -2,6 +2,10 @@ plugins {
     id 'org.scoverage'
 }
 
+repositories {
+    jcenter()
+}
+
 description = 'defines scala library using the "implementation" configuration'
 
 dependencies {

src/main/groovy/org/scoverage/ScoveragePlugin.groovy

@@ -301,36 +301,21 @@ class ScoveragePlugin implements Plugin<PluginAware> {
     }
 
     private String resolveScalaVersion(Project project) {
-        def scalaVersion = null
 
-        def configurations = [
-                project.configurations.compile,
-                project.configurations.compileOnly,
-                project.configurations.implementation
-        ]
-        def dependencies = configurations.collectMany { it.dependencies }
+        def resolvedDependencies = project.configurations.compileClasspath.resolvedConfiguration.firstLevelModuleDependencies
 
-        def scalaLibrary = dependencies.find {
-            it.group == "org.scala-lang" && it.name == "scala-library"
+        def scalaLibrary = resolvedDependencies.find {
+            it.moduleGroup == "org.scala-lang" && it.moduleName == "scala-library"
         }
 
-        if (scalaLibrary != null) {
-            scalaVersion = scalaLibrary.version
-        }
-
-        if (scalaVersion == null && project.pluginManager.hasPlugin("io.spring.dependency-management")) {
-            scalaVersion = project.dependencyManagement.compile.managedVersions["org.scala-lang:scala-library"]
-        }
-
-        if (scalaVersion == null) {
+        if (scalaLibrary == null) {
             project.logger.info("No scala library detected. Using property 'scoverageScalaVersion'")
-            scalaVersion = project.extensions.scoverage.scoverageScalaVersion.get()
+            return project.extensions.scoverage.scoverageScalaVersion.get()
         } else {
             project.logger.info("Detected scala library in compilation classpath")
-            scalaVersion = scalaVersion.substring(0, scalaVersion.lastIndexOf("."))
+            def fullScalaVersion = scalaLibrary.moduleVersion
+            return fullScalaVersion.substring(0, fullScalaVersion.lastIndexOf("."))
         }
-
-        return scalaVersion
     }
 
     private Set<? extends Task> recursiveDependenciesOf(Task task) {