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

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

Merge "[Spa] Update versions" into main

parents 8ef9373b 2535db6e

packages/SettingsLib/Spa/build.gradle.kts

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ val androidTop: String = file("../../../../..").canonicalPath 




allprojects {

allprojects {

    extra["androidTop"] = androidTop

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.9.0-alpha04"

    extra["jetpackComposeVersion"] = "1.9.0-beta01"

}

}





allprojects {

allprojects {

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

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

#





[versions]

[versions]

agp = "8.11.0"

agp = "8.12.0"

dexmaker-mockito = "2.28.4"

dexmaker-mockito = "2.28.4"

jvm = "21"

jvm = "21"

kotlin = "2.1.10" # external/kotlinc/build.txt

kotlin = "2.2.0" # external/kotlinc/build.txt

mockito-kotlin = "4.1.0" # external/mockito-kotlin/METADATA

mockito-kotlin = "4.1.0" # external/mockito-kotlin/METADATA

truth = "1.4.4" # external/truth

truth = "1.4.4" # external/truth

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -50,16 +50,16 @@ android { 




dependencies {

dependencies {

    api(project(":SettingsLib:Color"))

    api(project(":SettingsLib:Color"))

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

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

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

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

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

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

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

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

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

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

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

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

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

    api("androidx.navigation:navigation-compose:2.9.3")

    api("androidx.window:window:1.5.0-alpha02")

    api("androidx.window:window:1.5.0-beta02")

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

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

    api("com.google.android.material:material:1.13.0-alpha13") // prebuilts/sdk/current/extras/material-design-x

    api("com.google.android.material:material:1.14.0-alpha02") // prebuilts/sdk/current/extras/material-design-x

    api("com.airbnb.android:lottie-compose:6.5.2") // external/lottie

    api("com.airbnb.android:lottie-compose:6.5.2") // external/lottie

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

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