Scala upgrade