CGY:001 Migration to latest gradle