Upgrade gradle support