fixed gradle warnings
updated for 1.7 (untested)