From 973bc13a081eab621a9b13894f0067f02938a759 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 10 Apr 2025 14:42:34 +0200 Subject: [PATCH 1/2] Update CMake for Android to 3.30.5 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 47c3c39..cd1e4e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG ANDROID_TOOLS_VERSION=35.0.0 ARG NDK_VERSION=27.1.12297006 ARG NODE_VERSION=20.18 ARG WATCHMAN_VERSION=4.9.0 -ARG CMAKE_VERSION=3.22.1 +ARG CMAKE_VERSION=3.30.5 # set default environment variables, please don't remove old env for compatibilty issue ENV ADB_INSTALL_TIMEOUT=10 @@ -79,6 +79,7 @@ RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk "platforms;android-$ANDROID_BUILD_VERSION" \ "build-tools;$ANDROID_TOOLS_VERSION" \ "cmake;$CMAKE_VERSION" \ + "cmake;3.22.1" \ "ndk;$NDK_VERSION" \ && rm -rf ${ANDROID_HOME}/.android \ && chmod 777 -R /opt/android From b90625ea52ed562c0f23eaf59eb7e2147f9f24f9 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 10 Apr 2025 14:52:53 +0200 Subject: [PATCH 2/2] Update test-react-native-setup.sh --- scripts/test-react-native-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-react-native-setup.sh b/scripts/test-react-native-setup.sh index 33fa465..33c1ac4 100755 --- a/scripts/test-react-native-setup.sh +++ b/scripts/test-react-native-setup.sh @@ -3,5 +3,5 @@ set -e echo "Build React Native via Gradle" -yarn install +yarn install --ignore-engines ./gradlew --no-daemon build -PreactNativeArchitectures=arm64-v8a