Finalized gradle conversion