Feature/update scala dep

Supercedes #263