Update Gradle

Update Gradle version and misc.