Upgraded scala and problem1 to match current scala