merge gradle scripts from vshcryabets pull request