=pro Cleaner way to declare Scala Version dependent dependencies

Port of PR #15887 to master