Another fix for deprecated gradle construct