Update setting additional Scala compiler parameters

This makes the plugin compatible with upcoming Gradle 8 Fixes #86
augi · Feb 2, 2023 · 9e61619 · 9e61619
1 parent d783941
commit 9e61619
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/main/groovy/cz/augi/gradle/wartremover/WartremoverPlugin.groovy b/src/main/groovy/cz/augi/gradle/wartremover/WartremoverPlugin.groovy
@@ -11,15 +11,18 @@ class WartremoverPlugin implements Plugin<Project> {
         project.afterEvaluate {
             project.dependencies { scalaCompilerPlugins "org.wartremover:wartremover_${getWartremoverArtifactSuffix(project)}" }
             project.tasks.withType(ScalaCompile).configureEach { scalaTask ->
-                if (scalaTask.scalaCompileOptions.additionalParameters == null) {
-                    scalaTask.scalaCompileOptions.additionalParameters = new ArrayList<String>()
+                List<String> updatedParameters = new ArrayList<>()
+                if (scalaTask.scalaCompileOptions.additionalParameters != null) {
+                    updatedParameters.addAll(scalaTask.scalaCompileOptions.additionalParameters)
                 }
                 WartremoverSettings settings = scalaTask.name.toLowerCase().contains('test') ? extension.getTest() : extension
-                scalaTask.scalaCompileOptions.additionalParameters.addAll(settings.errorWarts.collect { getErrorWartDirective(it) })
-                scalaTask.scalaCompileOptions.additionalParameters.addAll(settings.warningWarts.collect { getWarningWartDirective(it) })
-                scalaTask.scalaCompileOptions.additionalParameters.addAll(settings.excludedFiles.collect { getExludedFileDirective(project.file(it).canonicalPath) })
+                updatedParameters.addAll(settings.errorWarts.collect { getErrorWartDirective(it) })
+                updatedParameters.addAll(settings.warningWarts.collect { getWarningWartDirective(it) })
+                updatedParameters.addAll(settings.excludedFiles.collect { getExludedFileDirective(project.file(it).canonicalPath) })
 
-                scalaTask.scalaCompileOptions.additionalParameters.addAll(settings.classPaths.collect { getClasspathDirective(it) })
+                updatedParameters.addAll(settings.classPaths.collect { getClasspathDirective(it) })
+
+                scalaTask.scalaCompileOptions.additionalParameters = updatedParameters
             }
         }
     }