Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade branch 2.6.x using TemplateControl #13

Merged
merged 1 commit into from
May 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion play-java-chatroom-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-chatroom-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

2 changes: 1 addition & 1 deletion play-java-compile-di-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-compile-di-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-java-dagger2-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-dagger2-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-java-ebean-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "4.1.0")
2 changes: 1 addition & 1 deletion play-java-fileupload-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-fileupload-example/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.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

// Play enhancer - this automatically generates getters/setters for public fields
// and rewrites accessors of these fields to use the getters/setters. Remove this
Expand Down
2 changes: 1 addition & 1 deletion play-java-forms-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-forms-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-java-hello-world-tutorial/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-hello-world-tutorial/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-java-jpa-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-jpa-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resolvers += Resolver.sonatypeRepo("snapshots")

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

// Web plugins
addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.2")
Expand Down
2 changes: 1 addition & 1 deletion play-java-rest-api-example/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.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")
def gatlingVersion = getGlatlingVersion(scalaVersion)

Expand Down
2 changes: 1 addition & 1 deletion play-java-rest-api-example/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.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

// Load testing tool:
// http://gatling.io/docs/2.2.2/extensions/sbt_plugin.html
Expand Down
2 changes: 1 addition & 1 deletion play-java-starter-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-starter-example/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.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

// Play enhancer - this automatically generates getters/setters for public fields
// and rewrites accessors of these fields to use the getters/setters. Remove this
Expand Down
2 changes: 1 addition & 1 deletion play-java-streaming-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-streaming-example/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
resolvers += Resolver.typesafeRepo("releases")

// Use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-java-websocket-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-java-websocket-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.2")

Expand Down
2 changes: 1 addition & 1 deletion play-scala-anorm-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-anorm-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

2 changes: 1 addition & 1 deletion play-scala-chatroom-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def akkaVersion = '2.5.8'
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

Expand Down
2 changes: 1 addition & 1 deletion play-scala-chatroom-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-compile-di-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-compile-di-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-fileupload-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-fileupload-example/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ resolvers += Resolver.typesafeRepo("snapshots")
resolvers += Resolver.jcenterRepo

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-forms-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-forms-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-hello-world-tutorial/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-hello-world-tutorial/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-isolated-slick-example/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ addSbtPlugin("com.github.tototoshi" % "sbt-slick-codegen" % "1.3.0")
libraryDependencies += "com.h2database" % "h2" % "1.4.196"

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-log4j2-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def log4jVersion = '2.10.0'
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

Expand Down
2 changes: 1 addition & 1 deletion play-scala-log4j2-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-macwire-di-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-macwire-di-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-rest-api-example/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.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")
def gatlingVersion = "2.3.0"

Expand Down
2 changes: 1 addition & 1 deletion play-scala-rest-api-example/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.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

// sbt-paradox, used for documentation
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.3.3")
Expand Down
2 changes: 1 addition & 1 deletion play-scala-secure-session-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-secure-session-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-slick-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-slick-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-starter-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-starter-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-streaming-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-streaming-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
2 changes: 1 addition & 1 deletion play-scala-tls-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-tls-example/modules/one/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'play'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-tls-example/modules/two/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'play'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

model {
Expand Down
2 changes: 1 addition & 1 deletion play-scala-tls-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

2 changes: 1 addition & 1 deletion play-scala-websocket-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
}

def playVersion = "2.6.21"
def playVersion = "2.6.22"
def akkaVersion = '2.5.8'
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")

Expand Down
2 changes: 1 addition & 1 deletion play-scala-websocket-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")

addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.2")

Expand Down