On Fri, 20 Aug 2021 20:13:18 GMT, Ambarish Rapte <ara...@openjdk.org> wrote:
> There were two minor merge conflicts in `build.gradle` and one conflict in > `gradle/wrapper/gradle-wrapper.properties` while cherry picking the change. > And it also required similar changes to be made for project fxpackager. The > [first > commit](https://github.com/openjdk/jfx11u/pull/49/commits/7700a6d1a7c82df8fc269f1de6f3bd5119fb3397) > is the original cherry pick and [second > commit](https://github.com/openjdk/jfx11u/pull/49/commits/cea09bdfc96374ce00560c13e6730ab76f8b20e9) > is the additional changes for fxpackager. > Verified the build on all three platforms with gradle 7.0.1 and apache ant > 1.10.5 This pull request has now been integrated. Changeset: 80c06708 Author: Ambarish Rapte <ara...@openjdk.org> URL: https://git.openjdk.java.net/jfx11u/commit/80c06708932bc28b7d76cd40cad39c50422788bf Stats: 148 lines in 13 files changed: 46 ins; 5 del; 97 mod 8263760: Update gradle to version 7.0.1 8240336: JavaFX build uses deprecated features that will be removed in gradle 7 8262236: Configure Gradle checksum verification Reviewed-by: kcr, jvos Backport-of: 111bac4180a646662a81223bdbb56880789d5a90 ------------- PR: https://git.openjdk.java.net/jfx11u/pull/49
