APPBASEPM-2966:
gradle.build refactoring