From 98d17419d07b010941930d6bb3b6f3496fd460dc Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Fri, 14 Aug 2026 08:33:28 +0900 Subject: [PATCH] [2.x] test: Fix project-matrix test TODO (#9596) --- sbt-app/src/sbt-test/project-matrix/plugin/build.sbt | 12 ------------ sbt-app/src/sbt-test/project-matrix/plugin/test | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/sbt-app/src/sbt-test/project-matrix/plugin/build.sbt b/sbt-app/src/sbt-test/project-matrix/plugin/build.sbt index 73b17dc2e..5deac1768 100644 --- a/sbt-app/src/sbt-test/project-matrix/plugin/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/plugin/build.sbt @@ -4,23 +4,11 @@ val scala212 = "2.12.21" organization := "com.example" version := "0.1.0-SNAPSHOT" -lazy val checkSbt2Plugin = taskKey[Unit]("") - lazy val plugin = (projectMatrix in file("plugin")) .enablePlugins(SbtPlugin) .settings( organization := "com.example", name := "sbt-example", - // TODO: Once 2.0 is released we can move this check to the `test` file - checkSbt2Plugin := { - val repo = (ThisBuild / baseDirectory).value / "repo" - val sbtV = sbtBinaryVersion.value - val expected = (repo / "com" / "example" / - s"sbt-example_sbt${sbtV}_3" / - "0.1.0-SNAPSHOT" / - s"sbt-example_sbt${sbtV}_3-0.1.0-SNAPSHOT.pom") - assert(expected.exists, s"$expected did not exist") - }, ) .jvmPlatform(scalaVersions = Seq(scala3, scala212)) diff --git a/sbt-app/src/sbt-test/project-matrix/plugin/test b/sbt-app/src/sbt-test/project-matrix/plugin/test index c478cd9e0..9be130db9 100644 --- a/sbt-app/src/sbt-test/project-matrix/plugin/test +++ b/sbt-app/src/sbt-test/project-matrix/plugin/test @@ -5,4 +5,4 @@ $ exists repo/com/example/sbt-example_2.12_1.0/0.1.0-SNAPSHOT/sbt-example_2.12_1.0-0.1.0-SNAPSHOT.pom $ absent repo/com/example/sbt-example_2.12_1.0/0.1.0-SNAPSHOT/sbt-example-0.1.0-SNAPSHOT.pom -> checkSbt2Plugin +$ exists repo/com/example/sbt-example_sbt2_3/0.1.0-SNAPSHOT/sbt-example_sbt2_3-0.1.0-SNAPSHOT.pom