From f29b88137dd1db4f99ef5f279a5fe8f8f2b9590c Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 14 Jun 2021 04:05:21 +0000 Subject: [PATCH] Update sbt, scripted-plugin to 1.5.4 drop old sbt support --- build.sbt | 3 --- project/build.properties | 2 +- .../sbt-release/command-line-version-numbers/build.sbt | 2 ++ src/sbt-test/sbt-release/cross/test | 2 ++ src/sbt-test/sbt-release/exit-code/test | 2 ++ src/sbt-test/sbt-release/mercurial/test | 2 ++ src/sbt-test/sbt-release/skip-tests/test | 2 ++ src/sbt-test/sbt-release/tag-default/test | 2 ++ src/sbt-test/sbt-release/with-defaults/test | 2 ++ 9 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 0cc89419..8d4baebb 100644 --- a/build.sbt +++ b/build.sbt @@ -6,9 +6,6 @@ name := "sbt-release" homepage := Some(url("https://github.com/sbt/sbt-release")) licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")) -// Don't update crossSbtVersions! -// https://github.com/sbt/sbt/issues/5049 -crossSbtVersions := Vector("1.1.6") publishMavenStyle := true scalacOptions ++= Seq("-deprecation", "-feature", "-language:implicitConversions") diff --git a/project/build.properties b/project/build.properties index 0837f7a1..9edb75b7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.5.4 diff --git a/src/sbt-test/sbt-release/command-line-version-numbers/build.sbt b/src/sbt-test/sbt-release/command-line-version-numbers/build.sbt index 23b2b0aa..2633904e 100644 --- a/src/sbt-test/sbt-release/command-line-version-numbers/build.sbt +++ b/src/sbt-test/sbt-release/command-line-version-numbers/build.sbt @@ -1,6 +1,8 @@ import ReleaseTransformations._ import sbt.complete.DefaultParsers._ +name := "command-line-version-numbers" + publishTo := Some(Resolver.file("file", new File( "." )) ) releaseProcess := Seq[ReleaseStep]( diff --git a/src/sbt-test/sbt-release/cross/test b/src/sbt-test/sbt-release/cross/test index db453e3f..9284d8db 100644 --- a/src/sbt-test/sbt-release/cross/test +++ b/src/sbt-test/sbt-release/cross/test @@ -5,6 +5,8 @@ $ exec git init . $ exec git add . $ exec git commit -m init +> reload + > release with-defaults $ exists target/scala-2.11 -$ exists target/scala-2.10 diff --git a/src/sbt-test/sbt-release/exit-code/test b/src/sbt-test/sbt-release/exit-code/test index 1021fd18..afaa2de0 100644 --- a/src/sbt-test/sbt-release/exit-code/test +++ b/src/sbt-test/sbt-release/exit-code/test @@ -5,4 +5,6 @@ $ exec git init . $ exec git add . $ exec git commit -m init +> reload + > checkExitCodes diff --git a/src/sbt-test/sbt-release/mercurial/test b/src/sbt-test/sbt-release/mercurial/test index 83b3dbdf..80f4fb38 100644 --- a/src/sbt-test/sbt-release/mercurial/test +++ b/src/sbt-test/sbt-release/mercurial/test @@ -5,5 +5,7 @@ $ exec hg init . $ exec hg add . $ exec hg commit -m init +> reload + > release with-defaults $ exists target/scala-2.11 diff --git a/src/sbt-test/sbt-release/skip-tests/test b/src/sbt-test/sbt-release/skip-tests/test index 1a19d3ac..1336694c 100644 --- a/src/sbt-test/sbt-release/skip-tests/test +++ b/src/sbt-test/sbt-release/skip-tests/test @@ -5,6 +5,8 @@ $ exec git init . $ exec git add . $ exec git commit -m init +> reload + -> release with-defaults > release with-defaults skip-tests diff --git a/src/sbt-test/sbt-release/tag-default/test b/src/sbt-test/sbt-release/tag-default/test index 07836029..fd725a6c 100644 --- a/src/sbt-test/sbt-release/tag-default/test +++ b/src/sbt-test/sbt-release/tag-default/test @@ -5,6 +5,8 @@ $ exec git init . $ exec git add . $ exec git commit -m init +> reload + #prerequisite for the use case covered $ exec git tag v0.1.0 diff --git a/src/sbt-test/sbt-release/with-defaults/test b/src/sbt-test/sbt-release/with-defaults/test index 7c680579..07a0c8f9 100644 --- a/src/sbt-test/sbt-release/with-defaults/test +++ b/src/sbt-test/sbt-release/with-defaults/test @@ -5,5 +5,7 @@ $ exec git init . $ exec git add . $ exec git commit -m init +> reload + -> release > release with-defaults