| commit | 7ba6bb1cfa5dc23160a45c4bee549fffa9a86dec | [log] [tgz] |
|---|---|---|
| author | Chaohui Wang <[email protected]> | Tue Sep 03 10:51:56 2024 +0800 |
| committer | Chaohui Wang <[email protected]> | Tue Sep 03 10:52:51 2024 +0800 |
| tree | b2b6f6779c01d5ca6b987e230cb4f53626133531 | |
| parent | dc30d71aaf56066dbded2a5d3614614a4715ac58 [diff] |
[Spa] Upgrade AGP to 8.6.0 Also, - Upgrade gradle to 8.10 - Upgrade AndroidX dependencies Bug: 351975088 Flag: EXEMPT gradle only Test: Gradle Sync Test: Run Gallery Change-Id: I1eaa1179214eac1a99e4dae80739b8e9dea8bdd3
diff --git a/packages/SettingsLib/Spa/build.gradle.kts b/packages/SettingsLib/Spa/build.gradle.kts index a543450..3011ce0 100644 --- a/packages/SettingsLib/Spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/build.gradle.kts
@@ -29,7 +29,7 @@ allprojects { extra["androidTop"] = androidTop - extra["jetpackComposeVersion"] = "1.7.0-beta07" + extra["jetpackComposeVersion"] = "1.7.0-rc01" } subprojects {
diff --git a/packages/SettingsLib/Spa/gradle/libs.versions.toml b/packages/SettingsLib/Spa/gradle/libs.versions.toml index 3507605..d01c0b9 100644 --- a/packages/SettingsLib/Spa/gradle/libs.versions.toml +++ b/packages/SettingsLib/Spa/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ # [versions] -agp = "8.5.2" +agp = "8.6.0" 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-bin.zip new file mode 100644 index 0000000..50432f3 --- /dev/null +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.10-bin.zip Binary files differ
diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.9-bin.zip b/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.9-bin.zip deleted file mode 100644 index 9a97e46..0000000 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.9-bin.zip +++ /dev/null Binary files differ
diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar index 2c35211..a4b76b9 100644 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar Binary files differ
diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties index 9f29c77..9a7f4b6 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.9-bin.zip +distributionUrl=gradle-8.10-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 e9153e3..f0c2ea6 100644 --- a/packages/SettingsLib/Spa/spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/spa/build.gradle.kts
@@ -54,13 +54,13 @@ dependencies { api(project(":SettingsLibColor")) api("androidx.appcompat:appcompat:1.7.0") - api("androidx.compose.material3:material3:1.3.0-beta05") + api("androidx.compose.material3:material3:1.3.0-rc01") 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.lifecycle:lifecycle-livedata-ktx") api("androidx.lifecycle:lifecycle-runtime-compose") - api("androidx.navigation:navigation-compose:2.8.0-beta07") + api("androidx.navigation:navigation-compose:2.8.0-rc01") api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha") api("com.google.android.material:material:1.11.0") debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion")