gradle-ized for 1.7 update