From 2c7419a7ed53e4ece33bacd15677b1f88de0a4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <remi@godotengine.org>
Date: Thu, 19 Oct 2023 10:45:43 +0200
Subject: [PATCH] Android: Install JDK 17 needed for 4.2-beta2 and later

Temporary change until we switch to newer build containers with it.

Also temporarily disable closure compiler for Web editor, needed for
4.2 beta 1 and beta 2, should be fixed upstream afterwarads.
---
 build-android/build.sh               | 3 +++
 build-android/upload-mavencentral.sh | 1 +
 build-web/build.sh                   | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build-android/build.sh b/build-android/build.sh
index ccb1b87..f9d385e 100755
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -18,6 +18,9 @@ tar xf /root/godot.tar.gz --strip-components=1
 # as well as signing and publishing to MavenCentral.
 source /root/keystore/config.sh
 
+# Temporary, until we make new build containers.
+dnf install -y java-17-openjdk-devel
+
 store_release="yes"
 if [ -z "${GODOT_ANDROID_SIGN_KEYSTORE}" ]; then
   echo "No keystore provided to sign the Android release editor build, using debug build instead."
diff --git a/build-android/upload-mavencentral.sh b/build-android/upload-mavencentral.sh
index 9b43e6a..7a4dfe8 100644
--- a/build-android/upload-mavencentral.sh
+++ b/build-android/upload-mavencentral.sh
@@ -13,6 +13,7 @@ ${PODMAN} run -it --rm \
   -v ${basedir}/out/android/source:/root/godot -v ${basedir}/deps/keystore:/root/keystore \
   localhost/godot-android:${IMAGE_VERSION} bash -c \
     "source /root/keystore/config.sh && \
+    dnf install -y java-17-openjdk-devel && \
     cp -r /root/godot/.gradle /root && \
     cd /root/godot/platform/android/java && \
     ./gradlew publishTemplateReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"
diff --git a/build-web/build.sh b/build-web/build.sh
index 8af477b..0206484 100755
--- a/build-web/build.sh
+++ b/build-web/build.sh
@@ -8,7 +8,7 @@ set -e
 # we run all builds in parallel each from their own folder.
 export NUM_JOBS=5
 declare -a JOBS=(
-  "target=editor use_closure_compiler=yes"
+  "target=editor use_closure_compiler=no"
   "target=template_debug"
   "target=template_release"
   "target=template_debug dlink_enabled=yes"