Upgrade to new gradle version