Upgrade Gradle to latest as well