Update files to work with latest gradle version