Completed the new gradle build script / plugin