Wip/scala version upgrade