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

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

Merge "[Spa] Fix build warnings" into main

parents ee752d17 fa0bda19

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

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



[versions]

agp = "8.1.0"

agp = "8.1.1"

compose-compiler = "1.5.1"

dexmaker-mockito = "2.28.3"

kotlin = "1.9.0"

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

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


distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

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

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

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

packages/SettingsLib/Spa/gradlew

+4 −1
Original line number Diff line number Diff line
@@ -130,11 +130,14 @@ location of your Java installation." 
    fi

else

    JAVACMD=java

    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

    if ! command -v java >/dev/null 2>&1

    then

        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.



Please set the JAVA_HOME variable in your environment to match the

location of your Java installation."

    fi

fi



# Increase the maximum file descriptors if we can.

if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ dependencies { 
    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.0-rc01")

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

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