From 16f6e1de677368e0885826c81d56dc3e05e95ffb Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 13 Aug 2023 20:13:51 -0700 Subject: [PATCH] Added JaCoCo extension --- .idea/misc.xml | 1 - lib/bld/bld-wrapper.properties | 1 + .../extension/propertyfile/PropertyFileBuild.java | 13 +++++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index eff0377..02a2553 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 9a3a540..624beef 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,6 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.1-SNAPSHOT +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.0-SNAPSHOT bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.version=1.7.0 diff --git a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java index b7cbeef..bfa6db1 100644 --- a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java +++ b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java @@ -2,11 +2,13 @@ package rife.bld.extension.propertyfile; import rife.bld.BuildCommand; import rife.bld.Project; +import rife.bld.extension.JacocoReportOperation; import rife.bld.extension.PmdOperation; import rife.bld.publish.PublishDeveloper; import rife.bld.publish.PublishLicense; import rife.bld.publish.PublishScm; +import java.io.IOException; import java.util.List; import static rife.bld.dependencies.Repository.MAVEN_CENTRAL; @@ -32,8 +34,8 @@ public class PropertyFileBuild extends Project { .include(dependency("com.uwyn.rife2", "bld", rife2)); scope(test) .include(dependency("org.jsoup", "jsoup", version(1, 16, 1))) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 3))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 3))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 0))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 0))) .include(dependency("org.assertj:assertj-joda-time:2.2.0")); javadocOperation() @@ -66,6 +68,13 @@ public class PropertyFileBuild extends Project { new PropertyFileBuild().start(args); } + @BuildCommand(summary = "Generates JaCoCo Reports") + public void jacoco() throws IOException { + new JacocoReportOperation() + .fromProject(this) + .execute(); + } + @BuildCommand(summary = "Runs PMD analysis") public void pmd() throws Exception { new PmdOperation()