diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | build.sbt | 43 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | publishing.tar.enc | bin | 0 -> 12816 bytes |
5 files changed, 30 insertions, 30 deletions
@@ -17,3 +17,5 @@ project/plugins/project/ .worksheet .idea* + +.keys* diff --git a/.travis.yml b/.travis.yml index e7541fa..79dd306 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,16 @@ jdk: scala: - 2.12.2 - 2.11.8 +deploy: +- sbt ++$TRAVIS_SCALA_VERSION releaseEarly +# Encrypted SONATYPE_USER, SONATYPE_PASSWORD, PGP_PASSWORD +env: + global: + - secure: Zfi22hRx5ObxSvEoNBDw81siEvQcz6st98uwF/Ota85F6wZHLDbr+/rCCzGohOdZwf0nZ1AsfYrfpdmF2n7Y4l3+mcoXI7utQdL7KqdKQf3ynCXQ40E5sjSmN5vxJZ97jdunIH9B1XAoV2fwp78nHHz8EL6KCQ/cJrvjn5IY0KZevwlattIBaRnT44dPCpboKYscZrBApZNbYfc48u3VF3goXRLXPDKH0s+XxkoapQcgT1Kdp0dBiNEsI9PXz8zrrjffX1uUA/gVh+xQBHcBbHrelMDF3KJwgzRAumJnlSpYc8mAE+8gjV2lQsdWWTgDWAIsDa9e87zKzyN9/AA1Gj3WkDNpGqxpvSLmQVkyNusz9Qt4sgl0ABH6eO76XY0MiUIxoDxq2YwQNKiPzJ480VLO8Qo0XHAPb9mgSY8Yti7OSiBHex9MnYdtZhrVxoqLFt4eSf0mZ/gzrlONLOcQAnOrW1VwGKzcx9VIJVZiXX7Rx/xYC5/wa3UhHzXuCOaiVtMpgiSHa7/xhTJURj5utt5anE6dEWqyfrzbLpv60tD4HiYYuy//Xv3Llv4g6bE8/OppVduevqGYvLE4+nrP0j02rLprDsDDjXc0u3/uhrOaw7BdjYAsN5FZaYjpFoU05ZcBPKabaDAQyM1K6awMknQaiKzEEX5V3f/LJIBRVUQ= + - secure: sQTZnq6HcxhyX7djytwdwRYUdfe9bEVYyw5ukh/NqSifyu7YdOj4e10IV4Q2MYydfd+kWrhyw12x0gGDK5oCdBM0rk86I4bI77Oa7HUN1fAXgdqQRtDLtizzGVWG4W7P2rLVOQ/25JudksB3tJZ6Iudx8/R5oN1akqQFAXl79kQBZqhZsDNtHNciyqEzxmHyHXyW4JOjRuvjld+HD5Z75BgV7iAXkYFlzeKaN1pgafL9xTop+wcIgjip6ukQmfpBmecTxPX7Y5ZBEsMCnk+L2XcmzaWsyEjBoUUuTvB+0+L0oRjv9GjxCgMVQuncKv9ZI2dMyc6twwvle8xl0ZzOptQUX6o16SjYH3ysC3sUtgvVCfHYYmu5l0HwLIq/Ygeq7tNtZkFD2Dqhxj74xOU0EX9zBE1oFYcbnY8p1RW9u9lYiOYV5bCKpyxr50isocxRFDyB+wiamlD18pO4+5BsxZJS3/IfvBPsoxciX5pTnvvKp8V7f6k4o9HjJfzllw4bK1ecYd9rfYMt0WDnvqBQNHcY+PM/7Due1mfa5ZWPKBk9K8fbOWWMHtWwRNWlB8FEECp4HRCmQFF+DdXfMnvl6Ps5w/F2kFPFIMZO0BKlx6OPbL1raRl3p0M+txjIJkZY+8FVrVTMM2CwK/6/B3VGesq0+QYFlpLT2hdcLStyL9s= + - secure: TSx13PfwEQSurAXx4GV7gO+l6TX1i4FNCyI5kCsTa1KvHUR2NRgmZ4KdpaakT1C3K406opGWnuSp4F5JkFghqt0/mod9ip7r6LqmWi9wzfzQWPzz3KEVosJH4CLeFCFBfJLBkyNHb5rux9oCcA62InCf+rWPnTUBrQPw1dvg+nisfe0kCkyrlx5Db08pMoZRLwr5UbRIhoLffqH+3/ENaAxNqN8AqfSGexRH91h7nSB5GOd3lZ75MsErV+xq5QkhINOqanKV8OA6KvlEApPKmAG5iL8a9KOuNbKLQXKBFZINILhowC2gmlVBirJiNUitpg6wqcjfI8492IahKLatI65h7whLgk1Zr/Sa6rLRcg7dSB3emwWR7S0PZQSemzI0K9YAdFIlrcRf2Y9MdGzHEDgKaTD/8/GXJdM/L0F8uvgrhZ/5oDMORMaebXm+0aCUy88S/+WL1GsNsXf5baCFEYm0XWXcPbiVP9HdUhXIUhADDxluKrCUv6T99lkW69jpH+lLepQaooKwNuWjdqbGJTOirfA8uD5NFFbZIyBKW1ecYKrNL0MNIuO9gTqRHBy98yQXPzuqWVTjYv7oLUHzSrRxD8qoRgZLHIAXo4AGTU5YJltta9QBzJgghiJcuZxTPiReGPDIvBPtI2Aj7yQViKXnsJV1yISwWgR/mfGz6TI= +# Bundle with gpg keys for signing artifacts +before_install: +- openssl aes-256-cbc -K $encrypted_8b08496906c9_key -iv $encrypted_8b08496906c9_iv + -in publishing.tar.enc -out publishing.tar -d +- tar xvf publishing.tar @@ -1,42 +1,25 @@ val commonSettings = Seq( organization := "com.softwaremill.sttp", - version := "0.0.1", + version := "0.0.2", scalaVersion := "2.12.2", crossScalaVersions := Seq(scalaVersion.value, "2.11.8"), scalacOptions ++= Seq("-unchecked", "-deprecation"), scalafmtOnCompile := true, scalafmtVersion := "1.0.0", - // Sonatype OSS deployment - 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) - }, - credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"), + releaseEarlyWith := SonatypePublisher, + publishArtifact in Test := false, publishMavenStyle := true, - pomIncludeRepository := { _ => - false - }, - pomExtra := ( - <scm> - <url>git@github.com/softwaremill/sttp.git</url> - <connection>scm:git:git@github.com/softwaremill/sttp.git</connection> - </scm> - <developers> - <developer> - <id>adamw</id> - <name>Adam Warski</name> - <url>http://www.warski.org</url> - </developer> - </developers> - ), + scmInfo := Some( + ScmInfo(url("https://github.com/softwaremill/sttp"), + "scm:git:git@github.com/softwaremill/sttp.git")), + developers := List( + Developer("adamw", "Adam Warski", "", url("https://softwaremill.com"))), licenses := ("Apache-2.0", - new java.net.URL( - "http://www.apache.org/licenses/LICENSE-2.0.txt")) :: Nil, - homepage := Some(new java.net.URL("http://softwaremill.com/open-source")) + 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") ) val akkaHttpVersion = "10.0.9" diff --git a/project/plugins.sbt b/project/plugins.sbt index 986926d..ca2955f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,5 @@ addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.8") addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC5") + +addSbtPlugin("ch.epfl.scala" % "sbt-release-early" % "1.0.4+8-2e879ede+20170721-1345")
\ No newline at end of file diff --git a/publishing.tar.enc b/publishing.tar.enc Binary files differnew file mode 100644 index 0000000..e827ddf --- /dev/null +++ b/publishing.tar.enc |