diff --git a/.idea/bld.xml b/.idea/bld.xml deleted file mode 100644 index 6600cee..0000000 --- a/.idea/bld.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 867d049..3e5e13c 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,11 @@ - + - - + diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml index 143dc93..9bd86aa 100644 --- a/.idea/libraries/compile.xml +++ b/.idea/libraries/compile.xml @@ -2,16 +2,12 @@ - - - - \ No newline at end of file diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml index 2ae5c4b..81feb0b 100644 --- a/.idea/libraries/runtime.xml +++ b/.idea/libraries/runtime.xml @@ -2,7 +2,6 @@ - diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml index 68ef884..13b6513 100644 --- a/.idea/libraries/test.xml +++ b/.idea/libraries/test.xml @@ -2,16 +2,12 @@ - - - - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 904ca0b..d14bab5 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.1.jar", + "${HOME}/.bld/dist/bld-1.7.4.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/README.md b/README.md index 943cde8..90406e2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![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.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 161546a..982246e 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 1fc0978..fc965e1 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.1 +bld.version=1.7.4 diff --git a/local.properties b/local.properties deleted file mode 100644 index f9361d4..0000000 --- a/local.properties +++ /dev/null @@ -1 +0,0 @@ -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 5b88a50..7abaea5 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,5,0); + version = version(0,4,4); 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(2,0,1))) - .include(dependency("org.apache.commons", "commons-compress", version(1,27,1))); + .include(dependency("com.uwyn.rife2", "bld", version(1,7,4))) + .include(dependency("org.apache.commons", "commons-compress", version(1,24,0))); 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,9,3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,9,3))); javadocOperation() .javadocOptions() @@ -41,7 +41,6 @@ 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") diff --git a/src/main/java/rife/bld/extension/ZipOperation.java b/src/main/java/rife/bld/extension/ZipOperation.java index 5578d10..b06d79a 100644 --- a/src/main/java/rife/bld/extension/ZipOperation.java +++ b/src/main/java/rife/bld/extension/ZipOperation.java @@ -7,20 +7,15 @@ 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.io.IOUtils; +import org.apache.commons.compress.utils.IOUtils; import rife.bld.NamedFile; import rife.bld.operations.AbstractOperation; import rife.tools.FileUtils; import rife.tools.StringUtils; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import java.util.regex.Pattern; /** @@ -140,49 +135,10 @@ public class ZipOperation extends AbstractOperation { * * @param directories source directories * @return this operation instance - * @see #sourceDirectories(List) * @since 1.0 */ public ZipOperation sourceDirectories(File... 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); + sourceDirectories_.addAll(List.of(directories)); return this; } @@ -193,25 +149,11 @@ public class ZipOperation extends AbstractOperation { * * @param directories a list of source directories * @return this operation instance - * @see #sourceDirectories(Path...) * @since 1.0 */ - 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()); + public ZipOperation sourceDirectories(List directories) { + sourceDirectories_.addAll(directories); + return this; } /** @@ -252,28 +194,6 @@ 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. *