Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
* Android SDK Platform-Tools: 31.0.0 β†’ 31.0.1

* Android SDK Platform 31: Revision 1 β†’ Revision 2
* Android SDK Platform-Tools: 31.0.0-rc1 β†’ 31.0.0-rc2
  • Loading branch information
alvr committed Mar 17, 2021
1 parent b94db1c commit 73ab506
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 29 deletions.
16 changes: 1 addition & 15 deletions .github/workflows/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,6 @@ jobs:
build-args: |
JDK_VERSION=${{ matrix.jdk }}
- name: Update repo description
uses: peter-evans/dockerhub-description@v2
with:
username: ${{ env.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASS }}
repository: ${{ env.DH_IMAGE_BASE_NAME }}

build_images:
name: Build Alpine Android Image
needs: [build_base_images]
Expand Down Expand Up @@ -147,7 +140,7 @@ jobs:
28) BUILD_TOOLS_VERSION="28.0.3" ;;
29) BUILD_TOOLS_VERSION="29.0.3" ;;
30) BUILD_TOOLS_VERSION="30.0.3" ;;
S) BUILD_TOOLS_VERSION="31.0.0-rc1" ;;
S) BUILD_TOOLS_VERSION="31.0.0-rc2" ;;
esac
echo "BUILD_TOOLS_VERSION=$BUILD_TOOLS_VERSION" >> $GITHUB_ENV
Expand Down Expand Up @@ -197,10 +190,3 @@ jobs:
JDK_VERSION=${{ matrix.jdk }}
BUILD_TOOLS=${{ env.BUILD_TOOLS_VERSION }}
TARGET_SDK=${{ matrix.android-api }}
- name: Update repo description
uses: peter-evans/dockerhub-description@v2
with:
username: ${{ env.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASS }}
repository: ${{ env.DH_IMAGE_NAME }}
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |

## Extend from Alpine Android Base

Expand Down Expand Up @@ -130,7 +130,7 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;21.1.2 | 21.1.2 | Android SDK Build-Tools | build-tools/21.1.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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-21 | 2 | Android SDK Platform 21 | platforms/android-21/ |
</details>

Expand All @@ -146,7 +146,7 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;22.0.1 | 22.0.1 | Android SDK Build-Tools | build-tools/22.0.1/ |
| 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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-22 | 2 | Android SDK Platform 22 | platforms/android-22/ |
</details>

Expand All @@ -162,7 +162,7 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;23.0.3 | 23.0.3 | Android SDK Build-Tools | build-tools/23.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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-23 | 3 | Android SDK Platform 23 | platforms/android-23/ |
</details>

Expand All @@ -178,7 +178,7 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;24.0.3 | 24.0.3 | Android SDK Build-Tools | build-tools/24.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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-24 | 2 | Android SDK Platform 24 | platforms/android-24/ |
</details>

Expand All @@ -194,7 +194,7 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;25.0.3 | 25.0.3 | Android SDK Build-Tools | build-tools/25.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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-25 | 3 | Android SDK Platform 25 | platforms/android-25/ |
</details>

Expand All @@ -210,7 +210,7 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;26.0.3 | 26.0.3 | Android SDK Build-Tools | build-tools/26.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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-26 | 2 | Android SDK Platform 26 | platforms/android-26/ |
</details>

Expand All @@ -226,7 +226,7 @@ RUN apk add --no-cache <list-of-packages>
| build-tools;27.0.3 | 27.0.3 | Android SDK Build-Tools | build-tools/27.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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-27 | 3 | Android SDK Platform 27 | platforms/android-27/ |
</details>

Expand All @@ -242,7 +242,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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-28 | 6 | Android SDK Platform 28 | platforms/android-28/ |
</details>

Expand All @@ -258,7 +258,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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-29 | 5 | Android SDK Platform 29 | platforms/android-29/ |
</details>

Expand All @@ -274,7 +274,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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-30 | 3 | Android SDK Platform 30 | platforms/android-30/ |
</details>

Expand All @@ -287,11 +287,11 @@ RUN apk add --no-cache <list-of-packages>

| Path | Version | Description | Location |
|-----------------------------|------------|-------------------------------------|------------------------------|
| build-tools;31.0.0-rc1 | 31.0.0-rc1 | Android SDK Build-Tools | build-tools/31.0.0-rc1/ |
| build-tools;31.0.0-rc1 | 31.0.0-rc2 | Android SDK Build-Tools | build-tools/31.0.0-rc1/ |
| 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 | 31.0.0 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-S | 1 | Android SDK Platform S (Preview) | platforms/android-S/ |
| platform-tools | 31.0.1 | Android SDK Platform-Tools | platform-tools/ |
| platforms;android-S | 2 | Android SDK Platform S (Preview) | platforms/android-S/ |
</details>

## Containers registries
Expand Down

0 comments on commit 73ab506

Please sign in to comment.