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

Require Akka 2.5.10 and use the new version checker utility #1880

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
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class HttpExt private[http] (private val config: Config)(implicit val system: Ex
with DefaultSSLContextCreation {

akka.http.Version.check(system.settings.config)
akka.AkkaVersion.require("akka-http", akka.http.Version.supportedAkkaVersion)

import Http._

Expand Down
1 change: 0 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ object Dependencies {
val h2specUrl = s"https://github.com/summerwind/h2spec/releases/download/v${h2specVersion}/${h2specName}.zip"
val alpnAgentVersion = "2.0.7"

lazy val akkaVersion = settingKey[String]("The version of Akka to use.")
lazy val scalaTestVersion = settingKey[String]("The version of ScalaTest to use.")
lazy val specs2Version = settingKey[String]("The version of Specs2 to use")
lazy val scalaCheckVersion = settingKey[String]("The version of ScalaCheck to use.")
Expand Down
3 changes: 2 additions & 1 deletion project/VersionGenerator.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ object VersionGenerator {
|
|object Version {
| val current: String = "%s"
| val supportedAkkaVersion = "%s"
| def check(config: Config): Unit = {
| val configVersion = config.getString("akka.http.version")
| if (configVersion != current) {
Expand All @@ -37,7 +38,7 @@ object VersionGenerator {

def generateVersion(dir: SettingKey[File], locate: File => File, template: String) = Def.task[Seq[File]] {
val file = locate(dir.value)
val content = template.stripMargin.format(version.value)
val content = template.stripMargin.format(version.value, AkkaDependency.akkaVersion)
if (!file.exists || IO.read(file) != content) IO.write(file, content)
Seq(file)
}
Expand Down