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

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

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

parents 119a4357 4368af8d

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.4"

agp = "8.2.0"

compose-compiler = "1.5.1"

dexmaker-mockito = "2.28.3"

jvm = "17"

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.4-bin.zip

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

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME

packages/SettingsLib/Spa/gradlew

+9 −8
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ done 
# This is normally unused

# shellcheck disable=SC2034

APP_BASE_NAME=${0##*/}

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)

APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit



# Use the maximum available, or set MAX_FD != -1 to use that value.

MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then 
    case $MAX_FD in #(

      max*)

        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.

        # shellcheck disable=SC3045

        # shellcheck disable=SC2039,SC3045

        MAX_FD=$( ulimit -H -n ) ||

            warn "Could not query maximum file descriptor limit"

    esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then 
      '' | soft) :;; #(

      *)

        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.

        # shellcheck disable=SC3045

        # shellcheck disable=SC2039,SC3045

        ulimit -n "$MAX_FD" ||

            warn "Could not set maximum file descriptor limit to $MAX_FD"

    esac
@@ -201,11 +202,11 @@ fi 
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'



# Collect all arguments for the java command;

#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of

#     shell script including quotes and variable substitutions, so put them in

#     double quotes to make sure that they get re-expanded; and

#   * put everything else in single quotes, so that it's not re-expanded.

# Collect all arguments for the java command:

#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,

#     and any embedded shellness will be escaped.

#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be

#     treated as '${Hostname}' itself on the command line.



set -- \

        "-Dorg.gradle.appname=$APP_BASE_NAME" \