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

Commit ee7bc7f1 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-23.0' into a16

parents f45c5bad d2e8c468

build.gradle

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

    id("com.android.application") version "8.1.2" apply true

    id("com.android.application") version "8.13.2" apply true

}



android {

gradle/wrapper/gradle-wrapper.jar

+2.12 KiB (44.6 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+1 −2
Original line number Diff line number Diff line 
#Fri Feb 23 16:06:58 IST 2024

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

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

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

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME

gradlew

+7 −8
Original line number Diff line number Diff line 
#!/bin/sh



#

# Copyright © 2015-2021 the original authors.

# Copyright © 2015 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.
@@ -15,6 +15,8 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.

#

# SPDX-License-Identifier: Apache-2.0

#



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

#
@@ -55,7 +57,7 @@ 
#       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

#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt

#       within the Gradle project.

#

#       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done 
# shellcheck disable=SC2034

APP_BASE_NAME=${0##*/}

# 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

APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit



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

MAX_FD=maximum
@@ -112,7 +114,6 @@ case "$( uname )" in #( 
  NONSTOP* )        nonstop=true ;;

esac



CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar





# Determine the Java command to use to start the JVM.
@@ -170,7 +171,6 @@ fi 
# For Cygwin or MSYS, switch paths to Windows format before running java

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

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

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



    JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -203,15 +203,14 @@ fi 
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'



# Collect all arguments for the java command:

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

#   * DEFAULT_JVM_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" \

        -classpath "$CLASSPATH" \

        org.gradle.wrapper.GradleWrapperMain \

        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \

        "$@"



# Stop when "xargs" is not available.

gradlew.bat

+3 −2
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
@rem See the License for the specific language governing permissions and

@rem limitations under the License.

@rem

@rem SPDX-License-Identifier: Apache-2.0

@rem



@if "%DEBUG%"=="" @echo off

@rem ##########################################################################
@@ -68,11 +70,10 @@ goto fail 
:execute

@rem Setup the command line



set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar





@rem Execute Gradle

"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*



:end

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