From bbc0a92d23ea944421c698604aa94723f76e7d6b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 6 Nov 2023 12:56:29 -0800
Subject: [PATCH] Added support for method parameters as collection

---
 .idea/misc.xml                                |  6 ++++
 examples/lib/bld/bld-wrapper.properties       |  2 +-
 .../extension/JacocoReportOperationBuild.java |  6 ++--
 .../bld/extension/JacocoReportOperation.java  | 32 ++++++++++++++++---
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 543a8e1..53e2d58 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <entry_points version="2.0">
@@ -33,6 +34,11 @@
     <option name="customRuleSets">
       <list>
         <option value="$PROJECT_DIR$/config/pmd.xml" />
+        <option value="K:\java\semver\config\pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-checkstyle/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-exec/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-testng/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-pitest/config/pmd.xml" />
       </list>
     </option>
     <option name="skipTestSources" value="false" />
diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties
index f891c80..f584724 100644
--- a/examples/lib/bld/bld-wrapper.properties
+++ b/examples/lib/bld/bld-wrapper.properties
@@ -1,6 +1,6 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.1
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.2-SNAPSHOT
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.version=1.7.5
diff --git a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java
index 6f05f9d..fa5e424 100644
--- a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java
+++ b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java
@@ -25,7 +25,8 @@ import rife.bld.publish.PublishScm;
 
 import java.util.List;
 
-import static rife.bld.dependencies.Repository.*;
+import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
+import static rife.bld.dependencies.Repository.RIFE2_RELEASES;
 import static rife.bld.dependencies.Scope.*;
 import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
 
@@ -33,7 +34,7 @@ public class JacocoReportOperationBuild extends Project {
     public JacocoReportOperationBuild() {
         pkg = "rife.bld.extension";
         name = "JacocoReportOperation";
-        version = version(0, 9, 1);
+        version = version(0, 9, 2, "SNAPSHOT");
 
         javaRelease = 17;
         downloadSources = true;
@@ -53,6 +54,7 @@ public class JacocoReportOperationBuild extends Project {
 
         javadocOperation()
                 .javadocOptions()
+                .author()
                 .docLint(NO_MISSING)
                 .link("https://rife2.github.io/bld/")
                 .link("https://rife2.github.io/rife2/");
diff --git a/src/main/java/rife/bld/extension/JacocoReportOperation.java b/src/main/java/rife/bld/extension/JacocoReportOperation.java
index b99413a..d777f63 100644
--- a/src/main/java/rife/bld/extension/JacocoReportOperation.java
+++ b/src/main/java/rife/bld/extension/JacocoReportOperation.java
@@ -35,7 +35,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -113,7 +113,15 @@ public class JacocoReportOperation extends AbstractOperation<JacocoReportOperati
      * Sets the locations of Java class files.
      **/
     public JacocoReportOperation classFiles(File... classFiles) {
-        this.classFiles.addAll(Arrays.stream(classFiles).toList());
+        this.classFiles.addAll(List.of(classFiles));
+        return this;
+    }
+
+    /**
+     * Sets the locations of Java class files.
+     **/
+    public JacocoReportOperation classFiles(Collection<File> classFiles) {
+        this.classFiles.addAll(classFiles);
         return this;
     }
 
@@ -145,7 +153,15 @@ public class JacocoReportOperation extends AbstractOperation<JacocoReportOperati
      * Sets the locations of the JaCoCo *.exec files to read.
      */
     public JacocoReportOperation execFiles(File... execFiles) {
-        this.execFiles.addAll(Arrays.stream(execFiles).toList());
+        this.execFiles.addAll(List.of(execFiles));
+        return this;
+    }
+
+    /**
+     * Sets the locations of the JaCoCo *.exec files to read.
+     */
+    public JacocoReportOperation execFiles(Collection<File> execFiles) {
+        this.execFiles.addAll(execFiles);
         return this;
     }
 
@@ -293,7 +309,15 @@ public class JacocoReportOperation extends AbstractOperation<JacocoReportOperati
      * Sets the locations of the source files. (e.g., {@code src/main/java})
      **/
     public JacocoReportOperation sourceFiles(File... sourceFiles) {
-        this.sourceFiles.addAll(Arrays.stream(sourceFiles).toList());
+        this.sourceFiles.addAll(List.of(sourceFiles));
+        return this;
+    }
+
+    /**
+     * Sets the locations of the source files. (e.g., {@code src/main/java})
+     **/
+    public JacocoReportOperation sourceFiles(Collection<File> sourceFiles) {
+        this.sourceFiles.addAll(sourceFiles);
         return this;
     }