Skip to content
/ zap-api-java Public

Update Gradle #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thc202 merged 1 commit into from
Jul 9, 2025
Merged

Update Gradle #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [11, 21, 22]
java: [17, 21, 22]

steps:
- uses: actions/checkout@v4
Expand Down
12 changes: 9 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ subprojects {
extra["versionBC"] = "1.16.0"

java {
val javaVersion = JavaVersion.VERSION_11
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
if (System.getenv("RELEASE") != null) {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
}
} else {
val javaVersion = JavaVersion.VERSION_11
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
}

spotless {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
Expand Down
10 changes: 5 additions & 5 deletions subprojects/zap-clientapi/zap-clientapi.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ File clientapiJar(version) {
}

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

oldClasspath.from(files(clientapiJar(versionBC)))
newClasspath.from(tasks.named(JavaPlugin.JAR_TASK_NAME))
Expand Down Expand Up @@ -67,8 +67,8 @@ task sourcesJar(type: Jar) {
}

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

if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
credentials {
Expand Down