Upgrade to Gradle 1.6