Skip to content

Commit

Permalink
ci: bump java langauge version to 11
Browse files Browse the repository at this point in the history
  • Loading branch information
scarf005 committed Apr 24, 2023
1 parent d1c0dbe commit f24a9a0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
with:
fetch-depth: 1

- name: Set up JDK 8 (android)
- name: Set up JDK 11 (android)
uses: actions/setup-java@v3
with:
java-version: "8"
java-version: "11"
distribution: "adopt"

- name: Setup build and dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,11 @@ jobs:
run: |
make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=11 PCH=0 dmgdist COMPILER=clang++
mv CataclysmBN-${{ inputs.version }}.dmg cbn-${{ matrix.artifact }}-${{ inputs.version }}.dmg
- name: Set up JDK 8 (android)
- name: Set up JDK 11 (android)
if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
uses: actions/setup-java@v3
with:
java-version: "8"
java-version: "11"
distribution: "adopt"
- name: Setup Build and Dependencies (android)
if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,11 @@ jobs:
run: |
make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=11 PCH=0 dmgdist COMPILER=clang++
mv CataclysmBN-unstable.dmg cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
- name: Set up JDK 8 (android)
- name: Set up JDK 11 (android)
if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
uses: actions/setup-java@v3
with:
java-version: "8"
java-version: "11"
distribution: "adopt"
- name: Setup Build and Dependencies (android)
if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
Expand Down
2 changes: 1 addition & 1 deletion doc/COMPILING/COMPILING.md
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ The Gradle project lives in the repository under `android/`. You can build it vi

### Dependencies

* Java JDK 8
* Java JDK 11
* SDL2 (tested with 2.0.8, though a custom fork is recommended with project-specific bugfixes)
* SDL2_ttf (tested with 2.0.14)
* SDL2_mixer (tested with 2.0.2)
Expand Down

0 comments on commit f24a9a0

Please sign in to comment.