Skip to content

Commit

Permalink
Use Java 19
Browse files Browse the repository at this point in the history
Not using Android Gradle plugin 8.2.0-alpha01 to avoid licence bug
  • Loading branch information
JingMatrix committed May 2, 2023
1 parent 933f5f1 commit 335846e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: set up JDK 18
- name: set up JDK 19
uses: actions/setup-java@v3
with:
java-version: '18'
java-version: '19'
distribution: 'temurin'

- name: Build with Gradle
run: ./gradlew build
run: ./gradlew app:assembleRelease

- name: Rename signed apk
run: mv app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/ChromeXt.apk

- uses: r0adkll/sign-android-release@v1
- uses: noriban/sign-android-release@v3
name: Sign app APK
id: sign_app
with:
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_18
targetCompatibility = JavaVersion.VERSION_18
sourceCompatibility = JavaVersion.VERSION_19
targetCompatibility = JavaVersion.VERSION_19
}

lint {
Expand All @@ -44,7 +44,7 @@ android {
"Usability:Icons")
}

kotlinOptions { jvmTarget = JavaVersion.VERSION_18.toString() }
kotlinOptions { jvmTarget = JavaVersion.VERSION_19.toString() }
}

dependencies { compileOnly("de.robv.android.xposed:api:82") }
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask

plugins {
id("com.android.application") version "8.2.0-alpha01" apply false
id("com.android.library") version "8.2.0-alpha01" apply false
id("com.android.application") version "8.1.0-beta01" apply false
id("org.jetbrains.kotlin.android") version "1.8.21" apply false
id("com.ncorti.ktfmt.gradle") version "0.12.0"
}
Expand Down

0 comments on commit 335846e

Please sign in to comment.