Upgrade gradle
Fix syntax error and static class error