Even more gradleification