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

Commit 84e176ca authored by Nishith Khanna's avatar Nishith Khanna
Browse files

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

parents 93220728 49d72c01

build.gradle.kts

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ dependencies { 
configure<GenerateBpPluginExtension> {

    targetSdk.set(android.defaultConfig.targetSdk!!)

    minSdk.set(android.defaultConfig.minSdk!!)

    versionCode.set(android.defaultConfig.versionCode!!)

    versionName.set(android.defaultConfig.versionName!!)

    availableInAOSP.set { module: Module ->

        when {

            module.group.startsWith("androidx") -> true

gradle.properties

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

# org.gradle.parallel=true

#Mon Jul 31 17:20:03 CEST 2023

android.defaults.buildfeatures.buildconfig=true

android.nonFinalResIds=true

android.nonTransitiveRClass=true

android.useAndroidX=true

gradle/wrapper/gradle-wrapper.jar

+2 KiB (44.6 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+2 −3
Original line number Diff line number Diff line 
#Thu Oct 31 13:24:25 IST 2024

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26

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

distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f

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

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME

gradlew

+4 −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.
@@ -86,8 +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 -P "${APP_HOME:-./}" > /dev/null && printf '%s

' "$PWD" ) || 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
@@ -115,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.
@@ -173,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" )
@@ -206,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.