Skip to content

Commit

Permalink
Upgrade branch 2.6.x using TemplateControl (playframework#51)
Browse files Browse the repository at this point in the history
* Updated with template-control on 2018-07-19T01:58:56.003Z
  **build.sbt:
    scalaVersion := "2.12.6"
  **/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.17")
  **build.gradle:
    def playVersion = "2.6.17"

* Revert scala change
  • Loading branch information
marcospereira authored Jul 19, 2018
1 parent 4f2263b commit ad6a6f8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id "com.github.lkishalmi.gatling" version "0.7.1"
}

def playVersion = "2.6.16"
def playVersion = "2.6.17"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")
def gatlingVersion = getGlatlingVersion(scalaVersion)

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def gatlingVersion(scalaBinVer: String): String = scalaBinVer match {

inThisBuild(
List(
scalaVersion := "2.12.6",
scalaVersion := "2.12.6",
crossScalaVersions := Seq("2.11.12", "2.12.6"),
dependencyOverrides := Seq(
"org.codehaus.plexus" % "plexus-utils" % "3.0.18",
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.17")

// Load testing tool:
// http://gatling.io/docs/2.2.2/extensions/sbt_plugin.html
Expand Down

0 comments on commit ad6a6f8

Please sign in to comment.