From 3fda77f6d61afc7285491a1023f729a995297d78 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Fri, 25 Aug 2023 11:47:55 -0400 Subject: [PATCH 1/3] Update gradle to 7.5.1 --- DEPS | 4 +++- tools/gradle/README.md | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 tools/gradle/README.md diff --git a/DEPS b/DEPS index d99221aca6ec2..c519124f46dea 100644 --- a/DEPS +++ b/DEPS @@ -684,7 +684,9 @@ deps = { 'src/third_party/gradle': { 'packages': [ { - 'version': 'version:7.0.2', + # See tools/gradle/README.md for update instructions. + # Version here means the CIPD tag. + 'version': 'version:7.5.1', 'package': 'flutter/gradle' } ], diff --git a/tools/gradle/README.md b/tools/gradle/README.md new file mode 100644 index 0000000000000..fd837bd1246fd --- /dev/null +++ b/tools/gradle/README.md @@ -0,0 +1,26 @@ +# Updating gradle version used in engine repo + +The instructions in this README explain how to create a CIPD package that +contains the gradle build-time dependency of the Android embedding of the Engine. +The Android embedder is shipped to Flutter end-users, but gradle is not. + +## Requirements + +1. If you have a flutter/engine checkout, then you should already have +[Depot tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up) on your path. +1. Ensure you have write access for cipd. go/flutter-luci-cipd +1. Download the new version of gradle then Verify the checksum, +and unzip into a local directory. + +## Update CIPD Steps +These steps use gradle version 7.5.1 as an example. + +1. Unzip gradle into a folder `unzip gradle-7.5.1-all.zip` +1. Authenticate with cipd `cipd auth-login` +1. Run `cipd create -in gradle-7.5.1 -install-mode copy -tag version:7.5.1 -name flutter/gradle` +1. Update `engine/src/flutter/DEPS` gradle entry to contain the tag from the command above. +1. Run `gclient sync` to verify that dependency can be fetched. + +## Useful links +* CIPD gradle https://chrome-infra-packages.appspot.com/p/flutter/gradle/+/ +* Gradle Releases https://gradle.org/releases/ \ No newline at end of file From c8eb1ab5fd72a47f70cf7db7addffe9d3e5bb4ff Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Fri, 25 Aug 2023 12:26:44 -0400 Subject: [PATCH 2/3] format nit --- tools/gradle/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gradle/README.md b/tools/gradle/README.md index fd837bd1246fd..4c2286bbf5910 100644 --- a/tools/gradle/README.md +++ b/tools/gradle/README.md @@ -9,7 +9,7 @@ The Android embedder is shipped to Flutter end-users, but gradle is not. 1. If you have a flutter/engine checkout, then you should already have [Depot tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up) on your path. 1. Ensure you have write access for cipd. go/flutter-luci-cipd -1. Download the new version of gradle then Verify the checksum, +1. Download the new version of gradle then verify the checksum, and unzip into a local directory. ## Update CIPD Steps From 42c13226377d090bed8ba8068432cc13ab9a81cd Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Mon, 28 Aug 2023 11:06:08 -0400 Subject: [PATCH 3/3] Update to gradle 8.3 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index e849163daa0c6..05aa8e148a302 100644 --- a/DEPS +++ b/DEPS @@ -686,7 +686,7 @@ deps = { { # See tools/gradle/README.md for update instructions. # Version here means the CIPD tag. - 'version': 'version:7.5.1', + 'version': 'version:8.3', 'package': 'flutter/gradle' } ],