Improve Spark build wrt Scala version