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

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

Merge "[Spa] Upgrade Compose to 1.8.0-alpha06" into main

parents 626a454c 9ee52231

packages/SettingsLib/Spa/build.gradle.kts

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


allprojects {

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.7.3"

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

}



subprojects {

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

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



[versions]

agp = "8.6.1"

agp = "8.7.2"

compose-compiler = "1.5.11"

dexmaker-mockito = "2.28.3"

jvm = "17"

packages/SettingsLib/Spa/gradle/wrapper/gradle-8.10.2-bin.zip→packages/SettingsLib/Spa/gradle/wrapper/gradle-8.11.1-bin.zip

+200 KiB (131 MiB)

File changed and moved.

No diff preview for this file type.

View original file
View changed file

packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 


distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionUrl=gradle-8.10.2-bin.zip

distributionUrl=gradle-8.11.1-bin.zip

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

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

+3 −3
Original line number Diff line number Diff line
@@ -54,14 +54,14 @@ android { 
dependencies {

    api(project(":SettingsLibColor"))

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

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

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

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

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

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

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

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

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

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