Beta 6: Conversion to Gradle