Upgraded to gradle 2.X