From d5f334123629dd0cc331d5d9ebbb1a570739d8fb Mon Sep 17 00:00:00 2001 From: adamw Date: Tue, 25 Jul 2017 12:01:08 +0200 Subject: Preparing for sbt-release --- README.md | 15 +++++++-------- build.sbt | 18 +++++++++++++----- project/plugins.sbt | 6 ++++-- version.sbt | 1 + 4 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 version.sbt diff --git a/README.md b/README.md index b843226..8f1025b 100644 --- a/README.md +++ b/README.md @@ -66,12 +66,11 @@ sttp.get(uri"http://httpbin.org/ip").send() SBT dependency: ```scala -"com.softwaremill.sttp" %% "core" % version +"com.softwaremill.sttp" %% "core" % "0.0.1" ``` -Check the maven badge above or git tags for the latest version. `sttp` is -available for Scala 2.11 and 2.12, and requires Java 8. The core module has -no transitive dependencies. +`sttp` is available for Scala 2.11 and 2.12, and requires Java 8. The core +module has no transitive dependencies. If you'd like to use an alternate backend, [see below](#supported-backends) for additional instructions. @@ -193,7 +192,7 @@ implicit val sttpHandler = HttpURLConnectionSttpHandler To use, add the following dependency to your project: ```scala -"com.softwaremill.sttp" %% "akka-http-handler" % version +"com.softwaremill.sttp" %% "akka-http-handler" % "0.0.1" ``` This handler depends on [akka-http](http://doc.akka.io/docs/akka-http/current/scala/http/). @@ -252,11 +251,11 @@ val response: Future[Response[Source[ByteString, Any]]] = To use, add the following dependency to your project: ```scala -"com.softwaremill.sttp" %% "async-http-client-handler-future" % version +"com.softwaremill.sttp" %% "async-http-client-handler-future" % "0.0.1" // or -"com.softwaremill.sttp" %% "async-http-client-handler-scalaz" % version +"com.softwaremill.sttp" %% "async-http-client-handler-scalaz" % "0.0.1" // or -"com.softwaremill.sttp" %% "async-http-client-handler-monix" % version +"com.softwaremill.sttp" %% "async-http-client-handler-monix" % "0.0.1" ``` This handler depends on [async-http-handler](https://github.com/AsyncHttpClient/async-http-client). diff --git a/build.sbt b/build.sbt index 803c072..b70625d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,19 @@ val commonSettings = Seq( organization := "com.softwaremill.sttp", - version := "0.0.2", scalaVersion := "2.12.2", crossScalaVersions := Seq(scalaVersion.value, "2.11.8"), scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Xlint"), scalafmtOnCompile := true, scalafmtVersion := "1.0.0", - releaseEarlyWith := SonatypePublisher, + // publishing + publishTo := { + val nexus = "https://oss.sonatype.org/" + val (name, url) = + if (isSnapshot.value) + ("snapshots", nexus + "content/repositories/snapshots") + else ("releases", nexus + "service/local/staging/deploy/maven2") + Some(name at url) + }, publishArtifact in Test := false, publishMavenStyle := true, scmInfo := Some( @@ -17,9 +24,10 @@ val commonSettings = Seq( licenses := ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.txt")) :: Nil, homepage := Some(url("http://softwaremill.com/open-source")), - pgpPassphrase := sys.env.get("PGP_PASSWORD").map(_.toArray), - pgpPublicRing := file(".keys_pub.asc"), - pgpSecretRing := file(".keys_priv.asc") + // sbt-release + releaseCrossBuild := true, + releasePublishArtifactsAction := PgpKeys.publishSigned.value, + releaseIgnoreUntrackedFiles := true ) val akkaHttpVersion = "10.0.9" diff --git a/project/plugins.sbt b/project/plugins.sbt index ca2955f..7b64831 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,7 @@ addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.8") -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC5") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC8") -addSbtPlugin("ch.epfl.scala" % "sbt-release-early" % "1.0.4+8-2e879ede+20170721-1345") \ No newline at end of file +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") + +addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.5") \ No newline at end of file diff --git a/version.sbt b/version.sbt new file mode 100644 index 0000000..91ea14c --- /dev/null +++ b/version.sbt @@ -0,0 +1 @@ +version in ThisBuild := "0.0.1" -- cgit v1.2.3