Fix Gradle 1.6 deprecation warnings