From 9a85a52e0d733bad0c3e34429b3c4d74e6d5deff Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Mon, 1 Aug 2022 22:17:12 +0200
Subject: [PATCH] Updated the build containers based on:
 https://github.com/godotengine/build-containers/commit/18b7ecfcd9c9ee6ecabf1c3fa6698a5dff692924

---
 misc/build-containers/Dockerfile.android    | 6 +++---
 misc/build-containers/Dockerfile.javascript | 2 +-
 misc/build-containers/Dockerfile.osx        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/misc/build-containers/Dockerfile.android b/misc/build-containers/Dockerfile.android
index ff8c77a54..47284250a 100644
--- a/misc/build-containers/Dockerfile.android
+++ b/misc/build-containers/Dockerfile.android
@@ -2,17 +2,17 @@ ARG img_version
 FROM pandemonium-fedora:${img_version}
 
 ENV ANDROID_SDK_ROOT=/root/sdk
-ENV ANDROID_NDK_VERSION=21.4.7075529
+ENV ANDROID_NDK_VERSION=23.2.8568313
 ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}
 
 RUN dnf -y install --setopt=install_weak_deps=False \
       gcc gcc-c++ java-11-openjdk-devel ncurses-compat-libs && \
     mkdir -p sdk && cd sdk && \
-    export CMDLINETOOLS=commandlinetools-linux-7302050_latest.zip && \
+    export CMDLINETOOLS=commandlinetools-linux-8512546_latest.zip && \
     curl -LO https://dl.google.com/android/repository/${CMDLINETOOLS} && \
     unzip ${CMDLINETOOLS} && \
     rm ${CMDLINETOOLS} && \
     yes | cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses && \
-    cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;30.0.3' 'platforms;android-30' 'cmake;3.18.1'
+    cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;32.0.0' 'platforms;android-32' 'cmake;3.18.1'
 
 CMD /bin/bash
diff --git a/misc/build-containers/Dockerfile.javascript b/misc/build-containers/Dockerfile.javascript
index ceddddced..7f07a329c 100644
--- a/misc/build-containers/Dockerfile.javascript
+++ b/misc/build-containers/Dockerfile.javascript
@@ -1,7 +1,7 @@
 ARG img_version
 FROM pandemonium-fedora:${img_version}
 
-ENV EMSCRIPTEN_CLASSICAL=2.0.25
+ENV EMSCRIPTEN_CLASSICAL=3.1.14
 
 RUN dnf -y install --setopt=install_weak_deps=False \
       java-openjdk && \
diff --git a/misc/build-containers/Dockerfile.osx b/misc/build-containers/Dockerfile.osx
index 1031901f7..4f869a7cd 100644
--- a/misc/build-containers/Dockerfile.osx
+++ b/misc/build-containers/Dockerfile.osx
@@ -7,7 +7,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
       automake autoconf bzip2-devel clang libicu-devel libtool libxml2-devel llvm-devel openssl-devel yasm cmake && \
     git clone --progress https://github.com/tpoechtrager/osxcross.git && \
     cd /root/osxcross && \
-    git checkout 0f87f567dfaf98460244471ad6c0f4311d62079c && \
+    git checkout 17bb5e2d0a46533c1dd525cf4e9a80d88bd9f00e && \
     ln -s /root/files/MacOSX11.3.sdk.tar.xz /root/osxcross/tarballs && \
     UNATTENDED=1 ./build.sh && \
     ./build_compiler_rt.sh