Update Gradle to 8.5

Update Gradle Wrapper to 8.5 and plugins to latest versions.
Apply the common plugins and remove now redundant configurations.
Update GitHub Actions in workflows.

Signed-off-by: thc202 <thc202@gmail.com>

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ jobs:
         java: [11]
 
     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/crowdin-upload-files.yml

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

.github/workflows/prepare-release-add-on.yml

@@ -12,12 +12,12 @@ jobs:
     name: Prepare Release
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         persist-credentials: false
     - name: Setup Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: 11

.github/workflows/release-add-on.yml

@@ -12,12 +12,12 @@ jobs:
     name: Build and Release Add-On
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         persist-credentials: false
     - name: Setup Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: 11

addOns/addOns.gradle.kts

@@ -13,7 +13,9 @@ import java.util.regex.Pattern
 
 plugins {
     eclipse
-    id("org.zaproxy.add-on") version "0.9.0" apply false
+    id("com.diffplug.spotless")
+    id("org.zaproxy.common")
+    id("org.zaproxy.add-on") version "0.10.0" apply false
     id("org.zaproxy.crowdin") version "0.3.1"
 }
 
@@ -72,29 +74,25 @@ val releaseAddOn by tasks.registering
 
 subprojects {
     apply(plugin = "java-library")
+    apply(plugin = "com.diffplug.spotless")
+    apply(plugin = "org.zaproxy.common")
     apply(plugin = "org.zaproxy.add-on")
 
-    tasks.withType<JavaCompile>().configureEach {
-        options.encoding = "utf-8"
-        options.compilerArgs = listOf("-Xlint:all", "-Werror")
-    }
-
     java {
         val javaVersion = JavaVersion.VERSION_11
         sourceCompatibility = javaVersion
         targetCompatibility = javaVersion
     }
 
     zapAddOn {
-        zapVersion.set("2.13.0")
+        zapVersion.set("2.14.0")
 
         releaseLink.set(project.provider { "https://github.com/zaproxy/zap-core-help/releases/${zapAddOn.addOnId.get()}-v@CURRENT_VERSION@" })
 
         manifest {
             author.set("ZAP Crowdin Team")
             repo.set("https://github.com/zaproxy/zap-core-help/")
             changesFile.set(tasks.named<ConvertMarkdownToHtml>("generateManifestChanges").flatMap { it.html })
-            notBeforeVersion.set("2.14.0")
         }
     }
 

build.gradle.kts

@@ -1,14 +1,11 @@
 plugins {
-    id("com.diffplug.spotless") version "6.20.0"
+    id("com.diffplug.spotless")
+    id("org.zaproxy.common")
 }
 
 allprojects {
     apply(plugin = "com.diffplug.spotless")
 
-    repositories {
-        mavenCentral()
-    }
-
     spotless {
         kotlinGradle {
             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,9 +1,7 @@
+plugins {
+    id("org.zaproxy.common.settings") version "0.2.0"
 
-pluginManagement {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-    }
+    id("com.diffplug.spotless") version "6.20.0" apply false
 }
 
 rootProject.name = "zap-core-help"