Skip to content

Commit b1b1702

Browse files
committed
android build: bump targetSdkVersion to 30
This is the new minimum the google play store requires. note: the newer android command-line tools use a tiny bit different paths, hence the `mv "${ANDROID_SDK_HOME}/cmdline-tools" "${ANDROID_SDK_HOME}/tools"` rename see kivy/python-for-android#2540
1 parent 841a701 commit b1b1702

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

contrib/android/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ RUN curl --location --progress-bar \
4242
ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
4343

4444
# get the latest version from https://developer.android.com/studio/index.html
45-
ENV ANDROID_SDK_TOOLS_VERSION="6514223"
46-
ENV ANDROID_SDK_BUILD_TOOLS_VERSION="29.0.3"
47-
ENV ANDROID_SDK_HASH="ef319a5afdb41822cb1c88d93bc7c23b0af4fc670abca89ff0346ee6688da797"
45+
ENV ANDROID_SDK_TOOLS_VERSION="8092744"
46+
ENV ANDROID_SDK_BUILD_TOOLS_VERSION="30.0.3"
47+
ENV ANDROID_SDK_HASH="d71f75333d79c9c6ef5c39d3456c6c58c613de30e6a751ea0dbd433e8f8b9cbf"
4848
ENV ANDROID_SDK_TOOLS_ARCHIVE="commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip"
4949
ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
5050
ENV ANDROID_SDK_MANAGER="${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME}"
@@ -56,6 +56,7 @@ RUN curl --location --progress-bar \
5656
&& echo "${ANDROID_SDK_HASH} ${ANDROID_SDK_TOOLS_ARCHIVE}" | sha256sum -c - \
5757
&& mkdir --parents "${ANDROID_SDK_HOME}" \
5858
&& unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" \
59+
&& mv "${ANDROID_SDK_HOME}/cmdline-tools" "${ANDROID_SDK_HOME}/tools" \
5960
&& rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}"
6061

6162
# update Android SDK, install Android API, Build Tools...
@@ -71,8 +72,7 @@ RUN apt -y update -qq \
7172
RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null
7273

7374
# download platforms, API, build tools
74-
RUN ${ANDROID_SDK_MANAGER} "platforms;android-24" > /dev/null && \
75-
${ANDROID_SDK_MANAGER} "platforms;android-29" > /dev/null && \
75+
RUN ${ANDROID_SDK_MANAGER} "platforms;android-30" > /dev/null && \
7676
${ANDROID_SDK_MANAGER} "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" > /dev/null && \
7777
${ANDROID_SDK_MANAGER} "extras;android;m2repository" > /dev/null && \
7878
chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"

contrib/android/buildozer_kivy.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ android.permissions = INTERNET, CAMERA, WRITE_EXTERNAL_STORAGE
7575

7676
# (int) Android API to use (targetSdkVersion AND compileSdkVersion)
7777
# note: when changing, Dockerfile also needs to be changed to install corresponding build tools
78-
android.api = 29
78+
android.api = 30
7979

8080
# (int) Minimum API required. You will need to set the android.ndk_api to be as low as this value.
8181
android.minapi = 21

contrib/android/buildozer_qml.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ android.permissions = INTERNET, CAMERA, WRITE_EXTERNAL_STORAGE
7777

7878
# (int) Android API to use (targetSdkVersion AND compileSdkVersion)
7979
# note: when changing, Dockerfile also needs to be changed to install corresponding build tools
80-
android.api = 29
80+
android.api = 30
8181

8282
# (int) Minimum API required. You will need to set the android.ndk_api to be as low as this value.
8383
android.minapi = 21

0 commit comments

Comments
 (0)