Updated for latest Gradle plugin

Also made language level changes for Java 1.7