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

Commit 12154b45 authored by Aayush Gupta's avatar Aayush Gupta Committed by LuK1337
Browse files

Bump to latest stable AGP & Gradle versions 



* Also run ./gradlew wrapper to update wrapper
* Enforce sha256sum verification as well

Change-Id: I170d5fc21befda3622f2043af251789c4440941b
Signed-off-by: default avatarAayush Gupta <aayushgupta219@gmail.com>
parent 19a00c2a

build.gradle

+2 −2
Original line number Diff line number Diff line 
plugins {

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

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

    id 'com.android.application' version '8.1.1' apply false

    id 'com.android.library' version '8.1.1' apply false

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

    id 'org.ec4j.editorconfig' version "0.0.3" apply false

    id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.5" apply true

gradle/wrapper/gradle-wrapper.jar

+2.81 KiB (60.6 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+5 −3
Original line number Diff line number Diff line 
#Tue Nov 16 03:59:46 GMT 2021

#Tue Sep 26 17:59:05 IST 2023

distributionBase=GRADLE_USER_HOME

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

distributionPath=wrapper/dists

zipStorePath=wrapper/dists

distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225

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

networkTimeout=10000

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

gradlew

+168 −108
Original line number Diff line number Diff line 
#!/usr/bin/env sh

#!/bin/sh



#

# Copyright 2015 the original author or authors.

# Copyright © 2015-2021 the original authors.

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -17,67 +17,98 @@ 
#



##############################################################################

##

##  Gradle start up script for UN*X

##

#

#   Gradle start up script for POSIX generated by Gradle.

#

#   Important for running:

#

#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is

#       noncompliant, but you have some other compliant shell such as ksh or

#       bash, then to run this script, type that shell name before the whole

#       command line, like:

#

#           ksh Gradle

#

#       Busybox and similar reduced shells will NOT work, because this script

#       requires all of these POSIX shell features:

#         * functions;

#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,

#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;

#         * compound commands having a testable exit status, especially «case»;

#         * various built-in commands including «command», «set», and «ulimit».

#

#   Important for patching:

#

#   (2) This script targets any POSIX shell, so it avoids extensions provided

#       by Bash, Ksh, etc; in particular arrays are avoided.

#

#       The "traditional" practice of packing multiple parameters into a

#       space-separated string is a well documented source of bugs and security

#       problems, so this is (mostly) avoided, by progressively accumulating

#       options in "$@", and eventually passing that to Java.

#

#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,

#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;

#       see the in-line comments for details.

#

#       There are tweaks for specific operating systems such as AIX, CygWin,

#       Darwin, MinGW, and NonStop.

#

#   (3) This script is generated from the Groovy template

#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt

#       within the Gradle project.

#

#       You can find Gradle at https://github.com/gradle/gradle/.

#

##############################################################################



# Attempt to set APP_HOME



# Resolve links: $0 may be a link

PRG="$0"

# Need this for relative symlinks.

while [ -h "$PRG" ] ; do

    ls=`ls -ld "$PRG"`

    link=`expr "$ls" : '.*-> \(.*\)$'`

    if expr "$link" : '/.*' > /dev/null; then

        PRG="$link"

    else

        PRG=`dirname "$PRG"`"/$link"

    fi

app_path=$0



# Need this for daisy-chained symlinks.

while

    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path

    [ -h "$app_path" ]

do

    ls=$( ls -ld "$app_path" )

    link=${ls#*' -> '}

    case $link in             #(

      /*)   app_path=$link ;; #(

      *)    app_path=$APP_HOME$link ;;

    esac

done

SAVED="`pwd`"

cd "`dirname \"$PRG\"`/" >/dev/null

APP_HOME="`pwd -P`"

cd "$SAVED" >/dev/null



APP_NAME="Gradle"

APP_BASE_NAME=`basename "$0"`



# 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"'

# This is normally unused

# shellcheck disable=SC2034

APP_BASE_NAME=${0##*/}

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



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

MAX_FD="maximum"

MAX_FD=maximum



warn () {

    echo "$*"

}

} >&2



die () {

    echo

    echo "$*"

    echo

    exit 1

}

} >&2



# OS specific support (must be 'true' or 'false').

cygwin=false

msys=false

darwin=false

nonstop=false

case "`uname`" in

  CYGWIN* )

    cygwin=true

    ;;

  Darwin* )

    darwin=true

    ;;

  MINGW* )

    msys=true

    ;;

  NONSTOP* )

    nonstop=true

    ;;

case "$( uname )" in                #(

  CYGWIN* )         cygwin=true  ;; #(

  Darwin* )         darwin=true  ;; #(

  MSYS* | MINGW* )  msys=true    ;; #(

  NONSTOP* )        nonstop=true ;;

esac



CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 
if [ -n "$JAVA_HOME" ] ; then

    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then

        # IBM's JDK on AIX uses strange locations for the executables

        JAVACMD="$JAVA_HOME/jre/sh/java"

        JAVACMD=$JAVA_HOME/jre/sh/java

    else

        JAVACMD="$JAVA_HOME/bin/java"

        JAVACMD=$JAVA_HOME/bin/java

    fi

    if [ ! -x "$JAVACMD" ] ; then

        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the 
location of your Java installation."

    fi

else

    JAVACMD="java"

    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.



Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +137,109 @@ location of your Java installation." 
fi



# Increase the maximum file descriptors if we can.

if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then

    MAX_FD_LIMIT=`ulimit -H -n`

    if [ $? -eq 0 ] ; then

        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then

            MAX_FD="$MAX_FD_LIMIT"

        fi

        ulimit -n $MAX_FD

        if [ $? -ne 0 ] ; then

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

        fi

    else

        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"

    fi

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

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

            warn "Could not query maximum file descriptor limit"

    esac

    case $MAX_FD in  #(

      '' | soft) :;; #(

      *)

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

        # shellcheck disable=SC3045

        ulimit -n "$MAX_FD" ||

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

    esac

fi



# For Darwin, add options to specify how the application appears in the dock

if $darwin; then

    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""

fi

# Collect all arguments for the java command, stacking in reverse order:

#   * args from the command line

#   * the main class name

#   * -classpath

#   * -D...appname settings

#   * --module-path (only if needed)

#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.



# For Cygwin or MSYS, switch paths to Windows format before running java

if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then

    APP_HOME=`cygpath --path --mixed "$APP_HOME"`

    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`



    JAVACMD=`cygpath --unix "$JAVACMD"`



    # We build the pattern for arguments to be converted via cygpath

    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

    SEP=""

    for dir in $ROOTDIRSRAW ; do

        ROOTDIRS="$ROOTDIRS$SEP$dir"

        SEP="|"

    done

    OURCYGPATTERN="(^($ROOTDIRS))"

    # Add a user-defined pattern to the cygpath arguments

    if [ "$GRADLE_CYGPATTERN" != "" ] ; then

        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"

    fi

    # Now convert the arguments - kludge to limit ourselves to /bin/sh

    i=0

    for arg in "$@" ; do

        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`

        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option

if "$cygwin" || "$msys" ; then

    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )

    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )



        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition

            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`

        else

            eval `echo args$i`="\"$arg\""

    JAVACMD=$( cygpath --unix "$JAVACMD" )



    # Now convert the arguments - kludge to limit ourselves to /bin/sh

    for arg do

        if

            case $arg in                                #(

              -*)   false ;;                            # don't mess with options #(

              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath

                    [ -e "$t" ] ;;                      #(

              *)    false ;;

            esac

        then

            arg=$( cygpath --path --ignore --mixed "$arg" )

        fi

        i=`expr $i + 1`

        # Roll the args list around exactly as many times as the number of

        # args, so each arg winds up back in the position where it started, but

        # possibly modified.

        #

        # NB: a `for` loop captures its iteration list before it begins, so

        # changing the positional parameters here affects neither the number of

        # iterations, nor the values presented in `arg`.

        shift                   # remove old arg

        set -- "$@" "$arg"      # push replacement arg

    done

    case $i in

        0) set -- ;;

        1) set -- "$args0" ;;

        2) set -- "$args0" "$args1" ;;

        3) set -- "$args0" "$args1" "$args2" ;;

        4) set -- "$args0" "$args1" "$args2" "$args3" ;;

        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;

        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;

        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;

        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;

        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;

    esac

fi



# Escape application args

save () {

    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done

    echo " "

}

APP_ARGS=`save "$@"`



# Collect all arguments for the java command, following the shell quoting and substitution rules

eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# 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.



set -- \

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

        -classpath "$CLASSPATH" \

        org.gradle.wrapper.GradleWrapperMain \

        "$@"



# Stop when "xargs" is not available.

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

then

    die "xargs is not available"

fi



# Use "xargs" to parse quoted args.

#

# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

#

# In Bash we could simply go:

#

#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&

#   set -- "${ARGS[@]}" "$@"

#

# but POSIX shell has neither arrays nor command substitution, so instead we

# post-process each arg (as a line of input to sed) to backslash-escape any

# character that might be a shell metacharacter, then use eval to reverse

# that process (while maintaining the separation between arguments), and wrap

# the whole thing up as a single "set" statement.

#

# This will of course break if any of these variables contains a newline or

# an unmatched quote.

#



eval "set -- $(

        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |

        xargs -n1 |

        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |

        tr '\n' ' '

    )" '"$@"'



exec "$JAVACMD" "$@"

gradlew.bat

+9 −6
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal 


set DIRNAME=%~dp0

if "%DIRNAME%"=="" set DIRNAME=.

@rem This is normally unused

set APP_BASE_NAME=%~n0

set APP_HOME=%DIRNAME%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome 


set JAVA_EXE=java.exe

%JAVA_EXE% -version >NUL 2>&1

if "%ERRORLEVEL%" == "0" goto execute

if %ERRORLEVEL% equ 0 goto execute



echo.

echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar 


:end

@rem End local scope for the variables with windows NT shell

if "%ERRORLEVEL%"=="0" goto mainEnd

if %ERRORLEVEL% equ 0 goto mainEnd



:fail

rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

rem the _cmd.exe /c_ return code!

if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

exit /b 1

set EXIT_CODE=%ERRORLEVEL%

if %EXIT_CODE% equ 0 set EXIT_CODE=1

if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%

exit /b %EXIT_CODE%



:mainEnd

if "%OS%"=="Windows_NT" endlocal