diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile index 2ae130dd8..8e56fd2b2 100644 --- a/contrib/android/Dockerfile +++ b/contrib/android/Dockerfile @@ -42,9 +42,9 @@ RUN curl --location --progress-bar \ ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk" # get the latest version from https://developer.android.com/studio/index.html -ENV ANDROID_SDK_TOOLS_VERSION="6514223" -ENV ANDROID_SDK_BUILD_TOOLS_VERSION="29.0.3" -ENV ANDROID_SDK_HASH="ef319a5afdb41822cb1c88d93bc7c23b0af4fc670abca89ff0346ee6688da797" +ENV ANDROID_SDK_TOOLS_VERSION="8092744" +ENV ANDROID_SDK_BUILD_TOOLS_VERSION="30.0.3" +ENV ANDROID_SDK_HASH="d71f75333d79c9c6ef5c39d3456c6c58c613de30e6a751ea0dbd433e8f8b9cbf" ENV ANDROID_SDK_TOOLS_ARCHIVE="commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip" ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}" ENV ANDROID_SDK_MANAGER="${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME}" @@ -56,6 +56,7 @@ RUN curl --location --progress-bar \ && echo "${ANDROID_SDK_HASH} ${ANDROID_SDK_TOOLS_ARCHIVE}" | sha256sum -c - \ && mkdir --parents "${ANDROID_SDK_HOME}" \ && unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" \ + && mv "${ANDROID_SDK_HOME}/cmdline-tools" "${ANDROID_SDK_HOME}/tools" \ && rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}" # update Android SDK, install Android API, Build Tools... @@ -71,8 +72,7 @@ RUN apt -y update -qq \ RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null # download platforms, API, build tools -RUN ${ANDROID_SDK_MANAGER} "platforms;android-24" > /dev/null && \ - ${ANDROID_SDK_MANAGER} "platforms;android-29" > /dev/null && \ +RUN ${ANDROID_SDK_MANAGER} "platforms;android-30" > /dev/null && \ ${ANDROID_SDK_MANAGER} "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" > /dev/null && \ ${ANDROID_SDK_MANAGER} "extras;android;m2repository" > /dev/null && \ chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager" diff --git a/contrib/android/buildozer_kivy.spec b/contrib/android/buildozer_kivy.spec index aadb5c5b5..f5eb6198e 100644 --- a/contrib/android/buildozer_kivy.spec +++ b/contrib/android/buildozer_kivy.spec @@ -75,7 +75,7 @@ android.permissions = INTERNET, CAMERA, WRITE_EXTERNAL_STORAGE # (int) Android API to use (targetSdkVersion AND compileSdkVersion) # note: when changing, Dockerfile also needs to be changed to install corresponding build tools -android.api = 29 +android.api = 30 # (int) Minimum API required. You will need to set the android.ndk_api to be as low as this value. android.minapi = 21 diff --git a/contrib/android/buildozer_qml.spec b/contrib/android/buildozer_qml.spec index e12b75a69..ee6b7eca8 100644 --- a/contrib/android/buildozer_qml.spec +++ b/contrib/android/buildozer_qml.spec @@ -77,7 +77,7 @@ android.permissions = INTERNET, CAMERA, WRITE_EXTERNAL_STORAGE # (int) Android API to use (targetSdkVersion AND compileSdkVersion) # note: when changing, Dockerfile also needs to be changed to install corresponding build tools -android.api = 29 +android.api = 30 # (int) Minimum API required. You will need to set the android.ndk_api to be as low as this value. android.minapi = 21