Skip to content

Commit

Permalink
bump sbt and sbt-mima-plugin versions, fix build warning
Browse files Browse the repository at this point in the history
  • Loading branch information
levkhomich committed Aug 16, 2017
1 parent 2704d83 commit 23edf55
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions 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
Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=0.13.12
sbt.version=0.13.16
2 changes: 1 addition & 1 deletion project/plugins.sbt
Expand Up @@ -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")

0 comments on commit 23edf55

Please sign in to comment.