diff --git a/.github/workflows/306-flow-snyk-monitor.yaml b/.github/workflows/306-flow-snyk-monitor.yaml index 0d646e463fad..0364f830d67c 100644 --- a/.github/workflows/306-flow-snyk-monitor.yaml +++ b/.github/workflows/306-flow-snyk-monitor.yaml @@ -50,7 +50,7 @@ jobs: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - name: Disable Gradle Isolated Projects - run: sed -i 's/^org.gradle.unsafe.isolated-projects=.*$/org.gradle.unsafe.isolated-projects=false/' gradle.properties + run: sed -i 's/^org.gradle.isolated-projects=.*$/org.gradle.isolated-projects=false/' gradle.properties - name: Run Snyk Monitor env: diff --git a/.github/workflows/801-call-snyk-scan.yaml b/.github/workflows/801-call-snyk-scan.yaml index 21e9dfe8b8c0..300af1045a3f 100644 --- a/.github/workflows/801-call-snyk-scan.yaml +++ b/.github/workflows/801-call-snyk-scan.yaml @@ -104,7 +104,7 @@ jobs: ${CG_EXEC} npm install -g snyk-to-html@3.7.7 @wcj/html-to-markdown-cli@2.1.1 - name: Disable Gradle Isolated Projects - run: sed -i 's/^org.gradle.unsafe.isolated-projects=.*$/org.gradle.unsafe.isolated-projects=false/' gradle.properties + run: sed -i 's/^org.gradle.isolated-projects=.*$/org.gradle.isolated-projects=false/' gradle.properties - name: Snyk Version id: snyk-version diff --git a/.github/workflows/850-call-build-release-artifact.yaml b/.github/workflows/850-call-build-release-artifact.yaml index d2d27ec5997e..7494a61ac6b7 100644 --- a/.github/workflows/850-call-build-release-artifact.yaml +++ b/.github/workflows/850-call-build-release-artifact.yaml @@ -864,7 +864,7 @@ jobs: env: RELEASE_PROFILE: ${{ inputs.release-profile }} # The flags that disable parallelism are used on purpose to avoid parallel signing which may cause 'gpg: signing failed: Inappropriate ioctl for device' - run: ./gradlew "release${RELEASE_PROFILE}" -PpublishSigningEnabled=true --no-configuration-cache -Dorg.gradle.unsafe.isolated-projects=false --no-parallel + run: ./gradlew "release${RELEASE_PROFILE}" -PpublishSigningEnabled=true --no-configuration-cache -Dorg.gradle.isolated-projects=false --no-parallel - name: Gradle Publish to Maven Central if: ${{ inputs.version-policy == 'specified' && inputs.dry-run-enabled != true && inputs.release-profile != 'none' && !cancelled() && !failure() }} @@ -872,7 +872,7 @@ jobs: NEXUS_USERNAME: ${{ secrets.central-publishing-username }} NEXUS_PASSWORD: ${{ secrets.central-publishing-password }} # The flags that disable parallelism are used on purpose to avoid parallel signing which may cause 'gpg: signing failed: Inappropriate ioctl for device' - run: ./gradlew publishAggregationToCentralPortal -PpublishSigningEnabled=true --no-configuration-cache -Dorg.gradle.unsafe.isolated-projects=false --no-parallel + run: ./gradlew publishAggregationToCentralPortal -PpublishSigningEnabled=true --no-configuration-cache -Dorg.gradle.isolated-projects=false --no-parallel - name: Upload SDK Release Archives if: ${{ inputs.dry-run-enabled != true && inputs.version-policy == 'specified' && !cancelled() && !failure() }} diff --git a/gradle.properties b/gradle.properties index ea7523e76cd1..c94bbc75df9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.configuration-cache=true org.gradle.caching=true # Enable parallel configuration phase -org.gradle.unsafe.isolated-projects=true +org.gradle.isolated-projects=true # Enable parallel execution (if configuration cache is manually disabled) org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b44f..eddabd2eef8d 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 df6a6ad763d4..69dd0d0404a8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew b/gradlew index b9bb139f7905..249efbb032ce 100755 --- a/gradlew +++ b/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/gradlew.bat b/gradlew.bat index aa5f10b069f9..8508ef684d4e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel