From c33b795c78ad36229fba10be5564fb35d4f0e00e Mon Sep 17 00:00:00 2001
From: kenji yoshida <6b656e6a69@gmail.com>
Date: Tue, 16 Jun 2026 01:28:14 +0900
Subject: [PATCH] [2.x] ci: Update version and ivy tests (#9342)

---
 build.sbt                                                | 2 +-
 .../platform-publish/project/plugins.sbt                 | 9 +++++----
 sbt-app/src/sbt-test/ivy/build-deps/project/plugins.sbt  | 9 +++++----
 .../sbt-test/ivy/deliver-artifacts/project/plugins.sbt   | 9 +++++----
 .../ivy/exclude-dependencies/project/plugins.sbt         | 9 +++++----
 .../src/sbt-test/ivy/make-ivy-xml/project/plugins.sbt    | 9 +++++----
 .../src/sbt-test/ivy/provided-multi/project/plugins.sbt  | 9 +++++----
 7 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/build.sbt b/build.sbt
index 4f4cce548..1157e3a99 100644
--- a/build.sbt
+++ b/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
diff --git a/sbt-app/src/sbt-test/dependency-management/platform-publish/project/plugins.sbt b/sbt-app/src/sbt-test/dependency-management/platform-publish/project/plugins.sbt
index 0a6624c35..938089c9a 100644
--- a/sbt-app/src/sbt-test/dependency-management/platform-publish/project/plugins.sbt
+++ b/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,
+)
diff --git a/sbt-app/src/sbt-test/ivy/build-deps/project/plugins.sbt b/sbt-app/src/sbt-test/ivy/build-deps/project/plugins.sbt
index abe6a97a4..15c7fdd35 100644
--- a/sbt-app/src/sbt-test/ivy/build-deps/project/plugins.sbt
+++ b/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,
+)
diff --git a/sbt-app/src/sbt-test/ivy/deliver-artifacts/project/plugins.sbt b/sbt-app/src/sbt-test/ivy/deliver-artifacts/project/plugins.sbt
index abe6a97a4..15c7fdd35 100644
--- a/sbt-app/src/sbt-test/ivy/deliver-artifacts/project/plugins.sbt
+++ b/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,
+)
diff --git a/sbt-app/src/sbt-test/ivy/exclude-dependencies/project/plugins.sbt b/sbt-app/src/sbt-test/ivy/exclude-dependencies/project/plugins.sbt
index abe6a97a4..15c7fdd35 100644
--- a/sbt-app/src/sbt-test/ivy/exclude-dependencies/project/plugins.sbt
+++ b/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,
+)
diff --git a/sbt-app/src/sbt-test/ivy/make-ivy-xml/project/plugins.sbt b/sbt-app/src/sbt-test/ivy/make-ivy-xml/project/plugins.sbt
index abe6a97a4..15c7fdd35 100644
--- a/sbt-app/src/sbt-test/ivy/make-ivy-xml/project/plugins.sbt
+++ b/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,
+)
diff --git a/sbt-app/src/sbt-test/ivy/provided-multi/project/plugins.sbt b/sbt-app/src/sbt-test/ivy/provided-multi/project/plugins.sbt
index abe6a97a4..15c7fdd35 100644
--- a/sbt-app/src/sbt-test/ivy/provided-multi/project/plugins.sbt
+++ b/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,
+)