Skip to content

Commit 0dfdb9b

Browse files
committed
fix(deps): upgrade Gradle to v8.14.3 to align with upstream
ADOT Java was using an outdated Gradle release, particularly the Lambda build (v8.1.1). This PR upgrades both builds to v8.14.3, matching the version used by the upstream Java Agent. ./gradlew wrapper --gradle-version 8.14.3 Tests performed: - Local build: ./gradlew build ✅ - Unit tests: ./gradlew test ✅ - Smoke/contract tests: ./gradlew appsignals-tests:contract-tests:contractTests ✅
1 parent 39e6c30 commit 0dfdb9b

File tree

8 files changed

+12
-8
lines changed

8 files changed

+12
-8
lines changed

gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
502 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

lambda-layer/gradlew

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
#!/bin/sh
32

43
#
@@ -86,9 +85,6 @@ done
8685
APP_BASE_NAME=${0##*/}
8786
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8887

89-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
90-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
91-
9288
# Use the maximum available, or set MAX_FD != -1 to use that value.
9389
MAX_FD=maximum
9490

@@ -198,6 +194,10 @@ if "$cygwin" || "$msys" ; then
198194
done
199195
fi
200196

197+
198+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200+
201201
# Collect all arguments for the java command;
202202
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
203203
# shell script including quotes and variable substitutions, so put them in

lambda-layer/gradlew.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
@rem
32
@rem Copyright 2015 the original author or authors.
43
@rem

0 commit comments

Comments
 (0)