Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Upgrade Spa to Java 17" into udc-dev am: 9e7ebc2c3b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21690623

Change-Id: I5cafa2c2018c538574343c9fb79531b0d68f3e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-03-03 02:18:58 +00:00
committed by Automerger Merge Worker
parent 0726c5898d 9e7ebc2c3b
commit 647b185783
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/Spa/spa/build.gradle
View File

@@ -48,11 +48,11 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_17
} }
kotlinOptions { kotlinOptions {
jvmTarget = '11' jvmTarget = '17'
freeCompilerArgs = ["-Xjvm-default=all"] freeCompilerArgs = ["-Xjvm-default=all"]
} }
buildFeatures { buildFeatures {

6
packages/SettingsLib/Spa/testutils/build.gradle
View File

@@ -38,11 +38,11 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_17
} }
kotlinOptions { kotlinOptions {
jvmTarget = '11' jvmTarget = '17'
freeCompilerArgs = ["-Xjvm-default=all"] freeCompilerArgs = ["-Xjvm-default=all"]
} }
buildFeatures { buildFeatures {