Convert to Gradle and update for 1.7