Updated to use gradle-common