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

Merge "Upgrade SpaLib AGP to 8.0.0" into udc-dev am: 9b1982542f

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

Change-Id: Ib5961a89b98ad9ab5730d340462676f8082e4ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-04-23 06:26:16 +00:00
committed by Automerger Merge Worker
parent e05df88501 9b1982542f
commit 41e5d36d10
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SettingsLib/Spa/build.gradle
View File

@@ -14,17 +14,27 @@
* limitations under the License.
*/
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
buildscript {
ext {
BUILD_TOOLS_VERSION = "30.0.3"
MIN_SDK = 21
TARGET_SDK = 33
jetpack_compose_version = '1.4.0-beta01'
jetpack_compose_compiler_version = '1.4.0'
jetpack_compose_compiler_version = '1.4.4'
}
}
plugins {
id 'com.android.application' version '8.0.0-beta05' apply false
id 'com.android.library' version '8.0.0-beta05' apply false
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
id 'com.android.application' version '8.0.0' apply false
id 'com.android.library' version '8.0.0' apply false
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
}
subprojects {
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "17"
freeCompilerArgs = ["-Xjvm-default=all"]
}
}
}

8
packages/SettingsLib/Spa/gallery/build.gradle
View File

@@ -42,12 +42,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '11'
freeCompilerArgs = ["-Xjvm-default=all"]
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
buildFeatures {
compose true

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

@@ -51,10 +51,6 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
freeCompilerArgs = ["-Xjvm-default=all"]
}
buildFeatures {
compose true
}
@@ -79,7 +75,7 @@ dependencies {
api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version"
api "androidx.lifecycle:lifecycle-livedata-ktx"
api "androidx.lifecycle:lifecycle-runtime-compose"
api "androidx.navigation:navigation-compose:2.6.0-alpha07"
api "androidx.navigation:navigation-compose:2.6.0-alpha08"
api "com.github.PhilJay:MPAndroidChart:v3.1.0-alpha"
api "com.google.android.material:material:1.7.0-alpha03"
debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version"

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

@@ -41,10 +41,6 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
freeCompilerArgs = ["-Xjvm-default=all"]
}
buildFeatures {
compose true
}