Updated gradle and gradle plugin