diff options
| -rw-r--r-- | packages/SettingsLib/Spa/gradle/libs.versions.toml | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/gradle/wrapper/gradle-8.10.2-bin.zip (renamed from packages/SettingsLib/Spa/gradle/wrapper/gradle-8.10-bin.zip) | bin | 136713202 -> 136715430 bytes | |||
| -rw-r--r-- | packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/spa/build.gradle.kts | 5 |
4 files changed, 4 insertions, 5 deletions
diff --git a/packages/SettingsLib/Spa/gradle/libs.versions.toml b/packages/SettingsLib/Spa/gradle/libs.versions.toml index d01c0b90481c..272dc2d1958f 100644 --- a/packages/SettingsLib/Spa/gradle/libs.versions.toml +++ b/packages/SettingsLib/Spa/gradle/libs.versions.toml @@ -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" diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.10-bin.zip b/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.10.2-bin.zip Binary files differindex 50432f3369c6..45f0424639f2 100644 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.10-bin.zip +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.10.2-bin.zip diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties index 9a7f4b60b773..1c25e97452eb 100644 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/packages/SettingsLib/Spa/spa/build.gradle.kts b/packages/SettingsLib/Spa/spa/build.gradle.kts index 790aa9ff8d3f..8f8275bed702 100644 --- a/packages/SettingsLib/Spa/spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/spa/build.gradle.kts @@ -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*", |