[2.x] ci: Update version and ivy tests (#9342)

build.sbt

@@ -11,7 +11,7 @@ import com.eed3si9n.jarjarabrams.ModuleCoordinate
 // ThisBuild settings take lower precedence,
 // but can be shared across the multi projects.
 ThisBuild / version := {
-  val v = "2.0.0-RC15-bin-SNAPSHOT"
+  val v = "2.0.1-bin-SNAPSHOT"
   nightlyVersion.getOrElse(v)
 }
 // update sbt.sh at root

sbt-app/src/sbt-test/dependency-management/platform-publish/project/plugins.sbt

@@ -1,5 +1,6 @@
 // sbt-ivy provides the Ivy publish backend exercised by the `ivyfull` project.
-libraryDependencies += {
-  val sbtV = sbtVersion.value
-  ("org.scala-sbt" % s"sbt-ivy_sbt${sbtV}_${scalaBinaryVersion.value}" % sbtV).intransitive()
-}
+libraryDependencies += Defaults.sbtPluginExtra(
+  "org.scala-sbt" % "sbt-ivy" % sbtVersion.value,
+  sbtVersion.value,
+  scalaVersion.value,
+)

sbt-app/src/sbt-test/ivy/build-deps/project/plugins.sbt

@@ -1,4 +1,5 @@
-libraryDependencies += {
-  val sbtV = sbtVersion.value
-  ("org.scala-sbt" % s"sbt-ivy_sbt${sbtV}_${scalaBinaryVersion.value}" % sbtV).intransitive()
-}
+libraryDependencies += Defaults.sbtPluginExtra(
+  "org.scala-sbt" % "sbt-ivy" % sbtVersion.value,
+  sbtVersion.value,
+  scalaVersion.value,
+)

sbt-app/src/sbt-test/ivy/deliver-artifacts/project/plugins.sbt

@@ -1,4 +1,5 @@
-libraryDependencies += {
-  val sbtV = sbtVersion.value
-  ("org.scala-sbt" % s"sbt-ivy_sbt${sbtV}_${scalaBinaryVersion.value}" % sbtV).intransitive()
-}
+libraryDependencies += Defaults.sbtPluginExtra(
+  "org.scala-sbt" % "sbt-ivy" % sbtVersion.value,
+  sbtVersion.value,
+  scalaVersion.value,
+)

sbt-app/src/sbt-test/ivy/exclude-dependencies/project/plugins.sbt

@@ -1,4 +1,5 @@
-libraryDependencies += {
-  val sbtV = sbtVersion.value
-  ("org.scala-sbt" % s"sbt-ivy_sbt${sbtV}_${scalaBinaryVersion.value}" % sbtV).intransitive()
-}
+libraryDependencies += Defaults.sbtPluginExtra(
+  "org.scala-sbt" % "sbt-ivy" % sbtVersion.value,
+  sbtVersion.value,
+  scalaVersion.value,
+)

sbt-app/src/sbt-test/ivy/make-ivy-xml/project/plugins.sbt

@@ -1,4 +1,5 @@
-libraryDependencies += {
-  val sbtV = sbtVersion.value
-  ("org.scala-sbt" % s"sbt-ivy_sbt${sbtV}_${scalaBinaryVersion.value}" % sbtV).intransitive()
-}
+libraryDependencies += Defaults.sbtPluginExtra(
+  "org.scala-sbt" % "sbt-ivy" % sbtVersion.value,
+  sbtVersion.value,
+  scalaVersion.value,
+)

sbt-app/src/sbt-test/ivy/provided-multi/project/plugins.sbt

@@ -1,4 +1,5 @@
-libraryDependencies += {
-  val sbtV = sbtVersion.value
-  ("org.scala-sbt" % s"sbt-ivy_sbt${sbtV}_${scalaBinaryVersion.value}" % sbtV).intransitive()
-}
+libraryDependencies += Defaults.sbtPluginExtra(
+  "org.scala-sbt" % "sbt-ivy" % sbtVersion.value,
+  sbtVersion.value,
+  scalaVersion.value,
+)