upgraded and fixed gradle setup