Skip to content

Commit e2a02e7

Browse files
[High Priority] Excavator: Update gradle-jdks infrastructure plugins (palantir#1163)
1 parent 1185be6 commit e2a02e7

4 files changed

Lines changed: 44 additions & 39 deletions

File tree

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
1313
classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
1414
classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.1.0'
15-
classpath 'com.palantir.gradle.jdks:gradle-jdks:0.53.0'
15+
classpath 'com.palantir.gradle.jdks:gradle-jdks:0.54.0'
1616
classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0'
1717
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.50.0'
1818
classpath 'com.palantir.gradle.revapi:gradle-revapi:1.8.0'

‎gradle/gradle-jdks-functions.sh‎

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -123,44 +123,49 @@ install_and_setup_jdks() {
123123
# Check if distribution exists in $GRADLE_JDKS_HOME
124124
jdk_installation_directory="$GRADLE_JDKS_HOME"/"$distribution_local_path"
125125
if [ ! -d "$jdk_installation_directory" ]; then
126-
# Download and extract the distribution into a temporary directory
127126
echo "JDK installation '$jdk_installation_directory' does not exist, installing '$distribution_url' in progress ..."
128-
in_progress_dir="$TMP_WORK_DIR/$distribution_local_path.in-progress"
129-
mkdir -p "$in_progress_dir"
130-
cd "$in_progress_dir" || die "failed to change dir to $in_progress_dir"
131-
if command -v curl > /dev/null 2>&1; then
132-
echo "Using curl to download $distribution_url"
133-
case "$distribution_url" in
134-
*.zip)
135-
distribution_name=${distribution_url##*/}
136-
curl -C - "$distribution_url" -o "$distribution_name"
137-
tar -xzf "$distribution_name"
138-
;;
139-
*)
140-
curl -C - "$distribution_url" | tar -xzf -
141-
;;
142-
esac
143-
elif command -v wget > /dev/null 2>&1; then
144-
echo "Using wget to download $distribution_url"
145-
case "$distribution_url" in
146-
*.zip)
147-
distribution_name=${distribution_url##*/}
148-
wget -c "$distribution_url" -O "$distribution_name"
149-
tar -xzf "$distribution_name"
150-
;;
151-
*)
152-
wget -qO- -c "$distribution_url" | tar -xzf -
153-
;;
154-
esac
155-
else
156-
die "ERROR: Neither curl nor wget are installed, Could not set up JAVA_HOME"
157-
fi
158-
cd - || exit
159-
160-
# Finding the java_home
161-
java_home=$(get_java_home "$in_progress_dir")
162-
"$java_home"/bin/java -cp "$scripts_dir"/gradle-jdks-setup.jar com.palantir.gradle.jdks.setup.GradleJdkInstallationSetup jdkSetup "$jdk_installation_directory" || die "Failed to set up JDK $jdk_installation_directory"
163-
echo "Successfully installed JDK distribution in $jdk_installation_directory"
127+
elif [ ! -f "$jdk_installation_directory/bin/java" ]; then
128+
echo "Java executable not found in $jdk_installation_directory/bin/java, re-installing the JDK...."
129+
else
130+
echo "JDK installation $jdk_installation_directory was already configured"
131+
continue
132+
fi
133+
# Download and extract the distribution into a temporary directory
134+
in_progress_dir="$TMP_WORK_DIR/$distribution_local_path.in-progress"
135+
mkdir -p "$in_progress_dir"
136+
cd "$in_progress_dir" || die "failed to change dir to $in_progress_dir"
137+
if command -v curl > /dev/null 2>&1; then
138+
echo "Using curl to download $distribution_url"
139+
case "$distribution_url" in
140+
*.zip)
141+
distribution_name=${distribution_url##*/}
142+
curl -C - "$distribution_url" -o "$distribution_name"
143+
tar -xzf "$distribution_name"
144+
;;
145+
*)
146+
curl -k -C - "$distribution_url" | tar -xzf -
147+
;;
148+
esac
149+
elif command -v wget > /dev/null 2>&1; then
150+
echo "Using wget to download $distribution_url"
151+
case "$distribution_url" in
152+
*.zip)
153+
distribution_name=${distribution_url##*/}
154+
wget -c "$distribution_url" -O "$distribution_name"
155+
tar -xzf "$distribution_name"
156+
;;
157+
*)
158+
wget -qO- -c "$distribution_url" | tar -xzf -
159+
;;
160+
esac
161+
else
162+
die "ERROR: Neither curl nor wget are installed, Could not set up JAVA_HOME"
164163
fi
164+
cd - || exit
165+
166+
# Finding the java_home
167+
java_home=$(get_java_home "$in_progress_dir")
168+
"$java_home"/bin/java -cp "$scripts_dir"/gradle-jdks-setup.jar com.palantir.gradle.jdks.setup.GradleJdkInstallationSetup jdkSetup "$jdk_installation_directory" || die "Failed to set up JDK $jdk_installation_directory"
169+
echo "Successfully installed JDK distribution in $jdk_installation_directory"
165170
done
166171
}

‎gradle/gradle-jdks-setup.jar‎

444 Bytes
Binary file not shown.

‎settings.gradle‎

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

0 commit comments

Comments
 (0)