diff options
author | Konrad `ktoso` Malawski <ktoso@project13.pl> | 2017-09-20 16:32:22 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-20 16:32:22 +0900 |
commit | 7c332d1d67b581e23163a90714fa15615996a7b8 (patch) | |
tree | e38509ffd689d673546f17f2a875cee5a583c3a4 /build.sbt | |
parent | 8a421f066e99359a3d6fa4cd64cded206376d264 (diff) | |
parent | 7089839dcfc1c91f195a4b1dcc6d7b60e40b210c (diff) | |
download | spray-json-7c332d1d67b581e23163a90714fa15615996a7b8.tar.gz spray-json-7c332d1d67b581e23163a90714fa15615996a7b8.tar.bz2 spray-json-7c332d1d67b581e23163a90714fa15615996a7b8.zip |
Merge pull request #236 from SethTisue/unpimp
replace pimp with 'rich', 'enrich', 'extension method'
Diffstat (limited to 'build.sbt')
-rw-r--r-- | build.sbt | 27 |
1 files changed, 19 insertions, 8 deletions
@@ -1,6 +1,6 @@ name := "spray-json" -version := "1.3.3" +version := "1.3.4-SNAPSHOT" organization := "io.spray" @@ -14,7 +14,7 @@ startYear := Some(2011) licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")) -scalaVersion := "2.11.8" +scalaVersion := "2.11.11" scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-Xlint", "-encoding", "utf8") @@ -44,28 +44,39 @@ osgiSettings OsgiKeys.exportPackage := Seq("""spray.json.*;version="${Bundle-Version}"""") -OsgiKeys.importPackage <<= scalaVersion { sv => Seq("""scala.*;version="$<range;[==,=+);%s>"""".format(sv)) } +OsgiKeys.importPackage := Seq("""scala.*;version="$<range;[==,=+);%s>"""".format(scalaVersion.value)) OsgiKeys.importPackage ++= Seq("""spray.json;version="${Bundle-Version}"""", "*") OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package") +// Migration Manager +mimaPreviousArtifacts := Set("io.spray" %% "spray-json" % "1.3.3") + /////////////// // publishing /////////////// -crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1") +crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3") -scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV) +scalaBinaryVersion := { + val sV = scalaVersion.value + if (CrossVersion.isScalaApiCompatible(sV)) + CrossVersion.binaryScalaVersion(sV) + else + sV +} publishMavenStyle := true useGpg := true -publishTo <<= version { v: String => +publishTo := { val nexus = "https://oss.sonatype.org/" - if (v.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots") - else Some("releases" at nexus + "service/local/staging/deploy/maven2") + if (version.value.trim.endsWith("SNAPSHOT")) + Some("snapshots" at nexus + "content/repositories/snapshots") + else + Some("releases" at nexus + "service/local/staging/deploy/maven2") } pomIncludeRepository := { _ => false } |