Android 34

Plus bumped JDK to 17 since Gradle 8.0+ requires it. Additionally, bumped tools version. Fixes #58
cirruslabs · Aug 30, 2023 · f2c0508 · f2c0508
1 parent 9f6d010
commit f2c0508
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -12,11 +12,11 @@ docker_builder:
       sdk/tools
   build_sdk_script: |
     docker buildx build --load \
-      --tag ghcr.io/cirruslabs/android-sdk:33 \
+      --tag ghcr.io/cirruslabs/android-sdk:34 \
       sdk/33
   build_ndk_script: |
     docker buildx build --load \
-      --tag ghcr.io/cirruslabs/android-sdk:33-ndk \
+      --tag ghcr.io/cirruslabs/android-sdk:34-ndk \
       sdk/33-ndk
 
 docker_builder:
@@ -37,9 +37,9 @@ docker_builder:
       sdk/tools
   build_sdk_script: |
     docker buildx build --push \
-      --tag ghcr.io/cirruslabs/android-sdk:33 \
+      --tag ghcr.io/cirruslabs/android-sdk:34 \
       sdk/33
   build_ndk_script: |
     docker buildx build --push \
-      --tag ghcr.io/cirruslabs/android-sdk:33-ndk \
+      --tag ghcr.io/cirruslabs/android-sdk:34-ndk \
       sdk/33-ndk
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 [![](https://images.microbadger.com/badges/version/cirrusci/android-sdk:tools.svg)](https://microbadger.com/images/cirrusci/android-sdk:tools) [![](https://images.microbadger.com/badges/image/cirrusci/android-sdk:tools.svg)](https://microbadger.com/images/cirrusci/android-sdk:tools)
 
-[![](https://images.microbadger.com/badges/version/cirrusci/android-sdk:33.svg)](https://microbadger.com/images/cirrusci/android-sdk:33) [![](https://images.microbadger.com/badges/image/cirrusci/android-sdk:33.svg)](https://microbadger.com/images/cirrusci/android-sdk:33)
+[![](https://images.microbadger.com/badges/version/cirrusci/android-sdk:34.svg)](https://microbadger.com/images/cirrusci/android-sdk:34) [![](https://images.microbadger.com/badges/image/cirrusci/android-sdk:34.svg)](https://microbadger.com/images/cirrusci/android-sdk:34)
 
-[![](https://images.microbadger.com/badges/version/cirrusci/android-sdk:33-ndk.svg)](https://microbadger.com/images/cirrusci/android-sdk:33-ndk) [![](https://images.microbadger.com/badges/image/cirrusci/android-sdk:33-ndk.svg)](https://microbadger.com/images/cirrusci/android-sdk:33-ndk)
+[![](https://images.microbadger.com/badges/version/cirrusci/android-sdk:34-ndk.svg)](https://microbadger.com/images/cirrusci/android-sdk:34-ndk) [![](https://images.microbadger.com/badges/image/cirrusci/android-sdk:34-ndk.svg)](https://microbadger.com/images/cirrusci/android-sdk:34-ndk)
 
diff --git a/sdk/33-ndk/Dockerfile → sdk/34-ndk/Dockerfile b/sdk/33-ndk/Dockerfile → sdk/34-ndk/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/cirruslabs/android-sdk:33
+FROM ghcr.io/cirruslabs/android-sdk:34
 
 # https://developer.android.com/ndk/downloads
 ENV ANDROID_NDK_VERSION 25.2.9519653

diff --git a/sdk/33/Dockerfile → sdk/34/Dockerfile b/sdk/33/Dockerfile → sdk/34/Dockerfile
@@ -1,8 +1,8 @@
 FROM ghcr.io/cirruslabs/android-sdk:tools
 
 # https://developer.android.com/studio/releases/build-tools
-ENV ANDROID_PLATFORM_VERSION 33
-ENV ANDROID_BUILD_TOOLS_VERSION 33.0.2
+ENV ANDROID_PLATFORM_VERSION 34
+ENV ANDROID_BUILD_TOOLS_VERSION 34.0.0
 
 RUN yes | sdkmanager \
     "platforms;android-$ANDROID_PLATFORM_VERSION" \

diff --git a/sdk/tools/Dockerfile b/sdk/tools/Dockerfile
@@ -13,7 +13,7 @@ ENV ANDROID_SDK_ROOT=$ANDROID_HOME \
     PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/emulator
 
 # comes from https://developer.android.com/studio/#command-tools
-ENV ANDROID_SDK_TOOLS_VERSION 9477386
+ENV ANDROID_SDK_TOOLS_VERSION 10406996
 
 RUN set -o xtrace \
     && cd /opt \