Merge pull request #85 from thc202/gradle/update-8.13

Update Gradle and release 0.13.0

Author: kingthorin

CHANGELOG.md

@@ -4,7 +4,10 @@ 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.0] - 2025-02-27
+### Changed
+- Recommended minimum Gradle version is now 8.13.
+- Update ZAP API client to version 1.16.0.
 
 ## [0.12.0] - 2024-12-04
 ### Changed
@@ -241,7 +244,7 @@ Provided by the plugin:
  with a `ZapVersions.xml` from an add-on.
 
 
-[Unreleased]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.12.0...HEAD
+[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
 [0.10.0]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.9.0...v0.10.0

README.md

@@ -2,4 +2,4 @@
 
 A Gradle plugin to (help) build ZAP add-ons.
 
-The plugin requires at least Java 17 and Gradle 8.8.
+The plugin requires at least Java 17 and Gradle 8.13.

apigen/apigen.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 description = "The utility to help generate ZAP API client files for an add-on."
 
 dependencies {
-    compileOnly("org.zaproxy:zap:2.13.0")
+    compileOnly("org.zaproxy:zap:2.16.0")
 }
 
 tasks.jar.configure {

build.gradle.kts

@@ -1,13 +1,13 @@
 plugins {
     `kotlin-dsl`
-    id("com.gradle.plugin-publish") version "1.2.1"
+    id("com.gradle.plugin-publish") version "1.3.1"
 
     id("com.diffplug.spotless")
     id("org.zaproxy.common")
 }
 
 group = "org.zaproxy.gradle"
-version = "0.13.0-SNAPSHOT"
+version = "0.13.0"
 
 dependencies {
     implementation("commons-codec:commons-codec:1.17.1")
@@ -21,7 +21,7 @@ dependencies {
     val jgitVersion = "7.1.0.202411261347-r"
     implementation("org.eclipse.jgit:org.eclipse.jgit:$jgitVersion")
     implementation("org.eclipse.jgit:org.eclipse.jgit.archive:$jgitVersion")
-    implementation("org.zaproxy:zap-clientapi:1.14.0")
+    implementation("org.zaproxy:zap-clientapi:1.16.0")
     implementation("org.kohsuke:github-api:1.326")
     // Include annotations used by the above library to avoid compiler warnings.
     compileOnly("com.google.code.findbugs:findbugs-annotations:3.0.1")

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -1,5 +1,5 @@
 plugins {
-    id("org.zaproxy.common.settings") version "0.3.0"
+    id("org.zaproxy.common.settings") version "0.5.0"
 
     id("com.diffplug.spotless") version "6.25.0" apply false
 }

settings.gradle.kts

@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import javax.inject.Inject;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.RegularFileProperty;
@@ -42,6 +43,7 @@
 import org.gradle.api.tasks.PathSensitive;
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.process.ExecOperations;
 
 /** A task to generate the API client files of an add-on. */
 public class GenerateApiClientFiles extends DefaultTask {
@@ -57,16 +59,22 @@ public class GenerateApiClientFiles extends DefaultTask {
     private final Property<File> baseDir;
     private final Property<String> language;
     private final ConfigurableFileCollection classpath;
+    private final ObjectFactory objects;
 
     public GenerateApiClientFiles() {
-        ObjectFactory objects = getProject().getObjects();
+        objects = getProject().getObjects();
         api = objects.property(String.class);
         options = objects.property(String.class);
         messages = objects.fileProperty();
         baseDir = objects.property(File.class);
         baseDir.set(getProject().getRootDir().getParentFile());
         language = objects.property(String.class).value(ALL_LANGUAGES);
-        classpath = getProject().files();
+        classpath = objects.fileCollection();
+    }
+
+    @Inject
+    protected ExecOperations getExecOperations() {
+        throw new UnsupportedOperationException();
     }
 
     @Input
@@ -138,10 +146,11 @@ public void generate() throws IOException {
             conf.store(out, null);
         }
 
-        getProject()
+        getExecOperations()
                 .javaexec(
                         spec -> {
-                            spec.setClasspath(getProject().files(classpath, apiGenJar.toFile()));
+                            spec.setClasspath(
+                                    objects.fileCollection().from(classpath, apiGenJar.toFile()));
                             spec.setWorkingDir(wd.toFile());
                             spec.getMainClass().set("org.zaproxy.zap.extension.api.ApiGenerator");
                         });