Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds openjdk-21-jdk #211

Merged
merged 5 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ jobs:

echo "Test jenv recognizes Java 17"
docker run --rm ${{ env.IMAGE_NAME}}:${{ env.TAG}} bash -c 'jenv local 17 && java -version'

echo "Test jenv recognizes Java 21"
docker run --rm ${{ env.IMAGE_NAME}}:${{ env.TAG}} bash -c 'jenv local 21 && java -version'

docker run -v `pwd`:/project --rm ${{ env.IMAGE_NAME}}:${{ env.TAG}} bash -c 'echo "Current directory: $PWD"'

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore settings for JetBrains IDEs (e.g., IntelliJ, PyCharm, WebStorm)
.idea/
20 changes: 11 additions & 9 deletions COMPATIBILITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@ Note: 1.23.0 is *not* on Docker Hub.

## Installed Java Versions Matrix

Java 8 (1.8), Java 11, and Java 17 are installed.

| docker-android-build-box version | Date released | Java default | 8 | 11 | 16 | 17 | 21 |
|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
| ≤1.19 | 2 July 2020<br> and earlier | 8 | ✅<!--8--> | ❌<!--11--> | ❌<!--16--> | ❌<!--17--> | ❌<!--21--> |
| 1.20<br>-<br>1.22 | 7 August 2020<br>-<br>23 Aug 2021 | 8 | ✅<!--8--> | ✅<!--11--> | ❌<!--16--> | ❌<!--17--> | ❌<!--21--> |
| 1.23.0 | 23 Sept 2021 | 11 | ✅<!--8--> | ✅<!--11--> | ✅<!--16--> | ❌<!--17--> | ❌<!--21--> |
| 1.23.1 | 28 September 2021 | 11 | ✅<!--8--> | ✅<!--11--> | ❌<!--16--> | ❌<!--17--> | ❌<!--21--> |
| 1.25.0 | 21 February 2023 | 17 | ✅<!--8--> | ✅<!--11--> | ❌<!--16--> | ✅<!--17--> | ❌<!--21--> |
Java 8 (1.8), Java 11, Java 17, and Java 21 are installed.

| docker-android-build-box version | Date released | Java default | 8 | 11 | 16 | 17 | 21 |
|:--------------------------------:|:---------------------------------:|:------------:|:-:|:-:|:-:|:-:|:-:|
| ≤1.19 | 2 July 2020<br> and earlier | 8 | ✅<!--8--> | ❌<!--11--> | ❌<!--16--> | ❌<!--17--> | ❌<!--21--> |
| 1.20<br>-<br>1.22 | 7 August 2020<br>-<br>23 Aug 2021 | 8 | ✅<!--8--> | ✅<!--11--> | ❌<!--16--> | ❌<!--17--> | ❌<!--21--> |
| 1.23.0 | 23 Sept 2021 | 11 | ✅<!--8--> | ✅<!--11--> | ✅<!--16--> | ❌<!--17--> | ❌<!--21--> |
| 1.23.1 | 28 September 2021 | 11 | ✅<!--8--> | ✅<!--11--> | ❌<!--16--> | ❌<!--17--> | ❌<!--21--> |
| 1.25.0 | 21 February 2023 | 17 | ✅<!--8--> | ✅<!--11--> | ❌<!--16--> | ✅<!--17--> | ❌<!--21--> |
| 1.29.0 | TBD | 21 | ✅<!--8--> | ✅<!--11--> | ❌<!--16--> | ✅<!--17--> | ✅<!--21--> |


## Android Platform SDK Versions Matrix

Expand Down
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ RUN apt-get update -qq > /dev/null && \
openjdk-8-jdk \
openjdk-11-jdk \
openjdk-17-jdk \
openjdk-21-jdk \
openssh-client \
pkg-config \
ruby-full \
Expand Down Expand Up @@ -208,8 +209,9 @@ RUN . ~/.bash_profile && \
jenv add /usr/lib/jvm/java-8-openjdk-$JDK_PLATFORM && \
jenv add /usr/lib/jvm/java-11-openjdk-$JDK_PLATFORM && \
jenv add /usr/lib/jvm/java-17-openjdk-$JDK_PLATFORM && \
jenv add /usr/lib/jvm/java-21-openjdk-$JDK_PLATFORM && \
jenv versions && \
jenv global 17.0 && \
jenv global 21 && \
java -version

#----------~~~~~~~~~~*****
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ The last **tagged** release includes the following components:
* 8 (1.8)
* 11
* 17
* 21
* Android SDKs for platforms:
* 28
* 29
Expand Down