Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ plugins {
java
id("com.diffplug.spotless")
id("org.zaproxy.common")
id("net.ltgt.errorprone") version "3.1.0"
id("org.zaproxy.crowdin") version "0.3.1"
id("net.ltgt.errorprone") version "4.1.0"
id("org.zaproxy.crowdin") version "0.6.0"
}

apply(from = "$rootDir/gradle/ci.gradle.kts")
Expand All @@ -44,7 +44,7 @@ crowdin {
}

dependencies {
"errorprone"("com.google.errorprone:error_prone_core:2.20.0")
"errorprone"("com.google.errorprone:error_prone_core:2.36.0")

implementation("org.apache.commons:commons-text:1.10.0")
implementation("org.kohsuke:github-api:1.326")
Expand All @@ -53,16 +53,16 @@ dependencies {
}
compileOnly("com.github.spotbugs:spotbugs-annotations:3.1.12")
implementation("net.sf.json-lib:json-lib:2.4:jdk15")
implementation("org.zaproxy:zap:2.15.0")
implementation("org.zaproxy:zap:2.16.0")

testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
testImplementation("org.junit.jupiter:junit-jupiter:5.12.0")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testImplementation("org.assertj:assertj-core:3.24.2")
testImplementation("org.assertj:assertj-core:3.27.3")
}

val zapVersionsDir = layout.buildDirectory.dir("ZapVersionsTests")
val copyZapVersions =
tasks.create<Copy>("copyZapVersions") {
tasks.register<Copy>("copyZapVersions") {
from(rootDir)
into(zapVersionsDir)
include("ZapVersions*.xml")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import org.apache.tools.ant.taskdefs.condition.Os;
import org.eclipse.jgit.api.Git;
import org.gradle.api.DefaultTask;
Expand All @@ -38,6 +39,7 @@
import org.gradle.api.tasks.InputFile;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.TaskAction;
import org.gradle.process.ExecOperations;
import org.zaproxy.gradle.CreatePullRequestImpl;
import org.zaproxy.gradle.GitHubRepo;
import org.zaproxy.gradle.GitHubUser;
Expand All @@ -57,6 +59,11 @@ public DeployCrowdinTranslations() {
getBaseBranchName().convention("main");
}

@Inject
protected ExecOperations getExecOperations() {
throw new UnsupportedOperationException();
}

@InputFile
public abstract RegularFileProperty getDeployConfiguration();

Expand Down Expand Up @@ -138,7 +145,7 @@ private void runGradle(Path repoDir, List<String> args) {
execArgs.add("-Dorg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m");
execArgs.add("-q");
execArgs.addAll(args);
getProject()
getExecOperations()
.exec(
spec -> {
spec.environment(System.getenv());
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
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

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

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
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