updates to build with new gradle