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

Commit 57e0889e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Update gradle versions" into main

parents 99312185 f3c83f56

packages/SettingsLib/Spa/build.gradle.kts

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


allprojects {

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.8.0-beta02"

    extra["jetpackComposeVersion"] = "1.8.0-rc01"

}



subprojects {
@@ -36,11 +36,11 @@ subprojects { 


    plugins.withType<AndroidBasePlugin> {

        configure<BaseExtension> {

            compileSdkVersion(35)

            compileSdkVersion(36)



            defaultConfig {

                minSdk = 21

                targetSdk = 35

                targetSdk = 36

            }

        }

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt

+2 −0
Original line number Diff line number Diff line
@@ -124,4 +124,6 @@ class GallerySpaEnvironment(context: Context) : SpaEnvironment(context) { 


    // For debugging

    override val searchProviderAuthorities = "com.android.spa.gallery.search.provider"



    override val isSpaExpressiveEnabled = true

}

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

+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
#



[versions]

agp = "8.8.1"

agp = "8.9.0"

dexmaker-mockito = "2.28.3"

jvm = "21"

kotlin = "2.0.21"

kotlin = "2.1.10"

truth = "1.4.4"



[libraries]

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

+4 −4
Original line number Diff line number Diff line
@@ -52,18 +52,18 @@ android { 
dependencies {

    api(project(":SettingsLibColor"))

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

    api("androidx.compose.material3:material3:1.4.0-alpha08")

    api("androidx.compose.material:material-icons-extended")

    api("androidx.compose.material3:material3:1.4.0-alpha10")

    api("androidx.compose.material:material-icons-extended:1.7.8")

    api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion")

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

    api("androidx.graphics:graphics-shapes-android:1.0.1")

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

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

    api("androidx.navigation:navigation-compose:2.9.0-alpha06")

    api("androidx.navigation:navigation-compose:2.9.0-alpha08")

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

    api("com.google.android.material:material:1.13.0-alpha08")

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

    implementation("com.airbnb.android:lottie-compose:6.4.0")

    implementation("com.airbnb.android:lottie-compose:6.5.2")



    androidTestImplementation(project(":testutils"))

    androidTestImplementation(libs.dexmaker.mockito)