Fix the build by updating to JDK 17

This commit is contained in:
Alexander Bakker 2023-08-30 14:31:25 +02:00
parent 3278d6544b
commit f38b6ec586
3 changed files with 12 additions and 2 deletions

View file

@ -8,6 +8,11 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Validate Gradle wrapper - name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6
- uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'
- name: Build the app - name: Build the app
run: ./gradlew build run: ./gradlew build
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
@ -23,7 +28,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- uses: actions/setup-java@v3 - uses: actions/setup-java@v3
with: with:
java-version: '11' java-version: '17'
distribution: 'temurin' distribution: 'temurin'
cache: 'gradle' cache: 'gradle'
- name: Install HAXM - name: Install HAXM

View file

@ -24,6 +24,11 @@ jobs:
run: | run: |
find app/src/main/java/com/beemdevelopment/aegis/importers ! \( -name AegisImporter.java -o -name "DatabaseImporter*" \) -type f -exec rm -f {} + find app/src/main/java/com/beemdevelopment/aegis/importers ! \( -name AegisImporter.java -o -name "DatabaseImporter*" \) -type f -exec rm -f {} +
sed -i '/Importer.class/d' app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java sed -i '/Importer.class/d' app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java
- uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v2
with: with:

View file

@ -22,4 +22,4 @@ android.enableJetifier=false
android.nonFinalResIds=false android.nonFinalResIds=false
android.nonTransitiveRClass=false android.nonTransitiveRClass=false
android.useAndroidX=true android.useAndroidX=true
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m org.gradle.jvmargs=-Xmx8g