Updating gradle plugin and fixing list issue