From 56525e1888e64e4b7404c3fad8bfc270e924652b Mon Sep 17 00:00:00 2001 From: Oleksandr Melnykov Date: Thu, 3 Nov 2022 16:58:45 -0700 Subject: [PATCH 1/3] Bump SDK version to 33 --- Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b5b1fb1..1600391 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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" \ From 056a9aa6532395b6e379f10fb2584389ff23b254 Mon Sep 17 00:00:00 2001 From: Oleksandr Melnykov Date: Thu, 3 Nov 2022 18:21:32 -0700 Subject: [PATCH 2/3] Delete fallback SDK version --- Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1600391..53dcfea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,6 @@ 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 @@ -111,9 +107,7 @@ 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" \ From 40bea281b2bf7881b24bbed6484d8e4b11b9fb57 Mon Sep 17 00:00:00 2001 From: Oleksandr Melnykov Date: Fri, 4 Nov 2022 13:55:07 -0700 Subject: [PATCH 3/3] Bring back fallback SDK version to see if it can fix Circle CI --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 53dcfea..1600391 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,10 @@ 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 @@ -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" \