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

Commit de0a0163 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Upgrade AGP to 8.3.0" into main

parents cd70ab7a 64515d25

packages/SettingsLib/Spa/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ val androidTop: String = File(rootDir, "../../../../..").canonicalPath 


allprojects {

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.7.0-alpha03"

    extra["jetpackComposeVersion"] = "1.7.0-alpha04"

}



subprojects {

packages/SettingsLib/Spa/gradle/libs.versions.toml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#



[versions]

agp = "8.2.2"

agp = "8.3.0"

compose-compiler = "1.5.10"

dexmaker-mockito = "2.28.3"

jvm = "17"

packages/SettingsLib/Spa/gradle/wrapper/gradle-8.6-bin.zip

0 → 100644
+127 MiB

File added.

No diff preview for this file type.

View file

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

+1 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

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

networkTimeout=10000

validateDistributionUrl=true

distributionUrl=gradle-8.6-bin.zip

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

packages/SettingsLib/Spa/spa/build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ dependencies { 
    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-alpha01")

    api("androidx.compose.material3:material3:1.3.0-alpha02")

    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-alpha02")

    api("androidx.navigation:navigation-compose:2.8.0-alpha03")

    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:$jetpackComposeVersion")