Skip to content

Commit 5e45067

Browse files
[High Priority] Excavator: Update gradle-jdks infrastructure plugins (#3158)
1 parent 238e552 commit 5e45067

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ buildscript {
66

77
dependencies {
88
classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
9-
classpath 'com.palantir.gradle.jdks:gradle-jdks:0.67.0'
10-
classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.19.0'
9+
classpath 'com.palantir.gradle.jdks:gradle-jdks:0.69.0'
10+
classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.20.0'
1111
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
1212
classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.14.0'
1313
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.70.0'

gradle/gradle-jdks-functions.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ export ARCH
112112

113113
is_arch_os_supported() {
114114
if [ "$OS" = "unsupported" ] || [ "$ARCH" = "unsupported" ]; then
115-
echo false
115+
return 1 # false
116116
fi
117-
echo true
117+
return 0 # true
118118
}
119119

120120
install_and_setup_jdks() {

gradle/gradle-jdks-setup.jar

9.35 KB
Binary file not shown.

gradle/gradle-jdks-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ APP_GRADLE_DIR="$APP_HOME"/gradle
6767
# Loading gradle jdk functions
6868
. "$APP_GRADLE_DIR"/gradle-jdks-functions.sh
6969

70-
if ! $(is_arch_os_supported); then
70+
if ! is_arch_os_supported; then
7171
echo "Skipping Gradle JDKs Setup, Unsupported OS/Arch..."
7272
cleanup
7373
return

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
gradlePluginPortal()
55
}
66
dependencies {
7-
classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.67.0'
7+
classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.69.0'
88
}
99
}
1010
apply plugin: 'com.palantir.jdks.settings'

0 commit comments

Comments
 (0)