Subject: Gradle build


+1 to option 2 to begin with. I don’t know if we need to wait for a major release for this change, but I think it may be easier to iterate while it’s only in master for a while.