Skip to content

Commit

Permalink
Merge pull request #17 from mottljan/feat/update-java-to-17
Browse files Browse the repository at this point in the history
⬆️  Update to Java 17
  • Loading branch information
beranm14 authored May 22, 2023
2 parents 8735c3e + eeef8a5 commit 755dade
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v1.4.0] - 2023-05-22
### Changed
- Update to Java 17

## [v1.3.2] - 2023-04-04
### Changed
- Update flutter version to 3.7.9
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ RUN apt-get update && apt-get install -y \

RUN curl -s "https://get.sdkman.io" | bash && \
source "$HOME/.sdkman/bin/sdkman-init.sh" && \
sdk install java 11.0.10-zulu && \
sdk use java 11.0.10-zulu
sdk install java 17.0.7-oracle && \
sdk use java 17.0.7-oracle

ENV JAVA_HOME /root/.sdkman/candidates/java/current
ENV ANDROID_HOME /opt/android-sdk-linux
Expand Down
2 changes: 1 addition & 1 deletion README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This Docker image serves as an environment for running Android builds on Gitlab CI in Ackee workspace.

Contains:
- Java 11 environment
- Java 17 environment
- NVM with default node version to 12.2.0
- Latest 8 Android version SDKs + Platform CLI tools
- gcloud CLI tool
Expand Down

0 comments on commit 755dade

Please sign in to comment.