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

Commit 3154fb13 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents aa35eff2 10535cc0

app/build.gradle.kts

+1 −10
Original line number Diff line number Diff line
@@ -89,11 +89,7 @@ dependencies { 
    implementation(libs.androidx.viewpager2)

    implementation(libs.coil)

    implementation(libs.coil.network.okhttp)

    implementation(libs.kotlinx.coroutines.guava) {

        // Exclude compile time dependencies

        exclude("com.google.j2objc", "j2objc-annotations")

        exclude("org.checkerframework", "checker-qual")

    }

    implementation(libs.kotlinx.coroutines.guava)

    implementation(libs.kotlinx.serialization.json)

    implementation(libs.material)

    implementation(libs.nier.visualizer) {
@@ -113,12 +109,7 @@ configure<GenerateBpPluginExtension> { 
            }

            module.group.startsWith("org.jetbrains") -> true

            module.group == "com.google.android.material" -> true

            module.group == "com.google.auto.value" -> true

            module.group == "com.google.code.findbugs" -> true

            module.group == "com.google.errorprone" -> true

            module.group == "com.google.guava" -> true

            module.group == "org.jspecify" -> true

            module.group == "junit" -> true

            else -> false

        }

    }

gradle/libs.versions.toml

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



[versions]

agp = "8.10.0"

agp = "8.11.0"

kotlin = "1.9.23"

activity = "1.10.0-rc01"

appcompat = "1.7.0"

gradle/wrapper/gradle-wrapper.jar

+181 B (42.7 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line 
distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

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

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

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME

gradlew

+4 −5
Original line number Diff line number Diff line
@@ -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,7 @@ case "$( uname )" in #( 
  NONSTOP* )        nonstop=true ;;

esac



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

CLASSPATH="\\\"\\\""





# Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ 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.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' 
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.