Bump SDK version to 6858069

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,20 @@
+---
+name: Bug
+about: Report a bug
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+### Describe the problem
+
+(Give a concise description of the problem)
+
+### Steps to reproduce
+
+1. (Detail every step)
+
+### Screenshots or logs
+
+(Attach logs as GitHub Gists)

.github/workflows/bump_sdk.yml

@@ -0,0 +1,15 @@
+name: Bump Android SDK version
+
+on:
+  schedule:
+  - cron: "12 0 * * *"
+
+jobs:
+  bump_caddy:
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: actions/checkout@v2
+
+    - name: Bump and commit
+      run: ./bump-sdk-version

Dockerfile

@@ -3,9 +3,9 @@
 FROM ubuntu:18.04
 
 # SDK version
-ENV ANDROID_SDK_VERSION 4333796
-ENV PLATFORM_VERSION 28
-ENV BUILD_TOOLS_VERSION 28.0.3
+ENV ANDROID_SDK_VERSION 6858069
+ENV PLATFORM_VERSION 29
+ENV BUILD_TOOLS_VERSION 29.0.3
 
 # Never ask for confirmations
 ENV DEBIAN_FRONTEND noninteractive
@@ -27,10 +27,10 @@ RUN apt-get -qq update \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Android SDK
-RUN wget https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_SDK_VERSION.zip -q \
+RUN wget https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip -q \
   && mkdir /usr/local/android \
-  && unzip -q sdk-tools-linux-$ANDROID_SDK_VERSION.zip -d /usr/local/android \
-  && rm sdk-tools-linux-$ANDROID_SDK_VERSION.zip
+  && unzip -q commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip -d /usr/local/android \
+  && rm commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip
 
 # Export JAVA_HOME variable
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64

README.md

@@ -3,6 +3,8 @@
 
 Docker image to build Android apps.
 
+> For something more robust, see [thyrlian/AndroidSDK](https://github.com/thyrlian/AndroidSDK)
+
 # Usage
 
 ```

bump-sdk-version

@@ -2,7 +2,7 @@
 
 echo "+ Scraping SDK website for version number"
 
-ANDROID_SDK_VERSION=$(curl --silent https://developer.android.com/studio/ | grep -m 1 -o 'sdk-tools-linux-\d*' | cut -f 4 -d -)
+ANDROID_SDK_VERSION=$(curl --silent https://developer.android.com/studio/ | grep -m 1 -oE 'commandlinetools-linux-[0-9]+' | cut -d - -f 3)
 if [ -z "$ANDROID_SDK_VERSION" ]; then
     echo "Version not found"
     exit 1
@@ -11,7 +11,7 @@ echo "+ Found version $ANDROID_SDK_VERSION"
 
 echo "+ Scraping Android repository-12.xml for build tools"
 
-BUILD_TOOLS_VERSION=$(curl --silent https://dl.google.com/android/repository/repository-12.xml | grep -o "build-tools_r\d*\.\d*\.\d*" | cut -f 2 -d r | sort -r | head -n 1)
+BUILD_TOOLS_VERSION=$(curl --silent https://dl.google.com/android/repository/repository-12.xml | grep -oE "build-tools_r[0-9]+\.[0-9]+\.[0-9]+" | cut -f 2 -d r | sort -r | head -n 1)
 if [ -z "$BUILD_TOOLS_VERSION" ]; then
     echo "Version not found"
     exit 1
@@ -23,19 +23,19 @@ echo "+ Assuming platform version $PLATFORM_VERSION"
 
 echo "+ Replacing ANDROID_SDK_VERSION in Dockerfile"
 
-sed -i '' "s/ENV ANDROID_SDK_VERSION .*/ENV ANDROID_SDK_VERSION $ANDROID_SDK_VERSION/" \
+sed -i "s/ENV ANDROID_SDK_VERSION .*/ENV ANDROID_SDK_VERSION $ANDROID_SDK_VERSION/" \
     Dockerfile \
     ndk/Dockerfile
 
 echo "+ Replacing BUILD_TOOLS_VERSION in Dockerfile"
 
-sed -i '' "s/ENV BUILD_TOOLS_VERSION .*/ENV BUILD_TOOLS_VERSION $BUILD_TOOLS_VERSION/" \
+sed -i "s/ENV BUILD_TOOLS_VERSION .*/ENV BUILD_TOOLS_VERSION $BUILD_TOOLS_VERSION/" \
     Dockerfile \
     ndk/Dockerfile
 
 echo "+ Replacing PLATFORM_VERSION in Dockerfile"
 
-sed -i '' "s/ENV PLATFORM_VERSION .*/ENV PLATFORM_VERSION $PLATFORM_VERSION/" \
+sed -i "s/ENV PLATFORM_VERSION .*/ENV PLATFORM_VERSION $PLATFORM_VERSION/" \
     Dockerfile \
     ndk/Dockerfile
 
@@ -43,17 +43,27 @@ echo "+ Done!"
 
 echo
 
+echo "+ Adding changed files"
+
+git config user.name "${GITHUB_ACTOR}"
+git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+git add Dockerfile ndk/Dockerfile
+
+if output=$(git status --porcelain) && [ ! -z "$output" ]; then
+
 echo "+ Committing"
 
-git commit -a -m "Bump SDK version to $ANDROID_SDK_VERSION"
+git commit -m "Bump SDK version to $ANDROID_SDK_VERSION"
 
 echo "+ Tagging"
 
-git tag $ANDROID_SDK_VERSION
+git tag -f $ANDROID_SDK_VERSION
 
 echo "+ Pushing"
 
-git push
-git push --tags
+git push -f
+git push --tags -f
 
 echo "+ Done!"
+
+fi

ndk/Dockerfile

@@ -3,9 +3,9 @@
 FROM ubuntu:18.04
 
 # SDK version
-ENV ANDROID_SDK_VERSION 4333796
-ENV PLATFORM_VERSION 28
-ENV BUILD_TOOLS_VERSION 28.0.3
+ENV ANDROID_SDK_VERSION 6858069
+ENV PLATFORM_VERSION 29
+ENV BUILD_TOOLS_VERSION 29.0.3
 
 # Never ask for confirmations
 ENV DEBIAN_FRONTEND noninteractive
@@ -27,10 +27,10 @@ RUN apt-get -qq update \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Android SDK
-RUN wget https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_SDK_VERSION.zip -q \
+RUN wget https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip -q \
   && mkdir /usr/local/android \
-  && unzip -q sdk-tools-linux-$ANDROID_SDK_VERSION.zip -d /usr/local/android \
-  && rm sdk-tools-linux-$ANDROID_SDK_VERSION.zip
+  && unzip -q commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip -d /usr/local/android \
+  && rm commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip
 
 # Export JAVA_HOME variable
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64