Fixing deprecated gradle issues