Skip to content

Commit c68aa9d

Browse files
alvralvr
committed
Update
* CommandLine Tools 19.0 → 20.0 * Android SDK Platform-Tools 35.0.2 → 36.0.2 * Default Android API 35 → 36 * Build Tools 33.0.2 → 33.0.3 * Build Tools 36.0.0 → 36.1.0 * NDK 29.0.13113456 → 29.0.14206865 * CMAKE 3.31.6 → 4.1.2 * JDK 8u422-6 → 8u462 * JDK 11.0.24-9 → 11.0.28 * JDK 17.0.12-10 → 17.0.16 * JDK 21.0.4+9 → 21.0.8
1 parent e9b9a82 commit c68aa9d

5 files changed

Lines changed: 30 additions & 31 deletions

File tree

‎.github/workflows/default.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
QUAY_USER: alvr
2323

2424
DEFAULT_JDK_VERSION: 17
25-
LATEST_STABLE_API: 35
25+
LATEST_STABLE_API: 36
2626

2727
jobs:
2828
build_base_images:
@@ -49,8 +49,8 @@ jobs:
4949
CMDLINE_VERSION="10.0"
5050
SDK_TOOLS_VERSION="9862592" ;;
5151
*)
52-
CMDLINE_VERSION="19.0"
53-
SDK_TOOLS_VERSION="13114758" ;;
52+
CMDLINE_VERSION="20.0"
53+
SDK_TOOLS_VERSION="14742923" ;;
5454
esac
5555
echo "CMDLINE_VERSION=${CMDLINE_VERSION}" >> $GITHUB_ENV
5656
echo "SDK_TOOLS_VERSION=${SDK_TOOLS_VERSION}" >> $GITHUB_ENV
@@ -129,10 +129,10 @@ jobs:
129129
30) BUILD_TOOLS_VERSION="30.0.3" ;;
130130
31) BUILD_TOOLS_VERSION="31.0.0" ;;
131131
32) BUILD_TOOLS_VERSION="32.0.0" ;;
132-
33) BUILD_TOOLS_VERSION="33.0.2" ;;
132+
33) BUILD_TOOLS_VERSION="33.0.3" ;;
133133
34) BUILD_TOOLS_VERSION="34.0.0" ;;
134134
35) BUILD_TOOLS_VERSION="35.0.1" ;;
135-
36) BUILD_TOOLS_VERSION="36.0.0" ;;
135+
36) BUILD_TOOLS_VERSION="36.1.0" ;;
136136
*)
137137
echo "Unsupported Android API version: ${{ matrix.android-api }}"
138138
exit 1 ;;

‎README.md‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131

3232
## Variants
3333

34-
There are three variants of the image, all based on `bellsoft/liberica-openjdk-alpine`:
34+
There are four variants of the image, all based on `bellsoft/liberica-openjdk-alpine`:
3535

36-
* JDK8 images are based on Liberica JDK 8u422-6 and uses the tag's suffix `-jdk8`.
37-
* JDK11 images are based on Liberica JDK 11.0.24-9 and uses the tag's suffix `-jdk11`.
38-
* JDK17 images are based on Liberica JDK 17.0.12-10 and uses the tag's suffix `-jdk17`.
39-
* JDK21 images are based on Liberica JDK 21.0.4+9 and uses the tag's suffix `-jdk21`.
36+
* JDK8 images are based on Liberica JDK 8u462 and uses the tag's suffix `-jdk8`.
37+
* JDK11 images are based on Liberica JDK 11.0.28 and uses the tag's suffix `-jdk11`.
38+
* JDK17 images are based on Liberica JDK 17.0.16 and uses the tag's suffix `-jdk17`.
39+
* JDK21 images are based on Liberica JDK 21.0.8 and uses the tag's suffix `-jdk21`.
4040

4141
### Which one should I use?
4242

@@ -59,8 +59,8 @@ There are three variants of the image, all based on `bellsoft/liberica-openjdk-a
5959
| Android 12L (32) | `android-32-jdk8` | `android-32`, `android-32-jdk11` | `android-32-jdk17` | `android-32-jdk21` |
6060
| Android 13 (33) | `android-33-jdk8` | `android-33`, `android-33-jdk11` | `android-33-jdk17` | `android-33-jdk21` |
6161
| Android 14 (34) | `android-34-jdk8` | `android-34`, `android-34-jdk11` | `android-34-jdk17` | `android-34-jdk21` |
62-
| Android 15 (35) | `android-35-jdk8`, `latest-jdk8` | `android-35`, `android-35-jdk11`, `latest-jdk11` | `android-35-jdk17`, `latest`, `latest-jdk17` | `android-35-jdk21`, `latest-jdk21` |
63-
| Android 16 (36) | `android-36-jdk8` | `android-36`, `android-36-jdk11` | `android-36-jdk17` | `android-36-jdk21` |
62+
| Android 15 (35) | `android-35-jdk8` | `android-35`, `android-35-jdk11` | `android-35-jdk17` | `android-35-jdk21` |
63+
| Android 16 (36) | `android-36-jdk8`, `latest-jdk8` | `android-36`, `android-36-jdk11`, `latest-jdk11` | `android-36-jdk17`, `latest`, `latest-jdk17` | `android-36-jdk21`, `latest-jdk21` |
6464

6565
### Versioning
6666

@@ -87,7 +87,7 @@ A valid example would be `android-30-jdk11-v2021.01.01`. [Here](https://github.c
8787
|---------------------------|---------|-------------------------------------|----------------------------|
8888
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
8989
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
90-
| platform-tools | 35.0.2 | Android SDK Platform-Tools | platform-tools/ |
90+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
9191

9292
## Extend from Alpine Android Base
9393

@@ -115,7 +115,7 @@ RUN apk add --no-cache <list-of-packages>
115115
| build-tools;28.0.3 | 28.0.3 | Android SDK Build-Tools | build-tools/28.0.3/ |
116116
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
117117
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
118-
| platform-tools | 35.0.2 | Android SDK Platform-Tools | platform-tools/ |
118+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
119119
| platforms;android-28 | 6 | Android SDK Platform 28 | platforms/android-28/ |
120120
</details>
121121

@@ -129,7 +129,7 @@ RUN apk add --no-cache <list-of-packages>
129129
| build-tools;29.0.3 | 29.0.3 | Android SDK Build-Tools | build-tools/29.0.3/ |
130130
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
131131
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
132-
| platform-tools | 35.0.2 | Android SDK Platform-Tools | platform-tools/ |
132+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
133133
| platforms;android-29 | 5 | Android SDK Platform 29 | platforms/android-29/ |
134134
</details>
135135

@@ -143,7 +143,7 @@ RUN apk add --no-cache <list-of-packages>
143143
| build-tools;30.0.3 | 30.0.3 | Android SDK Build-Tools | build-tools/30.0.3/ |
144144
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
145145
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
146-
| platform-tools | 35.0.2 | Android SDK Platform-Tools | platform-tools/ |
146+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
147147
| platforms;android-30 | 3 | Android SDK Platform 30 | platforms/android-30/ |
148148
</details>
149149

@@ -157,7 +157,7 @@ RUN apk add --no-cache <list-of-packages>
157157
| build-tools;31.0.0 | 31.0.0 | Android SDK Build-Tools | build-tools/31.0.0/ |
158158
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
159159
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
160-
| platform-tools | 35.0.2 | Android SDK Platform-Tools | platform-tools/ |
160+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
161161
| platforms;android-31 | 1 | Android SDK Platform 31 | platforms/android-31/ |
162162
</details>
163163

@@ -171,7 +171,7 @@ RUN apk add --no-cache <list-of-packages>
171171
| build-tools;32.0.0 | 32.0.0 | Android SDK Build-Tools | build-tools/32.0.0/ |
172172
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
173173
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
174-
| platform-tools | 35.0.2 | Android SDK Platform-Tools | platform-tools/ |
174+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
175175
| platforms;android-32 | 1 | Android SDK Platform 32 | platforms/android-32/ |
176176
</details>
177177

@@ -182,10 +182,10 @@ RUN apk add --no-cache <list-of-packages>
182182

183183
| Path | Version | Description | Location |
184184
|---------------------------|---------|-------------------------------------|----------------------------|
185-
| build-tools;33.0.2 | 33.0.3 | Android SDK Build-Tools | build-tools/33.0.3/ |
185+
| build-tools;33.0.3 | 33.0.3 | Android SDK Build-Tools | build-tools/33.0.3/ |
186186
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
187187
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
188-
| platform-tools | 35.0.2 | Android SDK Platform-Tools | platform-tools/ |
188+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
189189
| platforms;android-33 | 2 | Android SDK Platform 33 | platforms/android-33/ |
190190

191191
</details>
@@ -200,7 +200,7 @@ RUN apk add --no-cache <list-of-packages>
200200
| build-tools;34.0.0 | 34.0.0 | Android SDK Build-Tools | build-tools/34.0.0/ |
201201
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
202202
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
203-
| platform-tools | 35.0.2 | Android SDK Platform-Tools | platform-tools/ |
203+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
204204
| platforms;android-34 | 3 | Android SDK Platform 34 | platforms/android-34/ |
205205

206206
</details>
@@ -215,7 +215,7 @@ RUN apk add --no-cache <list-of-packages>
215215
| build-tools;35.0.1 | 35.0.1 | Android SDK Build-Tools | build-tools/35.0.1/ |
216216
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
217217
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
218-
| platform-tools | 35.0.2 | Android SDK Platform-Tools | platform-tools/ |
218+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
219219
| platforms;android-35 | 2 | Android SDK Platform 35 | platforms/android-35/ |
220220

221221
</details>
@@ -227,11 +227,11 @@ RUN apk add --no-cache <list-of-packages>
227227

228228
| Path | Version | Description | Location |
229229
|---------------------------|------------|-------------------------------------|----------------------------|
230-
| build-tools;36.0.0 | 36.0.0 | Android SDK Build-Tools | build-tools/36.0.0/ |
230+
| build-tools;36.1.0 | 36.1.0 | Android SDK Build-Tools | build-tools/36.1.0/ |
231231
| extras;google;instantapps | 1.9.0 | Google Play Instant Development SDK | extras/google/instantapps/ |
232232
| patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ |
233-
| platform-tools | 36.0.0 | Android SDK Platform-Tools | platform-tools/ |
234-
| platforms;android-36 | 1 | Android SDK Platform 36 | platforms/android-36/ |
233+
| platform-tools | 36.0.2 | Android SDK Platform-Tools | platform-tools/ |
234+
| platforms;android-36 | 2 | Android SDK Platform 36 | platforms/android-36/ |
235235

236236
</details>
237237

@@ -391,7 +391,7 @@ extras fastlane <version>
391391

392392
The [Android NDK](https://developer.android.com/ndk) is a toolset that lets you implement parts of your app in native code, using languages such as C and C++. For certain types of apps, this can help you reuse code libraries written in those languages.
393393

394-
This command allows you to install NDK and CMAKE using the latest versions available (NDK: `26.1.10909125`; CMAKE: `3.22.1`):
394+
This command allows you to install NDK and CMAKE using the latest versions available (NDK: `29.0.14206865`; CMAKE: `4.1.2`):
395395

396396
```bash
397397
extras ndk

‎docker/android.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG JDK_VERSION
22

3-
FROM alvrme/alpine-android-base:jdk${JDK_VERSION}
3+
FROM ghcr.io/alvr/alpine-android-base:jdk${JDK_VERSION}
44
LABEL maintainer="Álvaro Salcedo García <alvaro@alvr.dev>"
55

66
ARG BUILD_TOOLS

‎docker/base.Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ COPY ./extras /bin
2727

2828
WORKDIR /home/android
2929

30-
31-
CMD ["/bin/bash"]
30+
CMD ["/bin/bash"]

‎docker/extras‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -e
44

5-
DEFAULT_NDK=29.0.13113456
6-
DEFAULT_CMAKE=3.31.6
5+
DEFAULT_NDK=29.0.14206865
6+
DEFAULT_CMAKE=4.1.2
77

88
install_fastlane() {
99
VERSION=$2

0 commit comments

Comments
 (0)