From 69565ebc97ca5da199e94dc4de15e3d389033fd6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 6 Mar 2026 12:30:21 +0000 Subject: [PATCH 1/2] Initial plan From 4d2bf94d2203a895a4897335b77b98887447eef2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 6 Mar 2026 12:32:20 +0000 Subject: [PATCH 2/2] Update to Android API level 36 and prepare CalVer release v2026.03.1 - Update build tools from 35.0.0 to 36.0.0 - Replace platforms;android-33 with platforms;android-36 (keeping 34, 35, 36) - Update README to reflect Android SDK 16 (API levels 34-36) - Update CalVer release version to v2026.03.1 Co-authored-by: beevelop <6891349+beevelop@users.noreply.github.com> --- Dockerfile | 4 ++-- README.md | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ee21ff..0834766 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM beevelop/java # https://developer.android.com/studio/#downloads ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" \ - ANDROID_BUILD_TOOLS_VERSION=35.0.0 \ + ANDROID_BUILD_TOOLS_VERSION=36.0.0 \ ANT_HOME="/usr/share/ant" \ MAVEN_HOME="/usr/share/maven" \ GRADLE_HOME="/usr/share/gradle" \ @@ -35,7 +35,7 @@ RUN mkdir android && cd android && \ RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \ while true; do echo 'y'; sleep 2; done | sdkmanager "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-33" "platforms;android-34" "platforms;android-35" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-34" "platforms;android-35" "platforms;android-36" && \ while true; do echo 'y'; sleep 2; done | sdkmanager "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" && \ while true; do echo 'y'; sleep 2; done | sdkmanager "add-ons;addon-google_apis-google-24" "skiaparser;1" "skiaparser;2" "skiaparser;3" diff --git a/README.md b/README.md index 67fffb4..edf4035 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ # Docker Android SDK - Build Android Apps in Docker -> Production-ready Docker image with Android SDK 15 (API levels 33-35), Java 17, and essential build tools for Android development and CI/CD pipelines. +> Production-ready Docker image with Android SDK 16 (API levels 34-36), Java 17, and essential build tools for Android development and CI/CD pipelines. ## What's Included @@ -20,7 +20,7 @@ - Gradle `8.12` (Groovy: `3.0.22`) - Apache Maven `3.6.3` - Ant `1.10.12` -- Android Build Tools `35.0.0` +- Android Build Tools `36.0.0` ## Usage @@ -28,10 +28,10 @@ ```bash # Pull the latest release -docker pull beevelop/android:v2025.08.1 +docker pull beevelop/android:v2026.03.1 # Run interactively -docker run --rm -it beevelop/android:v2025.08.1 bash +docker run --rm -it beevelop/android:v2026.03.1 bash # Build from source docker build -t beevelop/android github.com/beevelop/docker-android @@ -40,7 +40,7 @@ docker build -t beevelop/android github.com/beevelop/docker-android ### Use as Base Image ```Dockerfile -FROM beevelop/android:v2025.08.1 +FROM beevelop/android:v2026.03.1 # Accept Android SDK licenses (read them first!) RUN yes | sdkmanager --licenses --sdk_root=$ANDROID_SDK_ROOT