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

Commit 0673fea4 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Upgrade Compose to 1.6.0-alpha07" into main

parents bef66aca e5652a6d

packages/SettingsLib/Spa/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ plugins { 
}



allprojects {

    extra["jetpackComposeVersion"] = "1.6.0-alpha02"

    extra["jetpackComposeVersion"] = "1.6.0-alpha07"

}



subprojects {

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/button/ActionButtonsPage.kt→packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/button/ActionButtonPageProvider.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.settingslib.spa.gallery.button 


import android.os.Bundle

import androidx.compose.material.icons.Icons

import androidx.compose.material.icons.automirrored.outlined.Launch

import androidx.compose.material.icons.outlined.Delete

import androidx.compose.material.icons.outlined.Launch

import androidx.compose.material.icons.outlined.WarningAmber

import androidx.compose.runtime.Composable

import androidx.compose.ui.tooling.preview.Preview
@@ -47,7 +47,7 @@ object ActionButtonPageProvider : SettingsPageProvider { 
    override fun Page(arguments: Bundle?) {

        RegularScaffold(title = TITLE) {

            val actionButtons = listOf(

                ActionButton(text = "Open", imageVector = Icons.Outlined.Launch) {},

                ActionButton(text = "Open", imageVector = Icons.AutoMirrored.Outlined.Launch) {},

                ActionButton(text = "Uninstall", imageVector = Icons.Outlined.Delete) {},

                ActionButton(text = "Force stop", imageVector = Icons.Outlined.WarningAmber) {},

            )

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

+2 −2
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
#



[versions]

agp = "8.1.1"

agp = "8.1.2"

compose-compiler = "1.5.1"

dexmaker-mockito = "2.28.3"

kotlin = "1.9.0"

truth = "1.1"

truth = "1.1.5"



[libraries]

dexmaker-mockito = { module = "com.linkedin.dexmaker:dexmaker-mockito", version.ref = "dexmaker-mockito" }

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

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


distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

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

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

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME

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.2.0-alpha04")

    api("androidx.compose.material3:material3:1.2.0-alpha09")

    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.7.1")

    api("androidx.navigation:navigation-compose:2.7.4")

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