Skip to content
Snippets Groups Projects
Unverified Commit a9ec4f39 authored by Oleksandr Melnykov's avatar Oleksandr Melnykov Committed by GitHub
Browse files

Bump SDK version to 33 (#185)

* Bump SDK version to 33

* Delete fallback SDK version

* Bring back fallback SDK version to see if it can fix Circle CI
parent 47427075
No related branches found
Tags v6.1
No related merge requests found
......@@ -4,11 +4,15 @@ LABEL Description="This image provides a base Android development environment fo
ENV DEBIAN_FRONTEND=noninteractive
# Keep the previous SDK as a fallback until we've finished the migration.
ARG ANDROID_BUILD_VERSION_FALLBACK=31
ARG ANDROID_TOOLS_VERSION_FALLBACK=31.0.0
# set default build arguments
# https://developer.android.com/studio#command-tools
ARG SDK_VERSION=commandlinetools-linux-8512546_latest.zip
ARG ANDROID_BUILD_VERSION=31
ARG ANDROID_TOOLS_VERSION=31.0.0
ARG ANDROID_BUILD_VERSION=33
ARG ANDROID_TOOLS_VERSION=33.0.0
ARG BUCK_VERSION=2022.05.05.01
# Buck doesn't support versions beyond NDK 21
# Therefore we need to diverge the NDK version and set NDK_HOME
......@@ -107,7 +111,9 @@ RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk
&& yes | sdkmanager "platform-tools" \
"emulator" \
"platforms;android-$ANDROID_BUILD_VERSION" \
"platforms;android-$ANDROID_BUILD_VERSION_FALLBACK" \
"build-tools;$ANDROID_TOOLS_VERSION" \
"build-tools;$ANDROID_TOOLS_VERSION_FALLBACK" \
"cmake;$CMAKE_VERSION" \
"system-images;android-21;google_apis;armeabi-v7a" \
"ndk;$NDK_VERSION_BUCK" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment