Re: [jfx11u] RFR: 8263760: Update gradle to version 7.0.1 [v2]
On Sun, 22 Aug 2021 11:32:58 GMT, Ambarish Rapte 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 > > Ambarish Rapte has updated the pull request incrementally with one additional > commit since the last revision: > > use antpluginImplementation Thanks. > We might remove the fxpackager part, but it doesn't hurt being there either. Since they aren't being built (and might no longer be buildable), we could consider backporting [JDK-8203379](https://bugs.openjdk.java.net/browse/JDK-8203379) to jfx11u remove the sources in a future update release. As it is, these sources serve no purpose other than as a source of "technical debt". - PR: https://git.openjdk.java.net/jfx11u/pull/49
Re: [jfx11u] RFR: 8263760: Update gradle to version 7.0.1 [v2]
On Sun, 22 Aug 2021 11:32:58 GMT, Ambarish Rapte 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 > > Ambarish Rapte has updated the pull request incrementally with one additional > commit since the last revision: > > use antpluginImplementation Marked as reviewed by jvos (Reviewer). Already did, but forgot to look at the results. Looks good to me. We might remove the fxpackager part, but it doesn't hurt being there either. - PR: https://git.openjdk.java.net/jfx11u/pull/49
Re: [jfx11u] RFR: 8263760: Update gradle to version 7.0.1 [v2]
On Sun, 22 Aug 2021 11:32:58 GMT, Ambarish Rapte 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 > > Ambarish Rapte has updated the pull request incrementally with one additional > commit since the last revision: > > use antpluginImplementation @johanvos can you also review this? - PR: https://git.openjdk.java.net/jfx11u/pull/49
Re: [jfx11u] RFR: 8263760: Update gradle to version 7.0.1 [v2]
On Sun, 22 Aug 2021 11:32:58 GMT, Ambarish Rapte 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 > > Ambarish Rapte has updated the pull request incrementally with one additional > commit since the last revision: > > use antpluginImplementation Marked as reviewed by kcr (Lead). - PR: https://git.openjdk.java.net/jfx11u/pull/49
Re: [jfx11u] RFR: 8263760: Update gradle to version 7.0.1 [v2]
On Fri, 20 Aug 2021 23:18:58 GMT, Kevin Rushforth wrote:
>> Ambarish Rapte has updated the pull request incrementally with one
>> additional commit since the last revision:
>>
>> use antpluginImplementation
>
> build.gradle line 2758:
>
>> 2756:
>> 2757: dependencies {
>> 2758: implementation group: "org.apache.ant", name: "ant", version:
>> "1.8.2"
>
> Shouldn't this be `antpluginImplementation`? It may not matter as much, since
> we don't build fxpackager by default in FX 11, but I still think it should be
> fixed.
This is corrected in next commit.
-
PR: https://git.openjdk.java.net/jfx11u/pull/49
Re: [jfx11u] RFR: 8263760: Update gradle to version 7.0.1 [v2]
> 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 Ambarish Rapte has updated the pull request incrementally with one additional commit since the last revision: use antpluginImplementation - Changes: - all: https://git.openjdk.java.net/jfx11u/pull/49/files - new: https://git.openjdk.java.net/jfx11u/pull/49/files/cea09bdf..1dc05179 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=jfx11u=49=01 - incr: https://webrevs.openjdk.java.net/?repo=jfx11u=49=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/jfx11u/pull/49.diff Fetch: git fetch https://git.openjdk.java.net/jfx11u pull/49/head:pull/49 PR: https://git.openjdk.java.net/jfx11u/pull/49
