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

Commit bb2c76ee authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Upgrade SpaLib AGP to 8.0.0-beta05" into udc-dev am: 1a9daca6 am: 47efb1ab 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22190411



Change-Id: Id6f116929030628b57c04d1e7a629cd7c37bd4da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a2599f9 47efb1ab

packages/SettingsLib/Spa/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ buildscript { 
    }

}

plugins {

    id 'com.android.application' version '8.0.0-beta03' apply false

    id 'com.android.library' version '8.0.0-beta03' apply false

    id 'com.android.application' version '8.0.0-beta05' apply false

    id 'com.android.library' version '8.0.0-beta05' apply false

    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false

}

packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#Thu Jul 14 10:36:06 CST 2022

distributionBase=GRADLE_USER_HOME

distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-2-bin.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip

distributionPath=wrapper/dists

zipStorePath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

packages/SettingsLib/Spa/spa/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ dependencies { 
    api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version"

    api "androidx.lifecycle:lifecycle-livedata-ktx"

    api "androidx.lifecycle:lifecycle-runtime-compose"

    api "androidx.navigation:navigation-compose:2.6.0-alpha04"

    api "androidx.navigation:navigation-compose:2.6.0-alpha07"

    api "com.github.PhilJay:MPAndroidChart:v3.1.0-alpha"

    api "com.google.android.material:material:1.7.0-alpha03"

    debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version"