Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 647b1857 authored Mar 03, 2023 by Chaohui Wang Committed by Automerger Merge Worker Mar 03, 2023

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

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>

parents 0726c589 9e7ebc2c

packages/SettingsLib/Spa/spa/build.gradle

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 {

packages/SettingsLib/Spa/testutils/build.gradle

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 {