diff --git a/build.sbt b/build.sbt index 1c4fc112..16ae433a 100644 --- a/build.sbt +++ b/build.sbt @@ -2,6 +2,9 @@ import sbt.Keys._ lazy val baseVersion = "3.5.9" +lazy val akkaVersion = settingKey[String]("Version of Akka compiled against") +akkaVersion := "2.3.0" + // See crossrelease.sh for valid combinations of akkaVersion and crossScalaVersion. // Developed against 2.3.* (2.4.* for scala 2.12), see crossrelease.sh for all tested and build versions. @@ -24,7 +27,7 @@ version := { description := { val av = akkaVersion.value val akkaDescription = if (av.nonEmpty) "Akka " + av +" and " else "" - "metrics-scala for " + akkaDescription + "Scala " + sbt.cross.CrossVersionUtil.binaryScalaVersion(scalaVersion.value) + "metrics-scala for " + akkaDescription + "Scala " + CrossVersion.binaryScalaVersion(scalaVersion.value) } // Developed against 2.11, see crossrelease.sh for all tested and build versions. diff --git a/project/build.properties b/project/build.properties index 64317fda..7c58a83a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=1.2.6 diff --git a/project/build.scala b/project/build.scala deleted file mode 100644 index ceec5725..00000000 --- a/project/build.scala +++ /dev/null @@ -1,8 +0,0 @@ -import sbt._ -import Keys._ - -object MetricsScalaBuild extends Build { - lazy val akkaVersion = settingKey[String]("Version of Akka compiled against") - - akkaVersion := "2.3.0" -}