From 23edf55cc868fab2de76d4a330cef8f5329f4aa3 Mon Sep 17 00:00:00 2001 From: Lev Khomich Date: Thu, 17 Aug 2017 03:00:45 +0500 Subject: [PATCH] bump sbt and sbt-mima-plugin versions, fix build warning --- build.sbt | 11 +++++------ project/build.properties | 2 +- project/plugins.sbt | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 5a272f9..ca3807c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,6 @@ import sbt._ import Keys._ -import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings import org.scoverage.coveralls.CoverallsPlugin import sbtdoge.CrossPerProjectPlugin @@ -26,7 +25,7 @@ lazy val root = (project in file(".")).settings(commonSettings).settings( publishLocal := (), // workaround for sbt-pgp packagedArtifacts := Map.empty, - previousArtifact := None + mimaPreviousArtifacts := Set.empty ).aggregate(`akka-tracing-core`, `akka-tracing-play`, `akka-tracing-http`).enablePlugins(CrossPerProjectPlugin) lazy val `akka-tracing-core` = (project in file("core")).settings(commonSettings).settings( @@ -42,7 +41,7 @@ lazy val `akka-tracing-core` = (project in file("core")).settings(commonSettings lazy val `akka-tracing-play` = (project in file("play")).settings(commonSettings).settings( crossScalaVersions := Seq("2.11.11"), libraryDependencies ++= Dependencies.play ++ Dependencies.testPlay(scalaVersion.value), - previousArtifact := None + mimaPreviousArtifacts := Set.empty ).dependsOn(`akka-tracing-core` % passTestDeps) lazy val `akka-tracing-http` = (project in file("akka-http")).settings(commonSettings).settings( @@ -78,14 +77,14 @@ lazy val testSettings = CoverallsPlugin.projectSettings ++ mimaDefaultSettings ++ Seq( - previousArtifact := Some(organization.value % (moduleName.value + '_' + scalaBinaryVersion.value) % "0.4"), + mimaPreviousArtifacts := Set(organization.value % (moduleName.value + '_' + scalaBinaryVersion.value) % "0.4"), scalacOptions in Test ++= Seq("-Yrangepos") ) lazy val publicationSettings = Seq( publishMavenStyle := true, - publishTo <<= version { v => - if (v.endsWith("SNAPSHOT")) + publishTo := { + if (version.value.endsWith("SNAPSHOT")) Some(Resolver.sonatypeRepo("snapshots")) else Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2") diff --git a/project/build.properties b/project/build.properties index 35c88ba..c091b86 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.12 +sbt.version=0.13.16 diff --git a/project/plugins.sbt b/project/plugins.sbt index 65eccef..d82bf50 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,6 +6,6 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.7") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.17") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.0")