diff options
| -rw-r--r-- | packages/SettingsLib/Spa/build.gradle.kts | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/gradle/libs.versions.toml | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/gradle/wrapper/gradle-8.8-bin.zip (renamed from packages/SettingsLib/Spa/gradle/wrapper/gradle-8.7-bin.zip) | bin | 134184980 -> 138039528 bytes | |||
| -rw-r--r-- | packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar | bin | 43462 -> 43453 bytes | |||
| -rw-r--r-- | packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rwxr-xr-x | packages/SettingsLib/Spa/gradlew | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/settings.gradle.kts | 3 | ||||
| -rw-r--r-- | packages/SettingsLib/Spa/spa/build.gradle.kts | 8 |
8 files changed, 8 insertions, 11 deletions
diff --git a/packages/SettingsLib/Spa/build.gradle.kts b/packages/SettingsLib/Spa/build.gradle.kts index 232fa9204517..d6345cec7c30 100644 --- a/packages/SettingsLib/Spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/build.gradle.kts @@ -29,7 +29,7 @@ val androidTop: String = File(rootDir, "../../../../..").canonicalPath allprojects { extra["androidTop"] = androidTop - extra["jetpackComposeVersion"] = "1.7.0-SNAPSHOT" + extra["jetpackComposeVersion"] = "1.7.0-beta02" } subprojects { diff --git a/packages/SettingsLib/Spa/gradle/libs.versions.toml b/packages/SettingsLib/Spa/gradle/libs.versions.toml index 85ad160f6d66..a842009a09bb 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.2" +agp = "8.5.0" compose-compiler = "1.5.11" dexmaker-mockito = "2.28.3" jvm = "17" diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.7-bin.zip b/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.8-bin.zip Binary files differindex 7a9ac5afe013..77e6ad3f2117 100644 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.7-bin.zip +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-8.8-bin.zip diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar Binary files differindex d64cd4917707..e6441136f3d4 100644 --- a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar +++ b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.jar diff --git a/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties b/packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties index 182095e76e76..91d2a3ab217d 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.7-bin.zip +distributionUrl=gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/SettingsLib/Spa/gradlew b/packages/SettingsLib/Spa/gradlew index 1aa94a426907..b740cf13397a 100755 --- a/packages/SettingsLib/Spa/gradlew +++ b/packages/SettingsLib/Spa/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/packages/SettingsLib/Spa/settings.gradle.kts b/packages/SettingsLib/Spa/settings.gradle.kts index 31f462e5e918..e003c81d7a0c 100644 --- a/packages/SettingsLib/Spa/settings.gradle.kts +++ b/packages/SettingsLib/Spa/settings.gradle.kts @@ -36,9 +36,6 @@ dependencyResolutionManagement { } mavenCentral() maven { - url = uri("https://androidx.dev/snapshots/builds/11846308/artifacts/repository") - } - maven { url = uri("https://jitpack.io") content { includeGroup("com.github.PhilJay") diff --git a/packages/SettingsLib/Spa/spa/build.gradle.kts b/packages/SettingsLib/Spa/spa/build.gradle.kts index f98695eb2e1d..9b8ecf773661 100644 --- a/packages/SettingsLib/Spa/spa/build.gradle.kts +++ b/packages/SettingsLib/Spa/spa/build.gradle.kts @@ -53,21 +53,21 @@ android { dependencies { api(project(":SettingsLibColor")) - api("androidx.appcompat:appcompat:1.7.0-beta01") + api("androidx.appcompat:appcompat:1.7.0-rc01") api("androidx.slice:slice-builders:1.1.0-alpha02") api("androidx.slice:slice-core:1.1.0-alpha02") api("androidx.slice:slice-view:1.1.0-alpha02") - api("androidx.compose.material3:material3:1.3.0-SNAPSHOT") + api("androidx.compose.material3:material3:1.3.0-beta02") 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-beta01") + api("androidx.navigation:navigation-compose:2.8.0-beta02") 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") - implementation("com.airbnb.android:lottie-compose:5.2.0") + implementation("com.airbnb.android:lottie-compose:6.4.0") androidTestImplementation(project(":testutils")) androidTestImplementation(libs.dexmaker.mockito) |