diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 538acb3..bf6e607 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.3-SNAPSHOT -bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8-SNAPSHOT +bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.2 +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.7 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.version=2.0.1 diff --git a/examples/src/bld/java/com/example/ExamplesBuild.java b/examples/src/bld/java/com/example/ExamplesBuild.java index b5a62f8..0c4f60a 100644 --- a/examples/src/bld/java/com/example/ExamplesBuild.java +++ b/examples/src/bld/java/com/example/ExamplesBuild.java @@ -25,8 +25,8 @@ public class ExamplesBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3))); } public static void main(String[] args) { diff --git a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java index a581707..428b5d3 100644 --- a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java +++ b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java @@ -34,7 +34,7 @@ public class JacocoReportOperationBuild extends Project { public JacocoReportOperationBuild() { pkg = "rife.bld.extension"; name = "JacocoReportOperation"; - version = version(0, 9, 8, "SNAPSHOT"); + version = version(0, 9, 7); javaRelease = 17; @@ -47,8 +47,8 @@ public class JacocoReportOperationBuild extends Project { .include(dependency("org.jacoco", "jacoco", jacocoVersion).exclude("*", "org.jacoco.doc")) .include(dependency("com.uwyn.rife2", "bld", version(2, 0, 1))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3))) .include(dependency("org.assertj", "assertj-core", version(3, 26, 3))); javadocOperation() diff --git a/src/main/java/rife/bld/extension/JacocoReportOperation.java b/src/main/java/rife/bld/extension/JacocoReportOperation.java index 81e8262..fbcad47 100644 --- a/src/main/java/rife/bld/extension/JacocoReportOperation.java +++ b/src/main/java/rife/bld/extension/JacocoReportOperation.java @@ -35,6 +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; @@ -110,7 +111,6 @@ public class JacocoReportOperation extends AbstractOperation classFiles) { classFiles_.addAll(classFiles); return this; } - /** - * Sets the locations of Java class files. - * - * @param classFiles the class files - * @return this operation instance - * @see #classFiles(Path...) - */ - public JacocoReportOperation classFilesPaths(Collection classFiles) { - return classFiles(classFiles.stream().map(Path::toFile).toList()); - } - - /** - * Sets the locations of Java class files. - * - * @param classFiles the class files - * @return this operation instance - * @see #classFiles(String...) - */ - public JacocoReportOperation classFilesStrings(Collection classFiles) { - return classFiles(classFiles.stream().map(File::new).toList()); - } - /** * Sets the location of the CSV report. * @@ -203,15 +169,6 @@ public class JacocoReportOperation extends AbstractOperation execFiles) { execFiles_.addAll(execFiles); @@ -309,28 +244,6 @@ public class JacocoReportOperation extends AbstractOperation execFiles) { - return execFiles(execFiles.stream().map(Path::toFile).toList()); - } - - /** - * Sets the locations of the JaCoCo *.exec files to read. - * - * @param execFiles the exec files - * @return this operation instance - * @see #execFiles(String...) - */ - public JacocoReportOperation execFilesStrings(Collection execFiles) { - return execFiles(execFiles.stream().map(File::new).toList()); - } - /** * Performs the operation execution that can be wrapped by the {@code #executeOnce} call. */ @@ -430,16 +343,6 @@ public class JacocoReportOperation extends AbstractOperation sourceFiles) { sourceFiles_.addAll(sourceFiles); @@ -553,28 +444,6 @@ public class JacocoReportOperation extends AbstractOperation sourceFiles) { - return sourceFiles(sourceFiles.stream().map(Path::toFile).toList()); - } - - /** - * Sets the locations of the source files. (e.g., {@code src/main/java}) - * - * @param sourceFiles the source files - * @return this operation instance - * @see #sourceFiles(String...) - */ - public JacocoReportOperation sourceFilesStrings(Collection sourceFiles) { - return sourceFiles(sourceFiles.stream().map(File::new).toList()); - } - @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops") private ISourceFileLocator sourceLocator() { var multi = new MultiSourceFileLocator(tabWidth_); @@ -633,14 +502,4 @@ public class JacocoReportOperation extends AbstractOperation