Skip to content

Commit

Permalink
Upgrade branch 2.6.x using TemplateControl (playframework#54)
Browse files Browse the repository at this point in the history
* Updated with template-control on 2018-08-20T20:37:13.676Z
  **build.sbt:
    scalaVersion := "2.12.6"
  **/build.properties:
    sbt.version=1.2.1
  **/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.18")
  **build.gradle:
    def playVersion = "2.6.18"
  **gradle/wrapper/gradle-wrapper.properties:
    distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

* Revert scala version change
  • Loading branch information
marcospereira authored Aug 21, 2018
1 parent ad6a6f8 commit 9ca5a71
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 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.17"
def playVersion = "2.6.18"
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 gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.6
sbt.version=1.2.1
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.17")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.18")

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

0 comments on commit 9ca5a71

Please sign in to comment.