Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android 34 #59

Merged
merged 2 commits into from
Aug 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

2 changes: 1 addition & 1 deletion sdk/33-ndk/Dockerfile → sdk/34-ndk/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions sdk/33/Dockerfile → sdk/34/Dockerfile
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion sdk/tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down