Fixed analytics and upgraded gradle