Skip to content

Commit 0a243e1

Browse files
authored
PR #211: Adds openjdk-21-jdk @Warfront1
1 parent ff72e8a commit 0a243e1

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

.github/workflows/docker-image.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ jobs:
149149
150150
echo "Test jenv recognizes Java 17"
151151
docker run --rm ${{ env.IMAGE_NAME}}:${{ env.TAG}} bash -c 'jenv local 17 && java -version'
152+
153+
echo "Test jenv recognizes Java 21"
154+
docker run --rm ${{ env.IMAGE_NAME}}:${{ env.TAG}} bash -c 'jenv local 21 && java -version'
152155
153156
docker run -v `pwd`:/project --rm ${{ env.IMAGE_NAME}}:${{ env.TAG}} bash -c 'echo "Current directory: $PWD"'
154157

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Ignore settings for JetBrains IDEs (e.g., IntelliJ, PyCharm, WebStorm)
2+
.idea/

COMPATIBILITY.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ Note: 1.23.0 is *not* on Docker Hub.
77

88
## Installed Java Versions Matrix
99

10-
Java 8 (1.8), Java 11, and Java 17 are installed.
11-
12-
| docker-android-build-box version | Date released | Java default | 8 | 11 | 16 | 17 | 21 |
13-
|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
14-
| ≤1.19 | 2 July 2020<br> and earlier | 8 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
15-
| 1.20<br>-<br>1.22 | 7 August 2020<br>-<br>23 Aug 2021 | 8 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
16-
| 1.23.0 | 23 Sept 2021 | 11 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
17-
| 1.23.1 | 28 September 2021 | 11 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
18-
| 1.25.0 | 21 February 2023 | 17 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
10+
Java 8 (1.8), Java 11, Java 17, and Java 21 are installed.
11+
12+
| docker-android-build-box version | Date released | Java default | 8 | 11 | 16 | 17 | 21 |
13+
|:--------------------------------:|:---------------------------------:|:------------:|:-:|:-:|:-:|:-:|:-:|
14+
| ≤1.19 | 2 July 2020<br> and earlier | 8 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
15+
| 1.20<br>-<br>1.22 | 7 August 2020<br>-<br>23 Aug 2021 | 8 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
16+
| 1.23.0 | 23 Sept 2021 | 11 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
17+
| 1.23.1 | 28 September 2021 | 11 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
18+
| 1.25.0 | 21 February 2023 | 17 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
19+
| 1.29.0 | TBD | 21 |<!--8--> |<!--11--> |<!--16--> |<!--17--> |<!--21--> |
20+
1921

2022
## Android Platform SDK Versions Matrix
2123

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ RUN apt-get update -qq > /dev/null && \
123123
openjdk-8-jdk \
124124
openjdk-11-jdk \
125125
openjdk-17-jdk \
126+
openjdk-21-jdk \
126127
openssh-client \
127128
pkg-config \
128129
ruby-full \
@@ -208,8 +209,9 @@ RUN . ~/.bash_profile && \
208209
jenv add /usr/lib/jvm/java-8-openjdk-$JDK_PLATFORM && \
209210
jenv add /usr/lib/jvm/java-11-openjdk-$JDK_PLATFORM && \
210211
jenv add /usr/lib/jvm/java-17-openjdk-$JDK_PLATFORM && \
212+
jenv add /usr/lib/jvm/java-21-openjdk-$JDK_PLATFORM && \
211213
jenv versions && \
212-
jenv global 17.0 && \
214+
jenv global 21 && \
213215
java -version
214216

215217
#----------~~~~~~~~~~*****

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The last **tagged** release includes the following components:
2020
* 8 (1.8)
2121
* 11
2222
* 17
23+
* 21
2324
* Android SDKs for platforms:
2425
* 28
2526
* 29

0 commit comments

Comments
 (0)