Skip to content

Commit a9ec4f3

Browse files
authored
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
1 parent 4742707 commit a9ec4f3

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Dockerfile

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ LABEL Description="This image provides a base Android development environment fo
44

55
ENV DEBIAN_FRONTEND=noninteractive
66

7+
# Keep the previous SDK as a fallback until we've finished the migration.
8+
ARG ANDROID_BUILD_VERSION_FALLBACK=31
9+
ARG ANDROID_TOOLS_VERSION_FALLBACK=31.0.0
10+
711
# set default build arguments
812
# https://developer.android.com/studio#command-tools
913
ARG SDK_VERSION=commandlinetools-linux-8512546_latest.zip
10-
ARG ANDROID_BUILD_VERSION=31
11-
ARG ANDROID_TOOLS_VERSION=31.0.0
14+
ARG ANDROID_BUILD_VERSION=33
15+
ARG ANDROID_TOOLS_VERSION=33.0.0
1216
ARG BUCK_VERSION=2022.05.05.01
1317
# Buck doesn't support versions beyond NDK 21
1418
# 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
107111
&& yes | sdkmanager "platform-tools" \
108112
"emulator" \
109113
"platforms;android-$ANDROID_BUILD_VERSION" \
114+
"platforms;android-$ANDROID_BUILD_VERSION_FALLBACK" \
110115
"build-tools;$ANDROID_TOOLS_VERSION" \
116+
"build-tools;$ANDROID_TOOLS_VERSION_FALLBACK" \
111117
"cmake;$CMAKE_VERSION" \
112118
"system-images;android-21;google_apis;armeabi-v7a" \
113119
"ndk;$NDK_VERSION_BUCK" \

0 commit comments

Comments
 (0)