From adf4a930ebf08a3f30c0367c5faa510a2341d701 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 4 Jun 2024 10:23:41 -0700 Subject: [PATCH 1/2] Gradle to 8.8 Summary: Just bumping our deps before the 0.75 branch cut. Changelog: [Internal] [Changed] - Gradle to 8.8 Differential Revision: D58143547 --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- .../helloworld/android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/helloworld/android/gradlew | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- packages/react-native-gradle-plugin/gradlew | 2 +- .../template/android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/react-native/template/android/gradlew | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7646dead06..6f7a6eb33e8 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.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42690..b740cf13397 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/packages/helloworld/android/gradle/wrapper/gradle-wrapper.properties b/packages/helloworld/android/gradle/wrapper/gradle-wrapper.properties index e7646dead06..6f7a6eb33e8 100644 --- a/packages/helloworld/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/helloworld/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/packages/helloworld/android/gradlew b/packages/helloworld/android/gradlew index 1aa94a42690..b740cf13397 100755 --- a/packages/helloworld/android/gradlew +++ b/packages/helloworld/android/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index e7646dead06..6f7a6eb33e8 100644 --- a/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/packages/react-native-gradle-plugin/gradlew b/packages/react-native-gradle-plugin/gradlew index 1aa94a42690..b740cf13397 100755 --- a/packages/react-native-gradle-plugin/gradlew +++ b/packages/react-native-gradle-plugin/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/packages/react-native/template/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native/template/android/gradle/wrapper/gradle-wrapper.properties index e7646dead06..6f7a6eb33e8 100644 --- a/packages/react-native/template/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/react-native/template/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/packages/react-native/template/android/gradlew b/packages/react-native/template/android/gradlew index 1aa94a42690..b740cf13397 100755 --- a/packages/react-native/template/android/gradlew +++ b/packages/react-native/template/android/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. From 21a4c01d8deb4b12a137fbf10f19966ba1e6fe22 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 4 Jun 2024 10:23:41 -0700 Subject: [PATCH 2/2] AGP to 8.4.1 Summary: Just another patch bump of our dependencies ahead of the branch cut Changelog: [Android] [Changed] - AGP to 8.4.1 Differential Revision: D58143546 --- packages/react-native-gradle-plugin/gradle/libs.versions.toml | 2 +- packages/react-native/gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native-gradle-plugin/gradle/libs.versions.toml b/packages/react-native-gradle-plugin/gradle/libs.versions.toml index f23cf63a901..344655dd2d6 100644 --- a/packages/react-native-gradle-plugin/gradle/libs.versions.toml +++ b/packages/react-native-gradle-plugin/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.4.0" +agp = "8.4.1" gson = "2.8.9" guava = "31.0.1-jre" javapoet = "1.13.0" diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml index 5c57a9a92ff..a6df4644311 100644 --- a/packages/react-native/gradle/libs.versions.toml +++ b/packages/react-native/gradle/libs.versions.toml @@ -6,7 +6,7 @@ compileSdk = "34" buildTools = "34.0.0" ndkVersion = "26.1.10909125" # Dependencies versions -agp = "8.4.0" +agp = "8.4.1" androidx-annotation = "1.6.0" androidx-appcompat = "1.6.1" androidx-autofill = "1.1.0"