diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0031b52f6..a20466737 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java }} - - uses: gradle/wrapper-validation-action@v1 - - uses: gradle/gradle-build-action@v2 + - uses: gradle/actions/wrapper-validation@v3 + - uses: gradle/actions/setup-gradle@v3 - run: ./gradlew assemble - run: ./gradlew check zapRunTests diff --git a/build.gradle.kts b/build.gradle.kts index 712c56718..6db738e65 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,11 +15,11 @@ import org.zaproxy.gradle.tasks.ZapStart plugins { `java-library` jacoco - id("org.zaproxy.add-on") version "0.10.0" + id("org.zaproxy.add-on") version "0.11.0" id("org.zaproxy.crowdin") version "0.4.0" id("com.diffplug.spotless") id("org.zaproxy.common") - id("com.github.ben-manes.versions") version "0.50.0" + id("com.github.ben-manes.versions") version "0.51.0" id("com.github.node-gradle.node") } @@ -41,8 +41,28 @@ val testResultsDir = layout.buildDirectory.dir("reports/tests/test").get() val zapPort = 8999 // Use a key just to make sure the HUD works with one val zapApiKey = "password123" -val hudDevArgs = listOf("-config", "hud.enabledForDesktop=true", "-config", "hud.enabledForDaemon=true", "-config", "hud.devMode=true", "-config", "hud.unsafeEval=true") -val zapCmdlineOpts = listOf("-silent", "-config", "hud.tutorialPort=9998", "-config", "hud.tutorialTestMode=true", "-config", "hud.showWelcomeScreen=false", "-daemon") + hudDevArgs +val hudDevArgs = + listOf( + "-config", + "hud.enabledForDesktop=true", + "-config", + "hud.enabledForDaemon=true", + "-config", + "hud.devMode=true", + "-config", + "hud.unsafeEval=true", + ) +val zapCmdlineOpts = + listOf( + "-silent", + "-config", + "hud.tutorialPort=9998", + "-config", + "hud.tutorialTestMode=true", + "-config", + "hud.showWelcomeScreen=false", + "-daemon", + ) + hudDevArgs zapAddOn { addOnId.set("hud") @@ -101,7 +121,7 @@ crowdin { node { download.set(true) - version.set("19.7.0") + version.set("20.13.0") } val copyNpmDeps by tasks.registering(Copy::class) { @@ -143,13 +163,13 @@ dependencies { compileOnly("org.zaproxy.addon:network:0.1.0") compileOnly(files(fileTree("lib").files)) - testImplementation("org.junit.jupiter:junit-jupiter:5.9.3") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testRuntimeOnly("org.junit.platform:junit-platform-launcher") testImplementation("io.github.bonigarcia:selenium-jupiter:4.3.6") - testImplementation("org.seleniumhq.selenium:selenium-java:4.10.0") + testImplementation("org.seleniumhq.selenium:selenium-java:4.21.0") testImplementation("org.hamcrest:hamcrest-all:1.3") - testImplementation("org.mockito:mockito-core:5.4.0") + testImplementation("org.mockito:mockito-core:5.12.0") testImplementation("org.zaproxy.addon:network:0.1.0") testImplementation(files(fileTree("lib").files)) } @@ -361,7 +381,7 @@ tasks.withType().configureEach { systemProperties.putAll( mapOf( "wdm.chromeDriverVersion" to "83.0.4103.39", - "wdm.geckoDriverVersion" to "0.32.1", + "wdm.geckoDriverVersion" to "0.34.0", "wdm.forceCache" to "true", ), ) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd4917..e6441136f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a7a990ab2..515ab9d5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a426..b740cf133 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f1..25da30dbd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle.kts b/settings.gradle.kts index 33d941291..af5955c0d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,7 @@ plugins { - id("org.zaproxy.common.settings") version "0.2.0" + id("org.zaproxy.common.settings") version "0.3.0" - id("com.diffplug.spotless") version "6.20.0" apply false + id("com.diffplug.spotless") version "6.25.0" apply false id("com.github.node-gradle.node") version "7.0.1" apply false }