Merge "Upgrade Spa to Java 17" into udc-dev am: 9e7ebc2c3b
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:
@@ -48,11 +48,11 @@ android {
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_11
|
||||
targetCompatibility JavaVersion.VERSION_11
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = '11'
|
||||
jvmTarget = '17'
|
||||
freeCompilerArgs = ["-Xjvm-default=all"]
|
||||
}
|
||||
buildFeatures {
|
||||
|
||||
@@ -38,11 +38,11 @@ android {
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_11
|
||||
targetCompatibility JavaVersion.VERSION_11
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = '11'
|
||||
jvmTarget = '17'
|
||||
freeCompilerArgs = ["-Xjvm-default=all"]
|
||||
}
|
||||
buildFeatures {
|
||||
|
||||
Reference in New Issue
Block a user