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

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

Merge "[Spa] Upgrade Google Material to 1.12.0" into main

parents f7959551 a2f0ea02

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.0"

agp = "8.6.1"

compose-compiler = "1.5.11"

dexmaker-mockito = "2.28.3"

jvm = "17"

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

+2.18 KiB (130 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-bin.zip

distributionUrl=gradle-8.10.2-bin.zip

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

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

+2 −3
Original line number Diff line number Diff line
@@ -58,12 +58,12 @@ dependencies { 
    api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion")

    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("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha")

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

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

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

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

    implementation("com.airbnb.android:lottie-compose:6.4.0")
@@ -84,7 +84,6 @@ tasks.register<JacocoReport>("coverageReport") { 


                    // Excludes files forked from AndroidX.

                    "com/android/settingslib/spa/widget/scaffold/CustomizedAppBar*",

                    "com/android/settingslib/spa/widget/scaffold/TopAppBarColors*",



                    // Excludes files forked from Accompanist.

                    "com/android/settingslib/spa/framework/compose/DrawablePainter*",