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

Commit e82ae247 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Upgrade AGP to 8.5.2" into main

parents cde96f04 1853b76d

packages/SettingsLib/Spa/build.gradle.kts

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ val androidTop: String = File(rootDir, "../../../../..").canonicalPath 




allprojects {

allprojects {

    extra["androidTop"] = androidTop

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.7.0-beta05"

    extra["jetpackComposeVersion"] = "1.7.0-beta07"

}

}





subprojects {

subprojects {
@@ -37,7 +37,7 @@ subprojects { 




    plugins.withType<AndroidBasePlugin> {

    plugins.withType<AndroidBasePlugin> {

        configure<BaseExtension> {

        configure<BaseExtension> {

            compileSdkVersion(34)

            compileSdkVersion(35)





            defaultConfig {

            defaultConfig {

                minSdk = 21

                minSdk = 21

packages/SettingsLib/Spa/gradle/libs.versions.toml

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
#

#





[versions]

[versions]

agp = "8.5.1"

agp = "8.5.2"

compose-compiler = "1.5.11"

compose-compiler = "1.5.11"

dexmaker-mockito = "2.28.3"

dexmaker-mockito = "2.28.3"

jvm = "17"

jvm = "17"

packages/SettingsLib/Spa/spa/build.gradle.kts

+2 −2
Original line number Original line Diff line number Diff line
@@ -54,13 +54,13 @@ android { 
dependencies {

dependencies {

    api(project(":SettingsLibColor"))

    api(project(":SettingsLibColor"))

    api("androidx.appcompat:appcompat:1.7.0")

    api("androidx.appcompat:appcompat:1.7.0")

    api("androidx.compose.material3:material3:1.3.0-beta04")

    api("androidx.compose.material3:material3:1.3.0-beta05")

    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")

    api("androidx.lifecycle:lifecycle-livedata-ktx")

    api("androidx.lifecycle:lifecycle-livedata-ktx")

    api("androidx.lifecycle:lifecycle-runtime-compose")

    api("androidx.lifecycle:lifecycle-runtime-compose")

    api("androidx.navigation:navigation-compose:2.8.0-beta05")

    api("androidx.navigation:navigation-compose:2.8.0-beta07")

    api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha")

    api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha")

    api("com.google.android.material:material:1.11.0")

    api("com.google.android.material:material:1.11.0")

    debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion")

    debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion")