Skip to content

Commit 924becd

Browse files
committed
Upgrade JDK version to 17 in github actions
1 parent 5c220b2 commit 924becd

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
api-level: [23, 29, 30, 31]
22+
api-level: [24, 29, 31, 33]
2323
target: [google_apis]
2424

2525
steps:
2626
- name: checkout
27-
uses: actions/checkout@v2
28-
- name: setup Java 11
27+
uses: actions/checkout@v3
28+
- name: setup Java 17
2929
uses: actions/setup-java@v2
3030
with:
3131
distribution: 'zulu' # See 'Supported distributions' for available options
32-
java-version: '11'
32+
java-version: '17'
3333

3434
- name: run connectedCheck
3535
uses: reactivecircus/android-emulator-runner@v2
3636
with:
3737
api-level: ${{ matrix.api-level }}
38-
ndk: 21.0.6113669
39-
cmake: 3.10.2.4988404
38+
ndk: 21.3.6528147
39+
cmake: 3.22.1
4040
target: ${{ matrix.target }}
4141
arch: x86_64
4242
profile: Nexus 6

.idea/misc.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

baseLib/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ android {
1010
defaultConfig {
1111
minSdkVersion versions.minSdk
1212
}
13+
buildFeatures {
14+
aidl true
15+
}
1316

1417
lint {
1518
disable 'PrivateApi'

gradle.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@ android.useAndroidX=true
22
android.enableJetifier=true
33

44
org.gradle.jvmargs=-Xmx4096M
5-
6-
android.defaults.buildfeatures.buildconfig=true
7-
android.nonTransitiveRClass=false
8-
android.nonFinalResIds=false

0 commit comments

Comments
 (0)