diff --git a/project/build.properties b/project/build.properties index a6e117b6..64317fda 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.8 +sbt.version=0.13.15 diff --git a/src/main/scala/ReleasePlugin.scala b/src/main/scala/ReleasePlugin.scala index dc65497d..dc2f8e2d 100644 --- a/src/main/scala/ReleasePlugin.scala +++ b/src/main/scala/ReleasePlugin.scala @@ -201,6 +201,14 @@ object ReleasePlugin extends AutoPlugin { override def trigger = allRequirements + override val buildSettings: Seq[Setting[_]] = Seq( + releaseUseGlobalVersion := true, + + releaseTagName := s"v${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}", + releaseTagComment := s"Releasing ${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}", + releaseCommitMessage := s"Setting version to ${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}" + ) + override def projectSettings = Seq[Setting[_]]( releaseSnapshotDependencies := { val moduleIds = (managedClasspath in Runtime).value.flatMap(_.get(moduleID.key)) @@ -213,13 +221,8 @@ object ReleasePlugin extends AutoPlugin { releaseNextVersion := { ver => Version(ver).map(_.bump(releaseVersionBump.value).asSnapshot.string).getOrElse(versionFormatError) }, - releaseUseGlobalVersion := true, releaseCrossBuild := false, - releaseTagName := s"v${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}", - releaseTagComment := s"Releasing ${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}", - releaseCommitMessage := s"Setting version to ${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}", - releaseVcs := Vcs.detect(baseDirectory.value), releaseVcsSign := false, diff --git a/src/sbt-test/sbt-release/doge-integration/project/build.properties b/src/sbt-test/sbt-release/doge-integration/project/build.properties index 35c88bab..1a4e5e2d 100644 --- a/src/sbt-test/sbt-release/doge-integration/project/build.properties +++ b/src/sbt-test/sbt-release/doge-integration/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.12 +# not setting the sbt version explicitly will use the version for the current sbt cross-build