From 0f84c259187988e8b32a7262ac08b27aceeeaf1e Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 22 Apr 2024 09:12:33 -0700 Subject: [PATCH 1/3] Bump legacy project Gradle version --- .ci/legacy_project/README.md | 4 ++++ .ci/legacy_project/all_packages/android/build.gradle | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci/legacy_project/README.md b/.ci/legacy_project/README.md index 0e23f626fb4..5c652c5659e 100644 --- a/.ci/legacy_project/README.md +++ b/.ci/legacy_project/README.md @@ -42,3 +42,7 @@ and then deleting everything but `android/` from it: - Updates `gradle-wrapper.properties` from `6.7` to `6.7.1`, to add support for the Kotlin gradle plugin. If a user runs into this error, the error message is clear on how to upgrade. +- Modifies `gradle-wrapper.properties` to upgrade the Android Gradle + Plugin Version (AGP) from version 4.1.0 to 7.0.0. If a user runs into + an error with the AGP version, the error message is clear on how to + upgrade the version to one that we support. diff --git a/.ci/legacy_project/all_packages/android/build.gradle b/.ci/legacy_project/all_packages/android/build.gradle index 0b4cf534e0a..08cb0aa3de9 100644 --- a/.ci/legacy_project/all_packages/android/build.gradle +++ b/.ci/legacy_project/all_packages/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.0.0' } } From 8534ad8850099186676332dd435680895105c70b Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 22 Apr 2024 09:19:57 -0700 Subject: [PATCH 2/3] Bump actual Gradle version --- .ci/legacy_project/README.md | 14 +++++++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.ci/legacy_project/README.md b/.ci/legacy_project/README.md index 5c652c5659e..022af2ba905 100644 --- a/.ci/legacy_project/README.md +++ b/.ci/legacy_project/README.md @@ -39,10 +39,14 @@ and then deleting everything but `android/` from it: jcenter.bintray.com shutdown. - Update `compileSdkVersion` from 30 to 33 to maintain compatibility with plugins that use API 34. -- Updates `gradle-wrapper.properties` from `6.7` to `6.7.1`, to add +- Updates `build.gradle` from `6.7` to `6.7.1`, to add support for the Kotlin gradle plugin. If a user runs into this error, the error message is clear on how to upgrade. -- Modifies `gradle-wrapper.properties` to upgrade the Android Gradle - Plugin Version (AGP) from version 4.1.0 to 7.0.0. If a user runs into - an error with the AGP version, the error message is clear on how to - upgrade the version to one that we support. +- Modifies `build.gradle` to upgrade the Android Gradle Plugin (AGP) + from version 4.1.0 to 7.0.0. If a user runs into an error with + the AGP version, the warning is clear on how to upgrade + the version to one that we support. +- Modifies `gradle-wrapper.properties` to upgrade the Gradle version + from 6.7.1 to 7.0.2. If a user runs into an error with the Gradle + version, the warning is clear on how to upgrade the version to + one that we support. \ No newline at end of file diff --git a/.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties b/.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties index 939efa2951b..b8793d3c0d6 100644 --- a/.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties +++ b/.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip From 56b33b8e67a1b25a6508c1c6ab50db6cc7bb9535 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Mon, 22 Apr 2024 11:28:51 -0700 Subject: [PATCH 3/3] Remove accidental change --- .ci/legacy_project/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/legacy_project/README.md b/.ci/legacy_project/README.md index 022af2ba905..1ee7313e73d 100644 --- a/.ci/legacy_project/README.md +++ b/.ci/legacy_project/README.md @@ -39,7 +39,7 @@ and then deleting everything but `android/` from it: jcenter.bintray.com shutdown. - Update `compileSdkVersion` from 30 to 33 to maintain compatibility with plugins that use API 34. -- Updates `build.gradle` from `6.7` to `6.7.1`, to add +- Updates `gradle-wrapper.properties` from `6.7` to `6.7.1`, to add support for the Kotlin gradle plugin. If a user runs into this error, the error message is clear on how to upgrade. - Modifies `build.gradle` to upgrade the Android Gradle Plugin (AGP)