From b85ca24b534fb74c241b08b93829d62b6ae0abce Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 18 Aug 2023 01:02:39 -0700 Subject: [PATCH] Upgraded to bld 1.7.1 --- README.md | 2 +- examples/lib/bld/bld-wrapper.properties | 6 +++--- lib/bld/bld-wrapper.properties | 6 +++--- .../rife/bld/extension/JacocoReportOperationBuild.java | 9 ++++----- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 90679ce..a4fa79d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/1.7.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/1.7.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-jacoco-report/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-jacoco-report) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-jacoco-report/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-jacoco-report) [![GitHub CI](https://github.com/rife2/bld-jacoco-report/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-jacoco-report/actions/workflows/bld.yml) diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 856e7f3..a153829 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.0-SNAPSHOT -bld.repositories=MAVEN_LOCAL,RIFE2_SNAPSHOTS,MAVEN_CENTRAL,RIFE2_RELEASES +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.0 +bld.repositories=RIFE2_SNAPSHOTS,RIFE2_RELEASES,MAVEN_CENTRAL bld.downloadLocation= -bld.version=1.7.0 \ No newline at end of file +bld.version=1.7.1 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index e7d3c6e..b079455 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.2-SNAPSHOT -bld.repositories=MAVEN_LOCAL,RIFE2_SNAPSHOTS,MAVEN_CENTRAL,RIFE2_RELEASES +bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.2 +bld.repositories=RIFE2_SNAPSHOTS,RIFE2_RELEASES,MAVEN_CENTRAL bld.downloadLocation= -bld.version=1.7.0 \ No newline at end of file +bld.version=1.7.1 diff --git a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java index 88de728..342cbd1 100644 --- a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java +++ b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java @@ -33,7 +33,7 @@ public class JacocoReportOperationBuild extends Project { public JacocoReportOperationBuild() { pkg = "rife.bld.extension"; name = "JacocoReportOperation"; - version = version(0, 9, 0, "SNAPSHOT"); + version = version(0, 9, 0); javaRelease = 17; downloadSources = true; @@ -41,11 +41,10 @@ public JacocoReportOperationBuild() { repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); var jacocoVersion = new VersionNumber(0, 8, 10); - var rife2 = version(1, 7, 0); scope(compile) .include(dependency("org.jacoco", "jacoco", jacocoVersion).exclude("*", "org.jacoco.doc")) - .include(dependency("com.uwyn.rife2", "rife2", rife2)) - .include(dependency("com.uwyn.rife2", "bld", rife2)); + .include(dependency("com.uwyn.rife2", "rife2", version(1, 7, 0))) + .include(dependency("com.uwyn.rife2", "bld", version(1, 7, 1))); scope(runtime) .include(dependency("org.jacoco", "jacoco", jacocoVersion).exclude("*", "org.jacoco.doc")); scope(test) @@ -89,4 +88,4 @@ public void pmd() { .ruleSets("config/pmd.xml") .execute(); } -} \ No newline at end of file +}