diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index ddcc35c..b94976b 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -3,7 +3,7 @@ name: bld-ci on: [ push, pull_request, workflow_dispatch ] jobs: - build-bld-project: + build-gradle-project: runs-on: ubuntu-latest strategy: diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 7aa10eb..e1e183f 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,11 +2,11 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index ba59365..8a2a643 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.rife2/dist/rife2-1.5.19.jar", + "${HOME}/.rife2/dist/rife2-1.5.17.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/README.md b/README.md index ad25797..fec38ee 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Bld](https://rife2.com/bld) Extension to Create or Modify Properties Files +# [Bld](https://github.com/rife2/rife2/wiki/What-Is-Bld) Extension to Create or Modify Properties Files [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) @@ -6,7 +6,7 @@ [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-property-file/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-property-file) [![GitHub CI](https://github.com/rife2/bld-property-file/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-property-file/actions/workflows/bld.yml) -An extension for creating or modifying [property files](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html) with [bld](https://rife2.com/bld). It is inspired by the [ant PropertyFile task](https://ant.apache.org/manual/Tasks/propertyfile.html). +An extension for creating or modifying [property files](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html) with [bld](https://github.com/rife2/rife2/wiki/What-Is-Bld). It is inspired by the [ant PropertyFile task](https://ant.apache.org/manual/Tasks/propertyfile.html). ```java @BuildCommand diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml index 970a359..3adb161 100644 --- a/examples/.idea/libraries/bld.xml +++ b/examples/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json index ba59365..8a2a643 100644 --- a/examples/.vscode/settings.json +++ b/examples/.vscode/settings.json @@ -7,7 +7,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.rife2/dist/rife2-1.5.19.jar", + "${HOME}/.rife2/dist/rife2-1.5.17.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar index 7cc21a1..e70208d 100644 Binary files a/examples/lib/bld/bld-wrapper.jar and b/examples/lib/bld/bld-wrapper.jar differ diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 5cd8e32..9d5c665 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ #Sun Apr 02 10:32:44 PDT 2023 bld.extension=com.uwyn.rife2:bld-property-file:0.9.1 -bld.repositories=MAVEN_LOCAL,RIFE2_RELEASES +bld.repositories=MAVEN_LOCAL,RIFE2 bld.downloadExtensionSources=true rife2.downloadLocation= -rife2.version=1.5.19 \ No newline at end of file +rife2.version=1.5.17 \ No newline at end of file diff --git a/examples/src/bld/java/com/example/PropertyFileExampleBuild.java b/examples/src/bld/java/com/example/PropertyFileExampleBuild.java index 615caa2..47b0df3 100644 --- a/examples/src/bld/java/com/example/PropertyFileExampleBuild.java +++ b/examples/src/bld/java/com/example/PropertyFileExampleBuild.java @@ -10,7 +10,6 @@ import rife.bld.extension.propertyfile.PropertyFileOperation; import java.util.List; import static rife.bld.dependencies.Repository.MAVEN_CENTRAL; -import static rife.bld.dependencies.Repository.RIFE2_RELEASES; import static rife.bld.dependencies.Scope.test; import static rife.bld.extension.propertyfile.Calc.ADD; @@ -23,11 +22,9 @@ public class PropertyFileExampleBuild extends Project { mainClass = "com.example.PropertyFileExampleMain"; version = version(0, 1, 0); - javaRelease = 17; downloadSources = true; autoDownloadPurge = true; - repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); - + repositories = List.of(MAVEN_CENTRAL); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2))); diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index fed125f..3d29688 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 26178d3..f07d6a8 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,2 +1,2 @@ #Sat Apr 01 10:09:33 PDT 2023 -rife2.version=1.5.19 +rife2.version=1.5.17 diff --git a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java index 5812f0e..f2ea28b 100644 --- a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java +++ b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java @@ -17,48 +17,44 @@ public class PropertyFileBuild extends Project { public PropertyFileBuild() { pkg = "rife.bld.extension"; name = "bld-property-file"; - version = version(0, 9, 2, "SNAPSHOT"); - - javaRelease = 17; - downloadSources = true; - autoDownloadPurge = true; - repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); - - scope(compile) - .include(dependency("com.uwyn.rife2", "rife2", version(1, 5, 19))); - scope(test) - .include(dependency("org.jsoup", "jsoup", version(1, 15, 4))) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2))) - .include(dependency("org.assertj:assertj-joda-time:2.2.0")); - - javadocOperation() - .javadocOptions() + version = version(0, 9, 1); + javadocOptions .docLint(NO_MISSING) .link("https://rife2.github.io/rife2/"); - - publishOperation() - .repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2")) -// .repository(MAVEN_LOCAL) - .info() + publishRepository = version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"); +// publishRepository = MAVEN_LOCAL; + publishInfo = new PublishInfo() .groupId("com.uwyn.rife2") .artifactId("bld-property-file") .description("bld Extension to Create or Modify Properties Files") .url("https://github.com/rife2/bld-property-file") .developer(new PublishDeveloper().id("ethauvin").name("Erik C. Thauvin").email("erik@thauvin.net") - .url("https://erik.thauvin.net/")) + .url("https://erik.thauvin.net/")) .developer(new PublishDeveloper().id("gbevin").name("Geert Bevin").email("gbevin@uwyn.com") - .url("https://github.com/gbevin")) + .url("https://github.com/gbevin")) .license(new PublishLicense().name("The Apache License, Version 2.0") - .url("http://www.apache.org/licenses/LICENSE-2.0.txt")) + .url("http://www.apache.org/licenses/LICENSE-2.0.txt")) .scm(new PublishScm().connection("scm:git:https://github.com/rife2/bld-property-file.git") - .developerConnection("scm:git:git@github.com:rife2/bld-property-file.git") - .url("https://github.com/rife2/bld-property-file")) + .developerConnection("scm:git:git@github.com:rife2/bld-property-file.git") + .url("https://github.com/rife2/bld-property-file")) .signKey(property("sign.key")) .signPassphrase(property("sign.passphrase")); + + javaRelease = 17; + downloadSources = true; + autoDownloadPurge = true; + repositories = List.of(MAVEN_CENTRAL, RIFE2); + + scope(compile) + .include(dependency("com.uwyn.rife2", "rife2", version(1, 5, 17))); + scope(test) + .include(dependency("org.jsoup", "jsoup", version(1, 15, 4))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2))) + .include(dependency("org.assertj:assertj-joda-time:2.2.0")); } public static void main(String[] args) { new PropertyFileBuild().start(args); } -} +} \ No newline at end of file