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

Unverified Commit 13aa0443 authored by Sebastiano Barezzi's avatar Sebastiano Barezzi Committed by Luca Stefani
Browse files

Recorder: Update Gradle wrapper and AGP 

Change-Id: I6b1db213bddf2e67ec38c549d157b7fca6e68151
parent 6205aaa5

app/build.gradle.kts

+5 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * SPDX-License-Identifier: Apache-2.0

 */



import org.jetbrains.kotlin.gradle.dsl.JvmTarget

import org.lineageos.generatebp.GenerateBpPluginExtension

import org.lineageos.generatebp.models.Module
@@ -48,8 +49,10 @@ android { 
        targetCompatibility = JavaVersion.VERSION_1_8

    }



    kotlinOptions {

        jvmTarget = "1.8"

    kotlin {

        compilerOptions {

            jvmTarget.set(JvmTarget.JVM_1_8)

        }

    }

}

build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


// Top-level build file where you can add configuration options common to all sub-projects/modules.

plugins {

    id("com.android.application") version "8.7.2" apply false

    id("com.android.application") version "8.13.0" apply false

    id("org.jetbrains.kotlin.android") version "1.9.23" apply false

    id("org.lineageos.generatebp") version "+" apply false

}

gradle/wrapper/gradle-wrapper.jar

+1.83 KiB (44.4 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.10-bin.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-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.