Update Java to Java 17

This commit is contained in:
Syer10
2022-05-07 14:18:54 -04:00
parent 69add4a4a1
commit 02d69758b8
6 changed files with 11 additions and 11 deletions

View File

@@ -64,7 +64,7 @@ jobs:
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
if: ${{ matrix.runtime != 'linux-fedora-x64' }} if: ${{ matrix.runtime != 'linux-fedora-x64' }}
with: with:
java-version: '16' java-version: '17'
architecture: ${{ matrix.arch }} architecture: ${{ matrix.arch }}
- name: Setup Cl - name: Setup Cl
@@ -79,7 +79,7 @@ jobs:
- name: Build rpm Package - name: Build rpm Package
if: ${{ matrix.runtime == 'linux-fedora-x64' }} if: ${{ matrix.runtime == 'linux-fedora-x64' }}
uses: Syer10/Fedora-Java16-Action@v1 uses: Syer10/Fedora-Java17-Action@v1
with: with:
command: ./gradlew ${{ matrix.build }} --stacktrace command: ./gradlew ${{ matrix.build }} --stacktrace
@@ -137,7 +137,7 @@ jobs:
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
- name: Fix rpm java dependency - name: Fix rpm java dependency
uses: Syer10/Fedora-Java16-Action@v1 uses: Syer10/Fedora-Java17-Action@v1
with: with:
command: ./scripts/RpmDependencyFix.sh command: ./scripts/RpmDependencyFix.sh

View File

@@ -31,7 +31,7 @@ jobs:
# #
# - uses: actions/setup-java@v1 # - uses: actions/setup-java@v1
# with: # with:
# java-version: '16' # java-version: '17'
# architecture: x64 # architecture: x64
# #
# - name: Setup Cl # - name: Setup Cl

View File

@@ -64,7 +64,7 @@ jobs:
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
if: ${{ matrix.runtime != 'linux-fedora-x64' }} if: ${{ matrix.runtime != 'linux-fedora-x64' }}
with: with:
java-version: '16' java-version: '17'
architecture: ${{ matrix.arch }} architecture: ${{ matrix.arch }}
- name: Setup Cl - name: Setup Cl
@@ -85,7 +85,7 @@ jobs:
- name: Build rpm Package - name: Build rpm Package
if: ${{ matrix.runtime == 'linux-fedora-x64' }} if: ${{ matrix.runtime == 'linux-fedora-x64' }}
uses: Syer10/Fedora-Java16-Action@v1 uses: Syer10/Fedora-Java17-Action@v1
with: with:
command: ./gradlew ${{ matrix.build }} -Ppreview="${{ env.COMMIT_COUNT }}" --stacktrace command: ./gradlew ${{ matrix.build }} -Ppreview="${{ env.COMMIT_COUNT }}" --stacktrace
@@ -145,7 +145,7 @@ jobs:
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
- name: Fix rpm java dependency - name: Fix rpm java dependency
uses: Syer10/Fedora-Java16-Action@v1 uses: Syer10/Fedora-Java17-Action@v1
with: with:
command: ./scripts/RpmDependencyFix.sh command: ./scripts/RpmDependencyFix.sh

View File

@@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
with: with:
java-version: '16' java-version: '17'
architecture: x64 architecture: x64
- name: Setup Cl - name: Setup Cl

View File

@@ -65,7 +65,7 @@ Download the latest apk from [the releases section][release] (Or from [the previ
## General troubleshooting ## General troubleshooting
### I'm having issues starting the application ### I'm having issues starting the application
Make sure you have used either an installer, or you have Java 15 installed. Make sure you have used either an installer, or you have Java 17 installed.
### It says server failed to start ### It says server failed to start
Make sure that if you used an installer, that you have at least Java 8 installed. Make sure that if you used an installer, that you have at least Java 8 installed.
@@ -76,7 +76,7 @@ Join Tachidesk's [discord server](https://discord.gg/DDZdqZWaHA) to hang out wit
## Building from source ## Building from source
### Prerequisite: Software dependencies ### Prerequisite: Software dependencies
You need this software packages installed in order to build this project: You need this software packages installed in order to build this project:
- Java Development Kit and Java Runtime Environment version 15, this can be handled by IntelliJ - Java Development Kit and Java Runtime Environment version 17, this can be handled by IntelliJ
### Building a jar for your OS ### Building a jar for your OS
Run `./gradlew packageUberJarForCurrentOS`, the resulting built jar file will be `build/compose/Tachidesk-JUI-os-arch-X.Y.Z.jar`. Run `./gradlew packageUberJarForCurrentOS`, the resulting built jar file will be `build/compose/Tachidesk-JUI-os-arch-X.Y.Z.jar`.

View File

@@ -10,7 +10,7 @@ object Config {
const val preview = true const val preview = true
const val previewCommit = "86f0b3f29f2ea3f986eb40a7d4a5814112097b8e" const val previewCommit = "86f0b3f29f2ea3f986eb40a7d4a5814112097b8e"
val desktopJvmTarget = JavaVersion.VERSION_16 val desktopJvmTarget = JavaVersion.VERSION_17
val androidJvmTarget = JavaVersion.VERSION_11 val androidJvmTarget = JavaVersion.VERSION_11
const val androidDev = false const val androidDev = false