From c6ef392027a9561821e70664ece8dedd4ce2e2b3 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Mon, 25 Mar 2024 10:52:29 +0100 Subject: [PATCH] fix scripted --- .../evicted-semver-spec/build.sbt | 11 +---------- .../dependency-management/evicted-semver-spec/test | 5 +++-- .../evicted-semver-spec/v1.0.0/LibraryTest.scala | 3 --- .../evicted-semver-spec/v1.1.0/LibraryTest.scala | 3 --- 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/v1.0.0/LibraryTest.scala delete mode 100644 sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/v1.1.0/LibraryTest.scala diff --git a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/build.sbt b/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/build.sbt index 9460b811d..2fd840665 100644 --- a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/build.sbt @@ -13,22 +13,13 @@ def commonSettings: Seq[Def.Setting[_]] = resolvers += MavenCache("local-maven", (LocalRootProject / target).value / "local-maven"), ) -lazy val root = (project in file(".")) - .settings(commonSettings) - -val `v1-0-0` = (project in file("v1.0.0")) +val semverSpecTest = project .settings(commonSettings) .settings( name := "semver-spec-test", version := "1.0.0", ) -val `v1-1-0` = (project in file("v1.1.0")) - .settings(commonSettings) - .settings( - name := "semver-spec-test", - version := "1.1.0", - ) val middle = project .settings(commonSettings) diff --git a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/test b/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/test index 93ed91f57..e8b982fcf 100644 --- a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/test +++ b/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/test @@ -1,5 +1,6 @@ -> v1-0-0/publish -> v1-1-0/publish +> semverSpecTest/publish +> set semverSpecTest/version := "1.1.0" +> semverSpecTest/publish > middle/publish > use/check diff --git a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/v1.0.0/LibraryTest.scala b/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/v1.0.0/LibraryTest.scala deleted file mode 100644 index fbfda9e74..000000000 --- a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/v1.0.0/LibraryTest.scala +++ /dev/null @@ -1,3 +0,0 @@ -package example - -trait Foo {} diff --git a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/v1.1.0/LibraryTest.scala b/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/v1.1.0/LibraryTest.scala deleted file mode 100644 index fbfda9e74..000000000 --- a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/v1.1.0/LibraryTest.scala +++ /dev/null @@ -1,3 +0,0 @@ -package example - -trait Foo {}