From 657cd7da16ff227d277a28e4466aac7a1ec0906a Mon Sep 17 00:00:00 2001
From: Fedor Korotkov <fedor@cirruslabs.org>
Date: Wed, 30 Aug 2023 17:07:54 -0400
Subject: [PATCH] Android 34 (#59)

---
 .cirrus.yml                       | 16 ++++++++--------
 README.md                         |  4 ++--
 sdk/{33-ndk => 34-ndk}/Dockerfile |  2 +-
 sdk/{33 => 34}/Dockerfile         |  4 ++--
 sdk/tools/Dockerfile              |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename sdk/{33-ndk => 34-ndk}/Dockerfile (77%)
 rename sdk/{33 => 34}/Dockerfile (76%)

diff --git a/.cirrus.yml b/.cirrus.yml
index 1782c21..aa9a4ae 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -12,12 +12,12 @@ docker_builder:
       sdk/tools
   build_sdk_script: |
     docker buildx build --load \
-      --tag ghcr.io/cirruslabs/android-sdk:33 \
-      sdk/33
+      --tag ghcr.io/cirruslabs/android-sdk:34 \
+      sdk/34
   build_ndk_script: |
     docker buildx build --load \
-      --tag ghcr.io/cirruslabs/android-sdk:33-ndk \
-      sdk/33-ndk
+      --tag ghcr.io/cirruslabs/android-sdk:34-ndk \
+      sdk/34-ndk
 
 docker_builder:
   name: Push
@@ -37,9 +37,9 @@ docker_builder:
       sdk/tools
   build_sdk_script: |
     docker buildx build --push \
-      --tag ghcr.io/cirruslabs/android-sdk:33 \
-      sdk/33
+      --tag ghcr.io/cirruslabs/android-sdk:34 \
+      sdk/34
   build_ndk_script: |
     docker buildx build --push \
-      --tag ghcr.io/cirruslabs/android-sdk:33-ndk \
-      sdk/33-ndk
+      --tag ghcr.io/cirruslabs/android-sdk:34-ndk \
+      sdk/34-ndk
diff --git a/README.md b/README.md
index 7f4ca98..e174c39 100644
--- 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 b/sdk/34-ndk/Dockerfile
similarity index 77%
rename from sdk/33-ndk/Dockerfile
rename to sdk/34-ndk/Dockerfile
index 7ad5b52..5de5c8c 100644
--- a/sdk/33-ndk/Dockerfile
+++ b/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 b/sdk/34/Dockerfile
similarity index 76%
rename from sdk/33/Dockerfile
rename to sdk/34/Dockerfile
index d535f3b..9cfdcce 100644
--- a/sdk/33/Dockerfile
+++ b/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
index dd9e112..abbf9a2 100644
--- 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 \