Skip to content

Commit 7949f21

Browse files
committed
Update Gradle
Update Gradle Wrapper to 8.13 and plugins. Address deprecations. Signed-off-by: thc202 <[email protected]>
1 parent 0b4c7da commit 7949f21

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

gradle/wrapper/gradle-wrapper.jar

252 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
3+
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
203205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204206

205207
# Collect all arguments for the java command:
206-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207209
# and any embedded shellness will be escaped.
208210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209211
# treated as '${Hostname}' itself on the command line.

gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("org.zaproxy.common.settings") version "0.3.0"
2+
id("org.zaproxy.common.settings") version "0.5.0"
33

44
id("com.diffplug.spotless") version "6.25.0" apply false
55
}

subprojects/zap-clientapi/zap-clientapi.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ File clientapiJar(version) {
3838
}
3939

4040
task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask) {
41-
group 'verification'
42-
description "Checks artifacts' binary compatibility with latest (released) version '$versionBC'."
41+
group = 'verification'
42+
description = "Checks artifacts' binary compatibility with latest (released) version '$versionBC'."
4343

4444
oldClasspath.from(files(clientapiJar(versionBC)))
4545
newClasspath.from(tasks.named(JavaPlugin.JAR_TASK_NAME))
@@ -67,8 +67,8 @@ task sourcesJar(type: Jar) {
6767
}
6868

6969
task uberJar(type: Jar) {
70-
group 'build'
71-
description 'Assembles a jar archive containing the main jar and its dependencies.'
70+
group = 'build'
71+
description = 'Assembles a jar archive containing the main jar and its dependencies.'
7272
archiveBaseName.set('zap-api')
7373
manifest.from jar.manifest
7474
from {
@@ -88,7 +88,7 @@ publishing {
8888
maven {
8989
def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
9090
def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
91-
url version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl
91+
url = version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl
9292

9393
if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
9494
credentials {

0 commit comments

Comments
 (0)