Gradle 2.X compatibility

- not 100% sure about backward compat, but should be