Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history 
* Add SSH package #26
* CommandLine Tools 9.0 ➡ 11.0
* Android SDK Platform-Tools 34.0.3 ➡ 34.0.4
  • Loading branch information
@alvr
alvr committed Sep 10, 2023
1 parent 7497285 commit 932f654
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -113,7 +113,7 @@ RUN apk add --no-cache <list-of-packages>
| 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/ |
</details>

Expand All @@ -127,7 +127,7 @@ RUN apk add --no-cache <list-of-packages>
| 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/ |
</details>

Expand All @@ -141,7 +141,7 @@ RUN apk add --no-cache <list-of-packages>
| 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/ |
</details>

Expand All @@ -155,7 +155,7 @@ RUN apk add --no-cache <list-of-packages>
| 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/ |
</details>

Expand All @@ -169,7 +169,7 @@ RUN apk add --no-cache <list-of-packages>
| 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/ |
</details>

Expand All @@ -183,7 +183,7 @@ RUN apk add --no-cache <list-of-packages>
| 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/ |

</details>
Expand All @@ -198,8 +198,8 @@ RUN apk add --no-cache <list-of-packages>
| 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/ |

</details>

Expand Down
2 changes: 1 addition & 1 deletion docker/base.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down

0 comments on commit 932f654

Please sign in to comment.