From 0e08fc7e41733a3d96b23c1774c6349f934f7d50 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Tue, 30 Jan 2024 21:17:43 -0500 Subject: [PATCH 1/8] Updated for bld 1.8.0 Updated version to 0.4.6 --- .idea/libraries/bld.xml | 5 +++-- .idea/libraries/compile.xml | 4 ++++ .idea/libraries/runtime.xml | 1 + .idea/libraries/test.xml | 4 ++++ .vscode/settings.json | 2 +- lib/bld/bld-wrapper.jar | Bin 27321 -> 27319 bytes lib/bld/bld-wrapper.properties | 2 +- .../java/rife/bld/extension/ArchiveBuild.java | 10 +++++----- 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index cf75013..4bb3867 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,11 +2,12 @@ - + - + + diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml index 9bd86aa..143dc93 100644 --- a/.idea/libraries/compile.xml +++ b/.idea/libraries/compile.xml @@ -2,12 +2,16 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml index 81feb0b..2ae5c4b 100644 --- a/.idea/libraries/runtime.xml +++ b/.idea/libraries/runtime.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml index 13b6513..68ef884 100644 --- a/.idea/libraries/test.xml +++ b/.idea/libraries/test.xml @@ -2,12 +2,16 @@ + + + + \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 133aa45..5633e79 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.7.5.jar", + "${HOME}/.bld/dist/bld-1.8.0.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index e34e9084358dea94e4265069a0f75f84344d9e8a..3e2aa2556b492875424ef189addaa5c137e6fa6e 100644 GIT binary patch delta 18712 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 delta 18695 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 Y`mdJVAVA?=rwD&5@ss|+cLM Date: Wed, 31 Jan 2024 05:50:47 -0500 Subject: [PATCH 2/8] Added bld badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 90406e2..74de0d8 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,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.8.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/https:/repo.rife2.com/releases/com/uwyn/rife2/bld-archive/maven-metadata.xml)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-archive) [![GitHub CI](https://github.com/rife2/bld-archive/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-archive/actions/workflows/bld.yml) From c816a564ed0cf98c74e2ca69b035a50c530998bd Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sun, 25 Feb 2024 22:44:29 -0500 Subject: [PATCH 3/8] Updated for bld 1.9.0. Updated version to 0.4.7. --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 27319 -> 27319 bytes lib/bld/bld-wrapper.properties | 2 +- .../java/rife/bld/extension/ArchiveBuild.java | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 4bb3867..59ffe59 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 5633e79..6932aa7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.8.0.jar", + "${HOME}/.bld/dist/bld-1.9.0.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/README.md b/README.md index 74de0d8..6bc7ee2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,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.8.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/1.9.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/https:/repo.rife2.com/releases/com/uwyn/rife2/bld-archive/maven-metadata.xml)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-archive) [![GitHub CI](https://github.com/rife2/bld-archive/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-archive/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 3e2aa2556b492875424ef189addaa5c137e6fa6e..10ca120a2a03a100bb5a13f5fe5a38e1c15e4f68 100644 GIT binary patch delta 156 zcmdmfm2vx3M&1B#W)=|!4h{~6AL}9~^42r0i`>|!Yz(9}Z#M2>0@03U9C{$yJLLi+ zh?Y$=0*Ox!%#c^UV$8r0;LXmlGxC)TI|Bm)D-Z{GGct)Vzzv-|Il~2{{APw1h*HfA c1yMDbZXoJNW;|FhD}a4nWCX~R$u(Kl04FIkRR910 delta 156 zcmdmfm2vx3M&1B#W)=|!4h{~6A1mx8^42r0u-n+DYz(9}Z#M2>0@03U9C{$yJLLi+ zh?Y$=0*Ox!%#c^UV9dY};LXm_XRIO1&cMLH3d8~4j7%a7a6>0g&Ts)KznS3$qEs_O cK~znq8;ClR84niB3SeJh7XdP5a!r;s07#E7UjP6A diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index ad807e3..1b304b0 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -3,4 +3,4 @@ bld.downloadExtensionSources=true bld.extensions= bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.downloadLocation= -bld.version=1.8.0 +bld.version=1.9.0 diff --git a/src/bld/java/rife/bld/extension/ArchiveBuild.java b/src/bld/java/rife/bld/extension/ArchiveBuild.java index 7e623d2..2644cf6 100644 --- a/src/bld/java/rife/bld/extension/ArchiveBuild.java +++ b/src/bld/java/rife/bld/extension/ArchiveBuild.java @@ -19,7 +19,7 @@ public class ArchiveBuild extends Project { public ArchiveBuild() { pkg = "rife.bld.extension"; name = "Archive"; - version = version(0,4,6); + version = version(0,4,7); archiveBaseName = "bld-archive"; javaRelease = 17; @@ -28,11 +28,11 @@ public class ArchiveBuild extends Project { repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(1,8,0))) - .include(dependency("org.apache.commons", "commons-compress", version(1,25,0))); + .include(dependency("com.uwyn.rife2", "bld", version(1,9,0))) + .include(dependency("org.apache.commons", "commons-compress", version(1,26,0))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,1))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,1))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,2))); javadocOperation() .javadocOptions() From 4c013a1b33be575236376dd5743e5e6410fd47e6 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Wed, 1 May 2024 16:44:39 -0400 Subject: [PATCH 4/8] Updated for bld 1.9.1. Updated version to 0.4.8. --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 27319 -> 27319 bytes lib/bld/bld-wrapper.properties | 2 +- .../java/rife/bld/extension/ArchiveBuild.java | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 59ffe59..48e8fd5 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 6932aa7..ed6a743 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.9.0.jar", + "${HOME}/.bld/dist/bld-1.9.1.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/README.md b/README.md index 6bc7ee2..14de8e3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,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.9.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/1.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/https:/repo.rife2.com/releases/com/uwyn/rife2/bld-archive/maven-metadata.xml)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-archive) [![GitHub CI](https://github.com/rife2/bld-archive/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-archive/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 10ca120a2a03a100bb5a13f5fe5a38e1c15e4f68..546d87804f2d6b871ebe34de56c2a58ee30ed999 100644 GIT binary patch delta 166 zcmdmfm2vx3M&1B#W)=|!4h{|muhxYVdFz;g)W$v~V-UT0vvD^QnBi!~t_Nm#r<`X5 zGi1{Y!BUe0GZYnB7y`W6IrKB%X0tOeFt7q~fHxzP2m{>U$&)jjLE0wY%VOdrXNgNSGOa{$#vfXtd)lVuG6#}hTs delta 166 zcmdmfm2vx3M&1B#W)=|!4h{~6AL}9~^42i}sf~R~#vpq0X5(%qFvHP|T@TFgPC3sA zX2_-)f~6)0W+*B$Fa&tBbL@1t7e9P b>6%PeFnuI54kDiA&jC~y0WxcHO_ntPPc1#} diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 1b304b0..8022d33 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -3,4 +3,4 @@ bld.downloadExtensionSources=true bld.extensions= bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.downloadLocation= -bld.version=1.9.0 +bld.version=1.9.1 diff --git a/src/bld/java/rife/bld/extension/ArchiveBuild.java b/src/bld/java/rife/bld/extension/ArchiveBuild.java index 2644cf6..7333e0e 100644 --- a/src/bld/java/rife/bld/extension/ArchiveBuild.java +++ b/src/bld/java/rife/bld/extension/ArchiveBuild.java @@ -19,7 +19,7 @@ public class ArchiveBuild extends Project { public ArchiveBuild() { pkg = "rife.bld.extension"; name = "Archive"; - version = version(0,4,7); + version = version(0,4,8); archiveBaseName = "bld-archive"; javaRelease = 17; @@ -28,8 +28,8 @@ public class ArchiveBuild extends Project { repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(1,9,0))) - .include(dependency("org.apache.commons", "commons-compress", version(1,26,0))); + .include(dependency("com.uwyn.rife2", "bld", version(1,9,1))) + .include(dependency("org.apache.commons", "commons-compress", version(1,26,1))); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,2))); From 60fce761ed25c870f4832c06231e73d414e520dd Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sun, 28 Jul 2024 20:01:01 -0400 Subject: [PATCH 5/8] Updated version to 0.5.0. Upgraded to bld 2.0.0. --- .idea/bld.xml | 6 ++++++ .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 27319 -> 29576 bytes lib/bld/bld-wrapper.properties | 2 +- local.properties | 1 + .../java/rife/bld/extension/ArchiveBuild.java | 11 ++++++----- 8 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 .idea/bld.xml create mode 100644 local.properties diff --git a/.idea/bld.xml b/.idea/bld.xml new file mode 100644 index 0000000..6600cee --- /dev/null +++ b/.idea/bld.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 48e8fd5..edc11fc 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index ed6a743..2923ffb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.9.1.jar", + "${HOME}/.bld/dist/bld-2.0.0.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/README.md b/README.md index 14de8e3..dc5fbae 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,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.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.0.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/https:/repo.rife2.com/releases/com/uwyn/rife2/bld-archive/maven-metadata.xml)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-archive) [![GitHub CI](https://github.com/rife2/bld-archive/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-archive/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 546d87804f2d6b871ebe34de56c2a58ee30ed999..81e26403225ee54d557a6ac0be90c4f0a05d0a80 100644 GIT binary patch delta 15708 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

a}VHHyUr& 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 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 8022d33..11bf37d 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -3,4 +3,4 @@ bld.downloadExtensionSources=true bld.extensions= bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.downloadLocation= -bld.version=1.9.1 +bld.version=2.0.0 diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..f9361d4 --- /dev/null +++ b/local.properties @@ -0,0 +1 @@ +bld.repo.github=https://maven.pkg.github.com/rife2/bld-archive \ No newline at end of file diff --git a/src/bld/java/rife/bld/extension/ArchiveBuild.java b/src/bld/java/rife/bld/extension/ArchiveBuild.java index 7333e0e..551812f 100644 --- a/src/bld/java/rife/bld/extension/ArchiveBuild.java +++ b/src/bld/java/rife/bld/extension/ArchiveBuild.java @@ -19,7 +19,7 @@ public class ArchiveBuild extends Project { public ArchiveBuild() { pkg = "rife.bld.extension"; name = "Archive"; - version = version(0,4,8); + version = version(0,5,0); archiveBaseName = "bld-archive"; javaRelease = 17; @@ -28,11 +28,11 @@ public class ArchiveBuild extends Project { repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(1,9,1))) - .include(dependency("org.apache.commons", "commons-compress", version(1,26,1))); + .include(dependency("com.uwyn.rife2", "bld", version(2,0,0))) + .include(dependency("org.apache.commons", "commons-compress", version(1,26,2))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,2))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,2))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,3))); javadocOperation() .javadocOptions() @@ -41,6 +41,7 @@ public class ArchiveBuild extends Project { publishOperation() .repository(version.isSnapshot() ? repository("rife2-snapshots") : repository("rife2-releases")) + .repository(repository("github")) .info() .groupId("com.uwyn.rife2") .artifactId("bld-archive") From 0bfd068e94b530c73ddbd1f518a30b22a29e53a3 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sun, 28 Jul 2024 21:09:05 -0400 Subject: [PATCH 6/8] Upgraded to bld 2.0.1 --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 29576 -> 29577 bytes lib/bld/bld-wrapper.properties | 2 +- .../java/rife/bld/extension/ArchiveBuild.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index edc11fc..867d049 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 2923ffb..904ca0b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.0.0.jar", + "${HOME}/.bld/dist/bld-2.0.1.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/README.md b/README.md index dc5fbae..943cde8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,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/2.0.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.0.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/https:/repo.rife2.com/releases/com/uwyn/rife2/bld-archive/maven-metadata.xml)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-archive) [![GitHub CI](https://github.com/rife2/bld-archive/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-archive/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 81e26403225ee54d557a6ac0be90c4f0a05d0a80..161546a0262bbbf3134e957ce54daf7581950b05 100644 GIT binary patch delta 14816 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 s|NpGu{|B(!5d=g;R?I+MTv`o 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 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 11bf37d..1fc0978 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -3,4 +3,4 @@ bld.downloadExtensionSources=true bld.extensions= bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.downloadLocation= -bld.version=2.0.0 +bld.version=2.0.1 diff --git a/src/bld/java/rife/bld/extension/ArchiveBuild.java b/src/bld/java/rife/bld/extension/ArchiveBuild.java index 551812f..b3decaf 100644 --- a/src/bld/java/rife/bld/extension/ArchiveBuild.java +++ b/src/bld/java/rife/bld/extension/ArchiveBuild.java @@ -28,7 +28,7 @@ public class ArchiveBuild extends Project { repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(2,0,0))) + .include(dependency("com.uwyn.rife2", "bld", version(2,0,1))) .include(dependency("org.apache.commons", "commons-compress", version(1,26,2))); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,3))) From 8836a8a6f78c668979abaaff186b16c11e3d5625 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 28 Aug 2024 17:58:20 -0700 Subject: [PATCH 7/8] Updated commons-compress to version 1.27.1 --- src/bld/java/rife/bld/extension/ArchiveBuild.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bld/java/rife/bld/extension/ArchiveBuild.java b/src/bld/java/rife/bld/extension/ArchiveBuild.java index b3decaf..5b88a50 100644 --- a/src/bld/java/rife/bld/extension/ArchiveBuild.java +++ b/src/bld/java/rife/bld/extension/ArchiveBuild.java @@ -29,10 +29,10 @@ public class ArchiveBuild extends Project { repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2,0,1))) - .include(dependency("org.apache.commons", "commons-compress", version(1,26,2))); + .include(dependency("org.apache.commons", "commons-compress", version(1,27,1))); scope(test) - .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.junit.jupiter", "junit-jupiter", version(5,11,0))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,0))); javadocOperation() .javadocOptions() From 0a6323640fc944d9dd73a7b4fb69511f0fa2f410 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 28 Aug 2024 18:17:02 -0700 Subject: [PATCH 8/8] Added File argument alternatives with Path and String. --- .../java/rife/bld/extension/ZipOperation.java | 94 +++++++++++++++++-- 1 file changed, 87 insertions(+), 7 deletions(-) diff --git a/src/main/java/rife/bld/extension/ZipOperation.java b/src/main/java/rife/bld/extension/ZipOperation.java index b06d79a..5578d10 100644 --- a/src/main/java/rife/bld/extension/ZipOperation.java +++ b/src/main/java/rife/bld/extension/ZipOperation.java @@ -7,15 +7,20 @@ package rife.bld.extension; import org.apache.commons.compress.archivers.zip.UnixStat; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import rife.bld.NamedFile; import rife.bld.operations.AbstractOperation; import rife.tools.FileUtils; import rife.tools.StringUtils; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; -import java.util.*; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.regex.Pattern; /** @@ -135,10 +140,49 @@ public class ZipOperation extends AbstractOperation { * * @param directories source directories * @return this operation instance + * @see #sourceDirectories(List) * @since 1.0 */ public ZipOperation sourceDirectories(File... directories) { - sourceDirectories_.addAll(List.of(directories)); + return sourceDirectories(List.of(directories)); + } + + /** + * Provides source directories that will be used for the zip archive creation. + * + * @param directories source directories + * @return this operation instance + * @see #sourceDirectoriesPaths(List) + * @since 1.0 + */ + public ZipOperation sourceDirectories(Path... directories) { + return sourceDirectoriesPaths(List.of(directories)); + } + + /** + * Provides source directories that will be used for the zip archive creation. + * + * @param directories source directories + * @return this operation instance + * @see #sourceDirectoriesStrings(List) + * @since 1.0 + */ + public ZipOperation sourceDirectories(String... directories) { + return sourceDirectoriesStrings(List.of(directories)); + } + + /** + * Provides a list of source directories that will be used for the zip archive creation. + *

+ * A copy will be created to allow this list to be independently modifiable. + * + * @param directories a list of source directories + * @return this operation instance + * @see #sourceDirectories(File...) + * @since 1.0 + */ + public ZipOperation sourceDirectories(List directories) { + sourceDirectories_.addAll(directories); return this; } @@ -149,11 +193,25 @@ public class ZipOperation extends AbstractOperation { * * @param directories a list of source directories * @return this operation instance + * @see #sourceDirectories(Path...) * @since 1.0 */ - public ZipOperation sourceDirectories(List directories) { - sourceDirectories_.addAll(directories); - return this; + public ZipOperation sourceDirectoriesPaths(List directories) { + return sourceDirectories(directories.stream().map(Path::toFile).toList()); + } + + /** + * Provides a list of source directories that will be used for the zip archive creation. + *

+ * A copy will be created to allow this list to be independently modifiable. + * + * @param directories a list of source directories + * @return this operation instance + * @see #sourceDirectories(String...) + * @since 1.0 + */ + public ZipOperation sourceDirectoriesStrings(List directories) { + return sourceDirectories(directories.stream().map(File::new).toList()); } /** @@ -194,6 +252,28 @@ public class ZipOperation extends AbstractOperation { return this; } + /** + * Provides the destination directory in which the zip archive will be created. + * + * @param directory the zip destination directory + * @return this operation instance + * @since 1.0 + */ + public ZipOperation destinationDirectory(Path directory) { + return destinationDirectory(directory.toFile()); + } + + /** + * Provides the destination directory in which the zip archive will be created. + * + * @param directory the zip destination directory + * @return this operation instance + * @since 1.0 + */ + public ZipOperation destinationDirectory(String directory) { + return destinationDirectory(new File(directory)); + } + /** * Provides the destination file name that will be used for the zip archive creation. *