Updated for latest Gradle plugin