Upgrade Compose version to 1.6.0-alpha01
To match the platform prebuilts version. Also upgrade compile sdk version because new library is compiled at 34. Bug: 284913888 Test: Gradle Sync Test: Run Gallery Change-Id: Id633a168c4aab0c1eefa6392b25f3e143f749b5d
This commit is contained in:
@@ -25,13 +25,13 @@ plugins {
|
||||
}
|
||||
|
||||
allprojects {
|
||||
extra["jetpackComposeVersion"] = "1.4.0-beta01"
|
||||
extra["jetpackComposeVersion"] = "1.6.0-alpha01"
|
||||
}
|
||||
|
||||
subprojects {
|
||||
plugins.withType<AndroidBasePlugin> {
|
||||
configure<BaseExtension> {
|
||||
compileSdkVersion(33)
|
||||
compileSdkVersion(34)
|
||||
|
||||
defaultConfig {
|
||||
minSdk = 21
|
||||
|
||||
@@ -28,6 +28,6 @@ android_app {
|
||||
"androidx.compose.runtime_runtime",
|
||||
],
|
||||
kotlincflags: ["-Xjvm-default=all"],
|
||||
platform_apis: true,
|
||||
sdk_version: "current",
|
||||
min_sdk_version: "31",
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ android {
|
||||
|
||||
sourceSets {
|
||||
sourceSets.getByName("main") {
|
||||
java.setSrcDirs(listOf("src"))
|
||||
kotlin.setSrcDirs(listOf("src"))
|
||||
res.setSrcDirs(listOf("res"))
|
||||
manifest.srcFile("AndroidManifest.xml")
|
||||
}
|
||||
|
||||
@@ -43,6 +43,7 @@ android_library {
|
||||
kotlincflags: [
|
||||
"-Xjvm-default=all",
|
||||
],
|
||||
sdk_version: "current",
|
||||
min_sdk_version: "31",
|
||||
}
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ dependencies {
|
||||
api("androidx.slice:slice-builders:1.1.0-alpha02")
|
||||
api("androidx.slice:slice-core: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.runtime:runtime-livedata:$jetpackComposeVersion")
|
||||
api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion")
|
||||
|
||||
@@ -36,5 +36,6 @@ android_test {
|
||||
"mockito-target-minus-junit4",
|
||||
],
|
||||
kotlincflags: ["-Xjvm-default=all"],
|
||||
sdk_version: "current",
|
||||
min_sdk_version: "31",
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user