[High Priority] Excavator: Update gradle-jdks infrastructure plugins (#1288)

Author: svc-excavator-bot

build.gradle

@@ -12,7 +12,7 @@ buildscript {
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.2.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.64.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.65.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.18.0'
         classpath 'com.palantir.gradle.plugintesting:gradle-plugin-testing:0.6.0'
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.63.0'

gradle/gradle-jdks-functions.sh

@@ -53,7 +53,7 @@ get_os() {
   case "$( uname )" in                          #(
     Linux* )          os_name="linux"  ;;       #(
     Darwin* )         os_name="macos"  ;;       #(
-    * )               die "ERROR Unsupported OS: $( uname )" ;;
+    * )               os_name="unsupported";;
   esac
 
   if [ "$os_name" = "linux" ]; then
@@ -83,7 +83,7 @@ get_arch() {
     aarch64* )      arch_name="aarch64"  ;;     #(
     x86* )          arch_name="x86"  ;;         #(
     i686* )         arch_name="x86"  ;;         #(
-    * )             die "ERROR Unsupported architecture: $( uname -m )" ;;
+    * )             arch_name="unsupported";;
   esac
 
   echo "$arch_name"
@@ -110,6 +110,13 @@ export OS
 ARCH=$(get_arch)
 export ARCH
 
+is_arch_os_supported() {
+  if [ "$OS" = "unsupported" ] || [ "$ARCH" = "unsupported" ]; then
+    echo false
+  fi
+  echo true
+}
+
 install_and_setup_jdks() {
   gradle_dir=$1
   scripts_dir=${2:-"$1"}

gradle/gradle-jdks-setup.jar

@@ -67,6 +67,12 @@ APP_GRADLE_DIR="$APP_HOME"/gradle
 # Loading gradle jdk functions
 . "$APP_GRADLE_DIR"/gradle-jdks-functions.sh
 
+if ! $(is_arch_os_supported); then
+  echo "Skipping Gradle JDKs Setup, Unsupported OS/Arch..."
+  cleanup
+  return
+fi
+
 install_and_setup_jdks "$APP_GRADLE_DIR"
 
 gradle_daemon_jdk_version=$(read_value "$APP_GRADLE_DIR"/gradle-daemon-jdk-version)

gradle/gradle-jdks-setup.sh

@@ -4,7 +4,7 @@ buildscript {
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
     }
     dependencies {
-        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.64.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.65.0'
     }
 }
 apply plugin: 'com.palantir.jdks.settings'