From 85ec6156607dafa9885465db54631831516f9e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Salcedo=20Garc=C3=ADa?= <alvaro@alvr.dev>
Date: Sun, 4 Aug 2024 17:27:54 +0200
Subject: [PATCH] Update

* Added VanillaIceCream (API 35)
* arm64
---
 .github/workflows/default.yaml | 10 ++++++----
 docker/extras                  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
index b0759df..1ab4e6a 100644
--- a/.github/workflows/default.yaml
+++ b/.github/workflows/default.yaml
@@ -92,13 +92,14 @@ jobs:
           password: ${{ secrets.QUAY_PASS }}
 
       - name: Build Android Base JDK${{ matrix.jdk }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./docker
           file: ./docker/base.Dockerfile
           push: ${{ startsWith(github.ref, 'refs/tags/v') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
           build-args: |
             JDK_VERSION=${{ matrix.jdk }}
             CMDLINE_VERSION=${{ env.CMDLINE_VERSION }}
@@ -110,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        android-api: [28, 29, 30, 31, 32, 33, 34, VanillaIceCream]
+        android-api: [28, 29, 30, 31, 32, 33, 34, 35]
         jdk: [8, 11, 17, 21]
 
     steps:
@@ -130,7 +131,7 @@ jobs:
               32) BUILD_TOOLS_VERSION="32.0.0" ;;
               33) BUILD_TOOLS_VERSION="33.0.2" ;;
               34) BUILD_TOOLS_VERSION="34.0.0" ;;
-              VanillaIceCream) BUILD_TOOLS_VERSION="35.0.0-rc3" ;;
+              35) BUILD_TOOLS_VERSION="35.0.0" ;;
           esac
           echo "BUILD_TOOLS_VERSION=$BUILD_TOOLS_VERSION" >> $GITHUB_ENV
 
@@ -173,13 +174,14 @@ jobs:
           password: ${{ secrets.QUAY_PASS }}
 
       - name: Build Android API ${{ matrix.android-api }} JDK${{ matrix.jdk }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./docker
           file: ./docker/android.Dockerfile
           push: ${{ startsWith(github.ref, 'refs/tags/v') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
           build-args: |
             JDK_VERSION=${{ matrix.jdk }}
             BUILD_TOOLS=${{ env.BUILD_TOOLS_VERSION }}
diff --git a/docker/extras b/docker/extras
index f3bb38e..c6af6e6 100755
--- a/docker/extras
+++ b/docker/extras
@@ -2,7 +2,7 @@
 
 set -e
 
-DEFAULT_NDK=26.1.10909125
+DEFAULT_NDK=27.0.12077973
 DEFAULT_CMAKE=3.22.1
 
 install_fastlane() {