Skip to content

Commit

Permalink
Add JDK 22 images
Browse files Browse the repository at this point in the history
  • Loading branch information
saschpe committed May 8, 2024
1 parent ab9051a commit 57bad37
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
strategy:
max-parallel: 3
matrix:
jdk: [ 17.0.10_7, 21.0.2_13 ]
jdk: [ 17.0.10_7, 21.0.2_13, 22.0.1_8 ]
android: [ 32, 33, 34 ]
ndk: [ 25.2.9519653, 26.2.11394342 ]
ndk: [ 25.2.9519653, 26.3.11579264 ]
cmake: [ 3.22.1 ]
steps:
- name: Checkout
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
#
# Build with custom arguments:
#
# $ ./scripts/build --android 34 --jdk 17.0.10_7 --ndk 25.2.9519653 --cmake 3.22.1
# $ ./scripts/build --android 34 --jdk 22.0.1_8 --ndk 25.2.9519653 --cmake 3.22.1
#

ARG jdk=17.0.10_7
ARG jdk=22.0.1_8
ARG android=34

FROM saschpe/android-sdk:${android}-jdk${jdk}
ARG cmake=3.22.1
ARG ndk=25.2.9519653
ARG ndk=26.2.11394342
LABEL maintainer="Sascha Peilicke <sascha@peilicke.de"
LABEL description="Android NDK ${ndk} with CMake ${cmake} on SDK ${android} using JDK ${jdk}"

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ Docker image `saschpe/android-sdk`.
The following JDK and Android SDK API level combinations are currently
available:

| | 11.0 | 17.0 | 21.0 |
|----|------|------|------|
| 31 | || |
| 32 | | | |
| 33 | | | |
| 34 | | | |
| | 11 | 17 | 21 | 22 |
|----|----|----|----|----|
| 31 ||| | |
| 32 |||| |
| 33 |||| |
| 34 |||| |

* Android NDK versions: __25.2.9519653__ and __26.2.11394342__
* CMake version: __3.22.1__
Expand Down

0 comments on commit 57bad37

Please sign in to comment.