Finish work on build.gradle