commit | 125a0396be0426013531cf41c1e143328bac8a03 | [log] [tgz] |
---|---|---|
author | Chaohui Wang <[email protected]> | Wed Apr 10 13:26:49 2024 +0800 |
committer | Chaohui Wang <[email protected]> | Thu Apr 11 04:38:01 2024 +0000 |
tree | 9679c10bbbf1bfb656f9c2df4c2831f6176b52fd | |
parent | 328fca2caf65a8520f8a3ab596fbce47802fe0a4 [diff] |
[Spa] Upgrade AGP to 8.3.2 Also, - Upgrade gradle to 8.7 - Upgrade com.google.android.material:material to 1.11.0 Bug: 332487783 Test: Gradle Sync Test: Run Gallery Change-Id: Ief6882b1d31a39ab5091d95f122b8a64ed0372e8
diff --git a/packages/SettingsLib/Spa/gradle/libs.versions.toml b/packages/SettingsLib/Spa/gradle/libs.versions.toml index 0ee9d59..85ad160 100644 --- a/packages/SettingsLib/Spa/gradle/libs.versions.toml +++ b/packages/SettingsLib/Spa/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ # [versions] -agp = "8.3.1" +agp = "8.3.2" compose-compiler = "1.5.11" dexmaker-mockito = "2.28.3" jvm = "17"
diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.6-bin.zip b/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.6-bin.zip deleted file mode 100644 index 5c96347..0000000 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.6-bin.zip +++ /dev/null Binary files differ
diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.7-bin.zip b/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.7-bin.zip new file mode 100644 index 0000000..7a9ac5a --- /dev/null +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.7-bin.zip Binary files differ
diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties index 50ff9df..182095e 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.6-bin.zip +distributionUrl=gradle-8.7-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 2f2ac24..6344501 100644 --- a/packages/SettingsLib/Spa/spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/spa/build.gradle.kts
@@ -65,7 +65,7 @@ api("androidx.lifecycle:lifecycle-runtime-compose") api("androidx.navigation:navigation-compose:2.8.0-alpha05") api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha") - api("com.google.android.material:material:1.7.0-alpha03") + api("com.google.android.material:material:1.11.0") debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion") implementation("com.airbnb.android:lottie-compose:5.2.0")