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

Unverified Commit f8f61346 authored by Ricki Hirner's avatar Ricki Hirner Committed by GitHub
Browse files

Update AGP to 9.0.0 (#1929)

* Update gradle wrapper

* Update AGP to 9.0.0 (legacy mode) and synctools (which now also uses AGP 9.0.0)
parent 0f7908da
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ org.gradle.parallel=true
# Android
android.useAndroidX=true

# Compatibility with AGP 9.0.0
android.builtInKotlin=false
android.newDsl=false

# It's recommended to add these settings to your $GRADLE_USER_HOME/gradle.properties:

# org.gradle.configuration-cache=true
+3 −3
Original line number Diff line number Diff line
# Comments apply to next line

[versions]
android-agp = "8.13.2"
android-agp = "9.0.0"
android-desugaring = "2.1.5"
androidx-activityCompose = "1.12.2"
androidx-appcompat = "1.7.1"
@@ -20,14 +20,14 @@ androidx-test-junit = "1.3.0"
androidx-work = "2.11.0"
bitfire-cert4android = "42d883e958"
bitfire-dav4jvm = "acf8e4ef9b"
bitfire-synctools = "42e82f4769"
bitfire-synctools = "0c84c5acd4"
compose-accompanist = "0.37.3"
compose-bom = "2025.12.01"
conscrypt = "2.5.3"
dnsjava = "3.6.3"
glance = "1.1.1"
guava = "33.5.0-android"
hilt = "2.57.2"
hilt = "2.58"
# keep in sync with ksp version
kotlin = "2.2.21"
kotlinx-coroutines = "1.10.2"
+1.83 KiB (44.4 KiB)

File changed.

No diff preview for this file type.

+1 −5
Original line number Diff line number Diff line
#
# Copyright  All Contributors. See LICENSE and AUTHORS in the root directory for details.
#

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
+5 −6
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,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.
Loading