changes to build files for gradle upgrade