move to M7 version of scala