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

Upgrade Compose version to 1.6.0-alpha01 am: f7f3e962e1

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

Change-Id: I3a21f195c608748d05549dfc7934559760bb05e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-06-25 08:13:51 +00:00
committed by Automerger Merge Worker
parent 75bc531477 f7f3e962e1
commit b37db4249d
6 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,13 +25,13 @@ plugins {
} }
allprojects { allprojects {
extra["jetpackComposeVersion"] = "1.4.0-beta01" extra["jetpackComposeVersion"] = "1.6.0-alpha01"
} }
subprojects { subprojects {
plugins.withType<AndroidBasePlugin> { plugins.withType<AndroidBasePlugin> {
configure<BaseExtension> { configure<BaseExtension> {
compileSdkVersion(33) compileSdkVersion(34)
defaultConfig { defaultConfig {
minSdk = 21 minSdk = 21

2
packages/SettingsLib/Spa/gallery/Android.bp
View File

@@ -28,6 +28,6 @@ android_app {
"androidx.compose.runtime_runtime", "androidx.compose.runtime_runtime",
], ],
kotlincflags: ["-Xjvm-default=all"], kotlincflags: ["-Xjvm-default=all"],
platform_apis: true, sdk_version: "current",
min_sdk_version: "31", min_sdk_version: "31",
} }

2
packages/SettingsLib/Spa/gallery/build.gradle.kts
View File

@@ -30,7 +30,7 @@ android {
sourceSets { sourceSets {
sourceSets.getByName("main") { sourceSets.getByName("main") {
java.setSrcDirs(listOf("src")) kotlin.setSrcDirs(listOf("src"))
res.setSrcDirs(listOf("res")) res.setSrcDirs(listOf("res"))
manifest.srcFile("AndroidManifest.xml") manifest.srcFile("AndroidManifest.xml")
} }

1
packages/SettingsLib/Spa/spa/Android.bp
View File

@@ -43,6 +43,7 @@ android_library {
kotlincflags: [ kotlincflags: [
"-Xjvm-default=all", "-Xjvm-default=all",
], ],
sdk_version: "current",
min_sdk_version: "31", min_sdk_version: "31",
} }

2
packages/SettingsLib/Spa/spa/build.gradle.kts
View File

@@ -56,7 +56,7 @@ dependencies {
api("androidx.slice:slice-builders:1.1.0-alpha02") api("androidx.slice:slice-builders:1.1.0-alpha02")
api("androidx.slice:slice-core:1.1.0-alpha02") api("androidx.slice:slice-core:1.1.0-alpha02")
api("androidx.slice:slice-view:1.1.0-alpha02") api("androidx.slice:slice-view:1.1.0-alpha02")
api("androidx.compose.material3:material3:1.1.0-alpha06") api("androidx.compose.material3:material3:1.2.0-alpha03")
api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion") api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion")
api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion") api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion")
api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion") api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion")

1
packages/SettingsLib/Spa/tests/Android.bp
View File

@@ -36,5 +36,6 @@ android_test {
"mockito-target-minus-junit4", "mockito-target-minus-junit4",
], ],
kotlincflags: ["-Xjvm-default=all"], kotlincflags: ["-Xjvm-default=all"],
sdk_version: "current",
min_sdk_version: "31", min_sdk_version: "31",
} }