Cleanup gradle and fix java seven requirement