Merge pull request #71 from thc202/gradle/update-8.5

Update Gradle to 8.5, use Java 21 in CI

.github/workflows/ci.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [11, 20]
+        java: [11, 21]
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

.github/workflows/release-plugin.yml

@@ -8,8 +8,8 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 11

CHANGELOG.md

@@ -6,8 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Changed
-- Recommended minimum Gradle version is now 8.2.
-- Update ZAP API client to version 1.12.0.
+- Recommended minimum Gradle version is now 8.5.
+- Update ZAP API client to version 1.13.0.
 - The default ZAP home dir in Windows was changed to `ZAP_D`, to match the change done in ZAP itself.
 
 ### Fixed

README.md

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

apigen/apigen.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     `java-library`
 
     id("com.diffplug.spotless")
+    id("org.zaproxy.common")
 }
 
 repositories {
@@ -23,17 +24,7 @@ tasks.jar.configure {
     }
 }
 
-tasks.withType<JavaCompile>().configureEach {
-    options.encoding = "UTF-8"
-    options.compilerArgs = listOf("-Xlint:all", "-Xlint:-path", "-Xlint:-options", "-Werror")
-}
-
 spotless {
-    java {
-        licenseHeaderFile("$rootDir/gradle/spotless/license.java")
-        googleJavaFormat().aosp()
-    }
-
     kotlinGradle {
         ktlint()
     }

build.gradle.kts

@@ -2,11 +2,8 @@ plugins {
     `kotlin-dsl`
     id("com.gradle.plugin-publish") version "1.2.0"
 
-    id("com.diffplug.spotless") version "6.20.0"
-}
-
-repositories {
-    mavenCentral()
+    id("com.diffplug.spotless")
+    id("org.zaproxy.common")
 }
 
 group = "org.zaproxy.gradle"
@@ -24,7 +21,7 @@ dependencies {
     val jgitVersion = "5.6.0.201912101111-r"
     implementation("org.eclipse.jgit:org.eclipse.jgit:$jgitVersion")
     implementation("org.eclipse.jgit:org.eclipse.jgit.archive:$jgitVersion")
-    implementation("org.zaproxy:zap-clientapi:1.12.0")
+    implementation("org.zaproxy:zap-clientapi:1.13.0")
     implementation("org.kohsuke:github-api:1.95")
     // Include annotations used by the above library to avoid compiler warnings.
     compileOnly("com.google.code.findbugs:findbugs-annotations:3.0.1")
@@ -52,11 +49,6 @@ kotlin {
     jvmToolchain(11)
 }
 
-tasks.withType<JavaCompile>().configureEach {
-    options.encoding = "UTF-8"
-    options.compilerArgs = listOf("-Xlint:all", "-Xlint:-path", "-Xlint:-options", "-Werror")
-}
-
 gradlePlugin {
     website.set("https://github.com/zaproxy/gradle-plugin-add-on")
     vcsUrl.set("https://github.com/zaproxy/gradle-plugin-add-on.git")
@@ -72,11 +64,6 @@ gradlePlugin {
 }
 
 spotless {
-    java {
-        licenseHeaderFile("gradle/spotless/license.java")
-        googleJavaFormat("1.17.0").aosp()
-    }
-
     kotlin {
         ktlint()
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7c3ad722e9b0ce8205b91560fd6ce8296ac3eadf065672242fd73c06b8eeb6ee
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_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.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

settings.gradle.kts

@@ -1,3 +1,9 @@
+plugins {
+    id("org.zaproxy.common.settings") version "0.2.0"
+
+    id("com.diffplug.spotless") version "6.20.0" apply false
+}
+
 rootProject.name = "gradle-plugin-add-on"
 
 include("apigen")

src/main/java/org/zaproxy/gradle/addon/internal/model/ProjectInfo.java

@@ -19,7 +19,6 @@
  */
 package org.zaproxy.gradle.addon.internal.model;
 
-import java.io.File;
 import java.nio.file.Path;
 import org.gradle.api.Project;
 import org.gradle.api.file.RegularFileProperty;
@@ -39,7 +38,9 @@ public abstract class ProjectInfo {
 
     public static ProjectInfo from(Project project) {
         ProjectInfo projectInfo = project.getObjects().newInstance(ProjectInfo.class);
-        projectInfo.getOutputFile().set(new File(project.getBuildDir(), FILE_NAME_OUTPUT));
+        projectInfo
+                .getOutputFile()
+                .set(project.getLayout().getBuildDirectory().file(FILE_NAME_OUTPUT));
         Path gradleProperties = project.getProjectDir().toPath().resolve(Project.GRADLE_PROPERTIES);
         projectInfo
                 .getPropertiesPath()