From 932f654b8bd37ef43aac4629f99efa03afbb02cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Salcedo=20Garc=C3=ADa?= Date: Sun, 10 Sep 2023 14:21:08 +0200 Subject: [PATCH] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add SSH package #26 * CommandLine Tools 9.0 ➡ 11.0 * Android SDK Platform-Tools 34.0.3 ➡ 34.0.4 --- .github/workflows/default.yaml | 9 ++++++--- README.md | 18 +++++++++--------- docker/base.Dockerfile | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index 55a961c..a6a618c 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -46,9 +46,12 @@ jobs: 8) CMDLINE_VERSION="8.0" SDK_TOOLS_VERSION="9123335" ;; - *) - CMDLINE_VERSION="9.0" - SDK_TOOLS_VERSION="9477386" ;; + 11) + CMDLINE_VERSION="10.0" + SDK_TOOLS_VERSION="9862592" ;; + 17) + CMDLINE_VERSION="11.0" + SDK_TOOLS_VERSION="10406996" ;; esac echo "CMDLINE_VERSION=${CMDLINE_VERSION}" >> $GITHUB_ENV echo "SDK_TOOLS_VERSION=${SDK_TOOLS_VERSION}" >> $GITHUB_ENV diff --git a/README.md b/README.md index e1df2a7..3dd63fe 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ A valid example would be `android-30-jdk11-v2021.01.01`. [Here](https://github.c |---------------------------|---------|-------------------------------------|----------------------------| | extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ | | patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ | -| platform-tools | 34.0.3 | Android SDK Platform-Tools | platform-tools/ | +| platform-tools | 34.0.4 | Android SDK Platform-Tools | platform-tools/ | ## Extend from Alpine Android Base @@ -113,7 +113,7 @@ RUN apk add --no-cache | build-tools;28.0.3 | 28.0.3 | Android SDK Build-Tools | build-tools/28.0.3/ | | extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ | | patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ | -| platform-tools | 34.0.3 | Android SDK Platform-Tools | platform-tools/ | +| platform-tools | 34.0.4 | Android SDK Platform-Tools | platform-tools/ | | platforms;android-28 | 6 | Android SDK Platform 28 | platforms/android-28/ | @@ -127,7 +127,7 @@ RUN apk add --no-cache | build-tools;29.0.3 | 29.0.3 | Android SDK Build-Tools | build-tools/29.0.3/ | | extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ | | patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ | -| platform-tools | 34.0.3 | Android SDK Platform-Tools | platform-tools/ | +| platform-tools | 34.0.4 | Android SDK Platform-Tools | platform-tools/ | | platforms;android-29 | 5 | Android SDK Platform 29 | platforms/android-29/ | @@ -141,7 +141,7 @@ RUN apk add --no-cache | build-tools;30.0.3 | 30.0.3 | Android SDK Build-Tools | build-tools/30.0.3/ | | extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ | | patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ | -| platform-tools | 34.0.3 | Android SDK Platform-Tools | platform-tools/ | +| platform-tools | 34.0.4 | Android SDK Platform-Tools | platform-tools/ | | platforms;android-30 | 3 | Android SDK Platform 30 | platforms/android-30/ | @@ -155,7 +155,7 @@ RUN apk add --no-cache | build-tools;31.0.0 | 31.0.0 | Android SDK Build-Tools | build-tools/31.0.0/ | | extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ | | patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ | -| platform-tools | 34.0.3 | Android SDK Platform-Tools | platform-tools/ | +| platform-tools | 34.0.4 | Android SDK Platform-Tools | platform-tools/ | | platforms;android-31 | 1 | Android SDK Platform 31 | platforms/android-31/ | @@ -169,7 +169,7 @@ RUN apk add --no-cache | build-tools;32.0.0 | 32.0.0 | Android SDK Build-Tools | build-tools/32.0.0/ | | extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ | | patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ | -| platform-tools | 34.0.3 | Android SDK Platform-Tools | platform-tools/ | +| platform-tools | 34.0.4 | Android SDK Platform-Tools | platform-tools/ | | platforms;android-32 | 1 | Android SDK Platform 32 | platforms/android-32/ | @@ -183,7 +183,7 @@ RUN apk add --no-cache | build-tools;33.0.2 | 33.0.2 | Android SDK Build-Tools | build-tools/33.0.2/ | | extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ | | patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ | -| platform-tools | 34.0.3 | Android SDK Platform-Tools | platform-tools/ | +| platform-tools | 34.0.4 | Android SDK Platform-Tools | platform-tools/ | | platforms;android-33 | 2 | Android SDK Platform 33 | platforms/android-33/ | @@ -198,8 +198,8 @@ RUN apk add --no-cache | build-tools;34.0.0 | 34.0.0 | Android SDK Build-Tools | build-tools/34.0.0/ | | extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ | | patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ | -| platform-tools | 34.0.3 | Android SDK Platform-Tools | platform-tools/ | -| platforms;android-34 | 1 | Android SDK Platform 34 | platforms/android-34/ | +| platform-tools | 34.0.4 | Android SDK Platform-Tools | platform-tools/ | +| platforms;android-34 | 2 | Android SDK Platform 34 | platforms/android-34/ | diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index e9b95bb..0f606f4 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -11,7 +11,7 @@ ENV ANDROID_HOME ${ANDROID_SDK_ROOT} ENV PATH $PATH:${ANDROID_SDK_ROOT}/cmdline-tools/${CMDLINE_VERSION}/bin:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/extras/google/instantapps RUN apk upgrade && \ - apk add --no-cache bash curl git unzip wget coreutils && \ + apk add --no-cache bash curl git unzip wget coreutils openssh-client && \ rm -rf /tmp/* && \ rm -rf /var/cache/apk/* && \ wget -q https://dl.google.com/android/repository/commandlinetools-linux-${SDK_TOOLS_VERSION}_latest.zip -O /tmp/tools.zip && \