Wip/scala version upgrade

One more time...