Skip to content

Commit 18519e0

Browse files
authored
feat: upgrade Android SDK to version 36 (#1779)
* feat: upgrade Android SDK to version 36 - Update platform from android-33 to android-36 - Update build tools from 30.0.3 to 35.0.0 - Maintain NDK version 25.0.8775105 for compatibility Resolves #1778 * feat: update Android command-line tools to latest version - Update from commandlinetools-linux-8512546 to 13114758 - Latest version from https://developer.android.com/studio - Size: 164.8 MB - SHA-256: 7ec965280a073311c339e571cd5de778b9975026cfcbe79f2b1cdcb1e15317ee * feat: add Updatecli automation for Android SDK components Add automated version checking for: - Android command-line tools (currently 13114758) - Android build tools (currently 35.x series) The manifest scrapes developer.android.com to detect new versions and automatically creates PRs when updates are available. Runs weekly via .github/workflows/updatecli.yaml
1 parent 608598f commit 18519e0

File tree

2 files changed

+68
-5
lines changed

2 files changed

+68
-5
lines changed

dockerfiles/android/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ ENV ANDROID_HOME /usr/local/android-sdk-linux
2727
ENV ANDROID_SDK_ROOT /usr/local/android-sdk-linux
2828
ENV CMDLINE_TOOLS_HOME $ANDROID_HOME/cmdline-tools/latest
2929
ENV PATH /usr/local/bin:$PATH:$CMDLINE_TOOLS_HOME/bin:$ANDROID_HOME/:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
30-
ARG ANDROID_BUILD_TOOLS_VERSION=30.0.3
30+
ARG ANDROID_BUILD_TOOLS_VERSION=35.0.0
3131

3232
RUN mkdir -p /usr/local/android-sdk-linux/cmdline-tools/latest && cd /usr/local/android-sdk-linux && \
33-
curl -L -O https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip && \
34-
unzip -qq commandlinetools-linux-8512546_latest.zip -d tmp && mv tmp/cmdline-tools/* cmdline-tools/latest && \
35-
rm -rf /usr/local/android-sdk-linux/commandlinetools-linux-8512546_latest.zip && \
33+
curl -L -O https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip && \
34+
unzip -qq commandlinetools-linux-13114758_latest.zip -d tmp && mv tmp/cmdline-tools/* cmdline-tools/latest && \
35+
rm -rf /usr/local/android-sdk-linux/commandlinetools-linux-13114758_latest.zip && \
3636
yes|/usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --licenses && \
3737
/usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --update && \
3838
/usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --list && \
3939
/usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager "platform-tools" \
4040
"ndk;25.0.8775105" \
4141
"extras;google;m2repository" \
4242
"extras;android;m2repository" \
43-
"platforms;android-33" \
43+
"platforms;android-36" \
4444
"emulator" \
4545
"build-tools;$ANDROID_BUILD_TOOLS_VERSION" \
4646
"add-ons;addon-google_apis-google-24" \

updatecli/updatecli.d/android.yaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
---
2+
name: Bump Android SDK components in android agent
3+
4+
scms:
5+
default:
6+
kind: github
7+
spec:
8+
user: "{{ .github.user }}"
9+
email: "{{ .github.email }}"
10+
owner: "{{ .github.owner }}"
11+
repository: "{{ .github.repository }}"
12+
token: "{{ requiredEnv .github.token }}"
13+
username: "{{ .github.username }}"
14+
branch: "{{ .github.branch }}"
15+
16+
sources:
17+
androidCommandLineTools:
18+
kind: shell
19+
spec:
20+
command: 'curl -sL https://developer.android.com/studio | grep -oP "commandlinetools-linux-\K\d+(?=_latest\.zip)" | head -1'
21+
environments:
22+
- name: PATH
23+
24+
androidBuildTools:
25+
kind: shell
26+
spec:
27+
command: 'curl -sL https://developer.android.com/tools/releases/build-tools | grep -oP "(\d+\.\d+\.\d+)" | grep "^35\." | head -1'
28+
environments:
29+
- name: PATH
30+
31+
conditions:
32+
33+
targets:
34+
androidCommandLineToolsURL:
35+
name: "[android-agent] Update command-line tools version in Dockerfile"
36+
kind: file
37+
spec:
38+
file: dockerfiles/android/Dockerfile
39+
matchpattern: 'commandlinetools-linux-(\d+)_latest\.zip'
40+
replacepattern: 'commandlinetools-linux-{{ source "androidCommandLineTools" }}_latest.zip'
41+
sourceid: androidCommandLineTools
42+
scmid: default
43+
44+
androidBuildToolsVersion:
45+
name: "[android-agent] Update build tools version in Dockerfile"
46+
kind: dockerfile
47+
spec:
48+
file: dockerfiles/android/Dockerfile
49+
instruction:
50+
keyword: "ARG"
51+
matcher: "ANDROID_BUILD_TOOLS_VERSION"
52+
sourceid: androidBuildTools
53+
scmid: default
54+
55+
actions:
56+
default:
57+
kind: github/pullrequest
58+
scmid: default
59+
title: '[Android] Bump Android SDK components to latest versions'
60+
spec:
61+
labels:
62+
- dependencies
63+
- android

0 commit comments

Comments
 (0)