more work on Gradle transition