Update to latest versions of gradle and dagger. Simplified gradle files