updated for newer gradle versions and removed some warnings