Skip to content

Commit

Permalink
Enable sbt-dynver (#180)
Browse files Browse the repository at this point in the history
  • Loading branch information
ennru committed May 18, 2020
1 parent 010622f commit 6e37d72
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion 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,
Expand Down
2 changes: 2 additions & 0 deletions project/plugins.sbt
Expand Up @@ -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")
4 changes: 2 additions & 2 deletions samples/compile-timeDI/build.sbt
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion samples/compile-timeDI/project/build.properties
@@ -1 +1 @@
sbt.version=1.3.5
sbt.version=1.3.10
1 change: 1 addition & 0 deletions 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")
4 changes: 2 additions & 2 deletions samples/runtimeDI/build.sbt
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion samples/runtimeDI/project/build.properties
@@ -1 +1 @@
sbt.version=1.3.5
sbt.version=1.3.10
1 change: 1 addition & 0 deletions 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")
1 change: 0 additions & 1 deletion version.sbt

This file was deleted.

0 comments on commit 6e37d72

Please sign in to comment.