Update for gradle 2.0