From fcf6257b1a3dcce0e3fccafa89d2390385e1dc10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= Date: Thu, 9 Jan 2025 16:21:45 +0100 Subject: [PATCH] Bump Gradle 8.11.1 -> 8.12 Change tasks.create to tasks.register as create is deprecated --- app-k9mail/build.gradle.kts | 2 +- app-thunderbird/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts index 289c5804958..ebd361df004 100644 --- a/app-k9mail/build.gradle.kts +++ b/app-k9mail/build.gradle.kts @@ -174,7 +174,7 @@ dependencyGuard { configuration("fullReleaseRuntimeClasspath") } -tasks.create("printVersionInfo") { +tasks.register("printVersionInfo") { val targetBuildType = project.findProperty("buildType") ?: "debug" doLast { diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts index 5c72fc3ba10..fb658192850 100644 --- a/app-thunderbird/build.gradle.kts +++ b/app-thunderbird/build.gradle.kts @@ -260,7 +260,7 @@ dependencyGuard { configuration("fullReleaseRuntimeClasspath") } -tasks.create("printConfigurations") { +tasks.register("printConfigurations") { doLast { configurations.forEach { configuration -> println("Configuration: ${configuration.name}") @@ -271,7 +271,7 @@ tasks.create("printConfigurations") { } } -tasks.create("printVersionInfo") { +tasks.register("printVersionInfo") { val targetBuildType = project.findProperty("buildType") ?: "debug" val targetFlavorName = project.findProperty("flavorName") ?: "full" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fe16f2a6e50..974f59eebd8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -56,7 +56,7 @@ detektPluginCompose = "0.4.18" fastAdapter = "5.7.0" forkhandlesBom = "2.20.0.0" glide = "4.16.0" -gradle = "8.11.1" +gradle = "8.12" http4kBom = "5.35.2.0" icu4j = "72.1" javaDiffUtils = "4.12" @@ -71,7 +71,7 @@ jzlib = "1.0.7" koinBom = "3.5.6" kotlinBom = "2.1.0" # Needs to match the version used by Gradle, just check with `./gradlew --version` -kotlinGradleBom = "2.0.20" +kotlinGradleBom = "2.0.21" kotlinKsp = "2.1.0-1.0.29" kotlinxCoroutines = "1.9.0" kotlinxCollectionsImmutable = "0.3.8" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c1d5e018598..e0fd02028bc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6b1..f3b75f3b0d4 100755 --- a/gradlew +++ b/gradlew @@ -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