Upgraded gradle and build system