File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,10 @@ ARG NDK_VERSION_BUCK=21.4.7075529
2121ARG NDK_VERSION_GRADLE=23.1.7779620
2222ARG NODE_VERSION=14.x
2323ARG WATCHMAN_VERSION=4.9.0
24- ARG CMAKE_VERSION=3.18.1
24+ # For comaptibilites we install both CMake 3.18.x and 3.22.x, as AGP 7.3 autodownloads 3.18.x
25+ # Once we bump to AGP 7.4, we can remove 3.18.x and use only 3.22.x
26+ ARG CMAKE_VERSION=3.22.1
27+ ARG OLD_CMAKE_VERSION=3.18.1
2528
2629# set default environment variables, please don't remove old env for compatibilty issue
2730ENV ADB_INSTALL_TIMEOUT=10
@@ -115,6 +118,7 @@ RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk
115118 "build-tools;$ANDROID_TOOLS_VERSION" \
116119 "build-tools;$ANDROID_TOOLS_VERSION_FALLBACK" \
117120 "cmake;$CMAKE_VERSION" \
121+ "cmake;$OLD_CMAKE_VERSION" \
118122 "system-images;android-21;google_apis;armeabi-v7a" \
119123 "ndk;$NDK_VERSION_BUCK" \
120124 "ndk;$NDK_VERSION_GRADLE" \
You can’t perform that action at this time.
0 commit comments