Eleven: Update AGP to 8.1.2 and Gradle to 8.4 (718fc86a) · Commits · e / os / android_packages_apps_Eleven

build.gradle

+28 −31

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ buildscript {
		}

		dependencies {
		classpath 'com.android.tools.build:gradle:7.0.4'
		classpath 'com.android.tools.build:gradle:8.1.2'

		// NOTE: Do not place your application dependencies here; they belong
		// in the individual module build.gradle files
		@@ -31,7 +31,9 @@ tasks.register("updateGradleWrapper", Wrapper) {
		apply plugin: 'com.android.application'

		android {
		compileSdkVersion 31
		compileSdkVersion 34

		namespace "org.lineageos.eleven"

		compileOptions {
		sourceCompatibility JavaVersion.VERSION_1_8
		@@ -42,7 +44,7 @@ android {
		applicationId "org.lineageos.eleven"

		minSdkVersion 28
		targetSdkVersion 31
		targetSdkVersion 34

		versionCode 420
		versionName '4.2.0'
		@@ -74,30 +76,13 @@ android {
		zipAlignEnabled true
		}
		}

		lintOptions {
		baseline file("lint-baseline.xml")

		abortOnError true
		checkAllWarnings true
		showAll true

		warningsAsErrors true

		// HTML report is enough (can be found inside build/reports/)
		xmlReport false

		// do not warn about translations
		disable 'MissingTranslation', 'ExtraTranslation'
		}

		packagingOptions {
		exclude 'META-INF/LICENSE.txt'
		exclude 'META-INF/LICENSE-FIREBASE.txt'
		exclude 'META-INF/NOTICE.txt'
		exclude '.readme'
		resources {
		excludes += ['META-INF/LICENSE.txt', 'META-INF/LICENSE-FIREBASE.txt', 'META-INF/NOTICE.txt', '.readme']
		}
		}


		sourceSets {
		main {
		manifest.srcFile 'AndroidManifest.xml'
		@@ -109,29 +94,41 @@ android {
		resources.srcDirs = ['res']
		}
		}
		buildFeatures {
		aidl true
		}
		lint {
		abortOnError true
		baseline file('lint-baseline.xml')
		checkAllWarnings true
		disable 'MissingTranslation', 'ExtraTranslation'
		showAll true
		warningsAsErrors true
		xmlReport false
		}
		}

		dependencies {
		// AndroidX - https://developer.android.com/jetpack/androidx/releases

		// see https://developer.android.com/jetpack/androidx/releases/appcompat
		implementation "androidx.appcompat:appcompat:1.4.0"
		implementation 'androidx.appcompat:appcompat:1.6.1'

		// see https://developer.android.com/jetpack/androidx/releases/cardview
		implementation "androidx.cardview:cardview:1.0.0"
		implementation 'androidx.cardview:cardview:1.0.0'

		// see https://developer.android.com/jetpack/androidx/releases/palette
		implementation "androidx.palette:palette:1.0.0"
		implementation 'androidx.palette:palette:1.0.0'

		// see https://developer.android.com/jetpack/androidx/releases/preference
		implementation "androidx.preference:preference:1.1.1"
		implementation 'androidx.preference:preference:1.2.1'

		// see https://developer.android.com/jetpack/androidx/releases/recyclerview
		implementation "androidx.recyclerview:recyclerview:1.2.1"
		implementation 'androidx.recyclerview:recyclerview:1.3.1'

		// see https://developer.android.com/jetpack/androidx/releases/constraintlayout
		implementation "androidx.constraintlayout:constraintlayout:2.1.2"
		implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

		// see https://github.com/material-components/material-components-android/releases
		implementation "com.google.android.material:material:1.4.0"
		implementation 'com.google.android.material:material:1.9.0'
		}

gradle.properties

+3 −0

Original line number	Diff line number	Diff line
		android.defaults.buildfeatures.buildconfig=true
		android.nonFinalResIds=false
		android.nonTransitiveRClass=false
		android.useAndroidX=true

gradle/wrapper/gradle-wrapper.jar

+4.09 KiB (62.2 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

gradle/wrapper/gradle-wrapper.properties

+3 −1

Original line number	Diff line number	Diff line
		distributionBase=GRADLE_USER_HOME
		distributionPath=wrapper/dists
		distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
		distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
		networkTimeout=10000
		validateDistributionUrl=true
		zipStoreBase=GRADLE_USER_HOME
		zipStorePath=wrapper/dists

gradlew

+28 −13

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@
		# Darwin, MinGW, and NonStop.
		#
		# (3) This script is generated from the Groovy template
		# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
		# 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/.
		@@ -80,13 +80,11 @@ do
		esac
		done

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

		APP_NAME="Gradle"
		# This is normally unused
		# shellcheck disable=SC2034
		APP_BASE_NAME=${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"'
		# 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

		# Use the maximum available, or set MAX_FD != -1 to use that value.
		MAX_FD=maximum
		@@ -133,22 +131,29 @@ location of your Java installation."
		fi
		else
		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.
		if ! command -v java >/dev/null 2>&1
		then
		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
		location of your Java installation."
		fi
		fi

		# Increase the maximum file descriptors if we can.
		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=SC2039,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=SC2039,SC3045
		ulimit -n "$MAX_FD" \|\|
		warn "Could not set maximum file descriptor limit to $MAX_FD"
		esac
		@@ -193,11 +198,15 @@ if "$cygwin" \|\| "$msys" ; then
		done
		fi

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

		# 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, 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" \
		@@ -205,6 +214,12 @@ set -- \
		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.