Using gradle now. Updated everything accordingly