Updated project to use latest gradle plugin