Update to build against gradle 2.1