Merge pull request #87 from thc202/address-project-usages

Address warns and release 0.13.1

Author: kingthorin

CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.13.1] - 2025-02-27
+### Fixed
+- Address deprecation warnings related to project usage at runtime.
 
 ## [0.13.0] - 2025-02-27
 ### Changed
@@ -246,7 +248,7 @@ Provided by the plugin:
  with a `ZapVersions.xml` from an add-on.
 
 
-[Unreleased]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.13.0...HEAD
+[0.13.1]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.13.0...v0.13.1
 [0.13.0]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.12.0...v0.13.0
 [0.12.0]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.11.0...v0.12.0
 [0.11.0]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.10.0...v0.11.0

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "org.zaproxy.gradle"
-version = "0.14.0-SNAPSHOT"
+version = "0.13.1"
 
 dependencies {
     implementation("commons-codec:commons-codec:1.17.1")

src/main/java/org/zaproxy/gradle/addon/jh/tasks/JavaHelpIndexer.java

@@ -40,6 +40,7 @@
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.Directory;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.file.FileTree;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.model.ObjectFactory;
@@ -108,6 +109,11 @@ protected ExecOperations getExecOperations() {
         throw new UnsupportedOperationException();
     }
 
+    @Inject
+    protected FileSystemOperations getFs() {
+        throw new UnsupportedOperationException();
+    }
+
     @InputFile
     @PathSensitive(PathSensitivity.RELATIVE)
     public RegularFileProperty getHelpset() {
@@ -213,7 +219,8 @@ private File getWorkingDirectory() {
     }
 
     private void prepareWorkingDirectory(File wd) {
-        getProject().delete(wd);
+        getFs().delete(spec -> spec.delete(wd));
+
         try {
             Files.createDirectories(wd.toPath());
         } catch (IOException e) {

src/main/java/org/zaproxy/gradle/addon/misc/CopyAddOn.java

@@ -26,7 +26,11 @@
 import java.nio.file.Path;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
+import javax.inject.Inject;
 import org.gradle.api.Project;
+import org.gradle.api.file.ConfigurableFileTree;
+import org.gradle.api.file.FileSystemOperations;
+import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Copy;
 import org.gradle.api.tasks.Input;
@@ -46,9 +50,11 @@ public class CopyAddOn extends Copy {
     private static final String DEFAULT_DIR_PATH = "../zaproxy/zap/src/main/dist/plugin/";
 
     private final Property<String> addOnId;
+    private final ObjectFactory objects;
 
     public CopyAddOn() {
         Project project = getProject();
+        objects = project.getObjects();
         addOnId = project.getObjects().property(String.class);
 
         from(project.getTasks().named("jarZapAddOn"));
@@ -81,6 +87,11 @@ public CopyAddOn() {
                         });
     }
 
+    @Inject
+    protected FileSystemOperations getFs() {
+        throw new UnsupportedOperationException();
+    }
+
     @Input
     public Property<String> getAddOnId() {
         return addOnId;
@@ -93,17 +104,10 @@ public void optionInto(String dir) {
 
     @Override
     public void copy() {
-        Project project = getProject();
-        project.delete(
-                project.fileTree(
-                                getDestinationDir(),
-                                tree -> {
-                                    tree.include(
-                                            getAddOnId().get()
-                                                    + "-*."
-                                                    + Constants.ADD_ON_FILE_EXTENSION);
-                                })
-                        .getFiles());
+        ConfigurableFileTree tree = objects.fileTree().from(getDestinationDir());
+        tree.include(getAddOnId().get() + "-*." + Constants.ADD_ON_FILE_EXTENSION);
+        getFs().delete(spec -> spec.delete(tree.getFiles()));
+
         super.copy();
     }
 }

src/main/java/org/zaproxy/gradle/addon/misc/DeployAddOn.java

@@ -22,9 +22,11 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
 import org.apache.commons.lang3.SystemUtils;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
@@ -68,6 +70,11 @@ public DeployAddOn() {
         deleteStale = objects.property(Boolean.class).value(true);
     }
 
+    @Inject
+    protected FileSystemOperations getFs() {
+        throw new UnsupportedOperationException();
+    }
+
     @Option(option = "zap-home-dir", description = "The file system path to the ZAP home.")
     public void optionHomeDir(String dir) {
         homeDir.set(getProject().file(dir));
@@ -116,11 +123,10 @@ public void deploy() {
                                                 homeDir.get(),
                                                 fileDetails.getRelativePath().toString()));
                             });
-            getProject().delete(filesToDelete);
+            getFs().delete(spec -> spec.delete(filesToDelete));
         }
 
-        getProject()
-                .copy(
+        getFs().copy(
                         copySpec -> {
                             copySpec.from(addOn, copySpecAddOn -> copySpecAddOn.into(PLUGIN_DIR));
                             copySpec.from(files);