diff --git a/.travis.yml b/.travis.yml index a71e1fe..b91ba30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ scala: - 2.12.10 - 2.13.1 +git: + depth: false # Avoid sbt-dynver not seeing the tag + env: - TRAVIS_JDK=8 - TRAVIS_JDK=11 diff --git a/build.sbt b/build.sbt index b6e61f9..186a08b 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,10 @@ import com.typesafe.sbt.SbtScalariform._ -import com.typesafe.tools.mima.core._ import com.typesafe.tools.mima.plugin.MimaPlugin._ import interplay.ScalaVersions import scalariform.formatter.preferences._ +ThisBuild / dynverVTagPrefix := false + lazy val commonSettings = mimaDefaultSettings ++ Seq( // scalaVersion needs to be kept in sync with travis-ci scalaVersion := ScalaVersions.scala213, diff --git a/project/plugins.sbt b/project/plugins.sbt index 7ba416d..50e4686 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,3 +2,5 @@ addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.getOrElse("interplay. addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3") +// Even in samples projects +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") diff --git a/samples/compile-timeDI/build.sbt b/samples/compile-timeDI/build.sbt index c2be7a7..4bf88bb 100644 --- a/samples/compile-timeDI/build.sbt +++ b/samples/compile-timeDI/build.sbt @@ -3,14 +3,14 @@ import PlayKeys._ name := "compile-time-DI" -version := "1.0-SNAPSHOT" +ThisBuild / dynverVTagPrefix := false scalaVersion := "2.13.1" crossScalaVersions := Seq("2.12.10", "2.13.1") libraryDependencies ++= Seq( - "com.typesafe.play" %% "play-mailer" % "8.0.0-SNAPSHOT", + "com.typesafe.play" %% "play-mailer" % version.value, "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test ) diff --git a/samples/compile-timeDI/project/build.properties b/samples/compile-timeDI/project/build.properties index 6624da7..797e7cc 100644 --- a/samples/compile-timeDI/project/build.properties +++ b/samples/compile-timeDI/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.5 +sbt.version=1.3.10 diff --git a/samples/compile-timeDI/project/plugins.sbt b/samples/compile-timeDI/project/plugins.sbt index 0f63309..caf5f50 100644 --- a/samples/compile-timeDI/project/plugins.sbt +++ b/samples/compile-timeDI/project/plugins.sbt @@ -1 +1,2 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.8.0")) +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") diff --git a/samples/runtimeDI/build.sbt b/samples/runtimeDI/build.sbt index 292ecde..a6a2c36 100644 --- a/samples/runtimeDI/build.sbt +++ b/samples/runtimeDI/build.sbt @@ -3,14 +3,14 @@ import PlayKeys._ name := "runtime-DI" -version := "1.0-SNAPSHOT" +ThisBuild / dynverVTagPrefix := false scalaVersion := "2.13.1" crossScalaVersions := Seq("2.12.10", "2.13.1") libraryDependencies ++= Seq( - "com.typesafe.play" %% "play-mailer-guice" % "8.0.0-SNAPSHOT", + "com.typesafe.play" %% "play-mailer-guice" % version.value, "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test ) diff --git a/samples/runtimeDI/project/build.properties b/samples/runtimeDI/project/build.properties index 6624da7..797e7cc 100644 --- a/samples/runtimeDI/project/build.properties +++ b/samples/runtimeDI/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.5 +sbt.version=1.3.10 diff --git a/samples/runtimeDI/project/plugins.sbt b/samples/runtimeDI/project/plugins.sbt index 0f63309..caf5f50 100644 --- a/samples/runtimeDI/project/plugins.sbt +++ b/samples/runtimeDI/project/plugins.sbt @@ -1 +1,2 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.8.0")) +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") diff --git a/version.sbt b/version.sbt deleted file mode 100644 index 47a272f..0000000 --- a/version.sbt +++ /dev/null @@ -1 +0,0 @@ -version in ThisBuild := "8.0.1-SNAPSHOT"