From 9d76132a5de0d5c0ea0e6ab9ee5e52e35df3bf8f Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 21 Apr 2023 13:44:36 +0800 Subject: [PATCH] Build with JDK 17 LTS Since JDK 20 is out, there is no more jdk19 on ArchLinux, but kotlin compiler don't recognise JvmTarget 20 yet --- .github/workflows/ci.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- .github/workflows/releases.yml | 4 ++-- app/build.gradle.kts | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0384466a6..de5dad32f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,11 @@ jobs: with: submodules: 'recursive' - - name: Setup Java 19 + - name: Setup Java 17 uses: actions/setup-java@v3 with: distribution: temurin - java-version: 19 + java-version: 17 - name: Install NDK run: | diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 54d87d050..60f9d61f7 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,11 +12,11 @@ jobs: with: submodules: 'recursive' - - name: Setup Java 19 + - name: Setup Java 17 uses: actions/setup-java@v3 with: distribution: temurin - java-version: 19 + java-version: 17 - name: Install NDK run: | diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 4bbd3c5e1..e16493f7a 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -15,11 +15,11 @@ jobs: with: submodules: 'recursive' - - name: Setup Java 19 + - name: Setup Java 17 uses: actions/setup-java@v3 with: distribution: temurin - java-version: 19 + java-version: 17 - name: Install NDK run: | diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a285e397e..6ab590de8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -86,12 +86,12 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_19 - targetCompatibility = JavaVersion.VERSION_19 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "19" + jvmTarget = "17" freeCompilerArgs = listOf( // https://kotlinlang.org/docs/compiler-reference.html#progressive "-progressive",