Updates to work with the latest gradle.. and get rid of groovy