diff options
| author | Albin <albin@mullvad.net> | 2024-08-13 09:54:44 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-30 13:28:35 +0200 |
| commit | 103a1d7f7c9a9cf3cec1a88511369ccb05a501c2 (patch) | |
| tree | b1a5bb9baa699c959ad63f6f6b5ee1f504ec009e | |
| parent | 26b80bfab9e2415d9fcdb1fb4e694c628c0550ad (diff) | |
| download | mullvadvpn-103a1d7f7c9a9cf3cec1a88511369ccb05a501c2.tar.xz mullvadvpn-103a1d7f7c9a9cf3cec1a88511369ccb05a501c2.zip | |
Bump gradle to 8.10
| -rw-r--r-- | android/gradle/wrapper/gradle-wrapper.jar | bin | 43462 -> 43504 bytes | |||
| -rw-r--r-- | android/gradle/wrapper/gradle-wrapper.properties | 7 | ||||
| -rwxr-xr-x | android/gradlew | 7 | ||||
| -rw-r--r-- | android/gradlew.bat | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar Binary files differindex d64cd49177..2c3521197d 100644 --- a/android/gradle/wrapper/gradle-wrapper.jar +++ b/android/gradle/wrapper/gradle-wrapper.jar diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 632105fbcf..cbd8aedad5 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,11 +1,10 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -# Should match the checksum on: https://gradle.org/release-checksums/ -distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c # Upgrade using gradle and wrapper using: ./gradlew wrapper --gradle-version <version> # Compare wrapper checksum with: -# https://services.gradle.org/distributions/gradle-{gradleVersion}-wrapper.jar.sha256 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +# https://services.gradle.org/distributions/gradle-{gradleVersion}-bin.zip.sha256 +distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/gradlew b/android/gradlew index 1aa94a4269..f5feea6d6b 100755 --- a/android/gradlew +++ b/android/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,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/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/android/gradlew.bat b/android/gradlew.bat index 25da30dbde..9d21a21834 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## |