Release 1.6.2 (#375)

Release 1.6.2
- merge readme with that of 2.0/master
- merge changelog with that of 2.0/master
- update package version

CHANGELOG.md

@@ -1,27 +1,42 @@
-## 1.6.0 (2017-07-06)
+# Latest
+
+## 2.0.0
+
+- official full release after -alpha and -beta releases
+- Readme updates related to releasing 2.0 - [#376]
+- See the [latest documentation](https://hexdocs.pm/stripity_stripe/api-reference.html) to track what's supported
+
+This is a huge release and we are likely to have missed bugs. Feel free to provide feedback, create issues and contribute with pull requests.
+
+# 1.x.x
+
+## 1.6.2 (2018-06-05)
+
+- Readme updates related to releasing 2.0 - [#372], [#373], [#375]
 
-Changes:
+## 1.6.1 (2018-04-03)
 
-- Added support to update invoices (`&Stripe.Invoices.change/2`, `&Stripe.Invoices.change/3`)
-  - https://github.com/code-corps/stripity_stripe/pull/241
+- We now return {:error, data} on request errors, instead of just raising errors - [#343](https://github.com/code-corps/stripity_stripe/pull/343)
+
+## 1.6.0 (2017-07-06)
+
+- Added support to update invoices (`&Stripe.Invoices.change/2`, `&Stripe.Invoices.change/3`) - [#241](https://github.com/code-corps/stripity_stripe/pull/241)
   - credit to https://github.com/TakteS
 
 ## 1.5.0 (2017-07-04)
 
-Changes:
-
-- Added basic webhook support - https://github.com/code-corps/stripity_stripe/pull/244
+- Added basic webhook support - [#244](https://github.com/code-corps/stripity_stripe/pull/244)
 
 ## 1.0.0 to 1.4.0
-- Added support to generate connect button URLs - https://github.com/code-corps/stripity_stripe/pull/231
-- Sadly, other changes have not been properly tracked here. We will compile a list
-as soon as we are able
 
-## 1.0.0 (2015-12-22)
+- Added support to generate connect button URLs - [#231](https://github.com/code-corps/stripity_stripe/pull/231)
+- Remaining changes have not been tracked, too many to list.
 
-Changes:
+## 1.0.0 (2015-12-22)
 
 - Bumped version to 1.0.0 as it has become quite feature full and it has a slight breakage factor.
 - Stripe Connect standalone account support. All modules were refactored to allow api key to flow thru
 - Refactored all subscriptions/invoices to their own modules. Expect a few rough edges there.
 - Improved the README
+
+-

README.md

@@ -1,9 +1,17 @@
 # Stripe for Elixir 
 
-[![Build Status](https://travis-ci.org/code-corps/stripity-stripe.svg?branch=master)](https://travis-ci.org/code-corps/stripity-stripe) [![Hex.pm](https://img.shields.io/hexpm/v/stripity_stripe.svg?maxAge=2592000)](https://hex.pm/packages/stripity_stripe) [![Hex Docs](https://img.shields.io/badge/hex-docs-9768d1.svg)](https://hexdocs.pm/stripity_stripe) [![Hex.pm](https://img.shields.io/hexpm/dt/stripity_stripe.svg?maxAge=2592000)](https://hex.pm/packages/stripity_stripe) [![Inline docs](http://inch-ci.org/github/code-corps/stripity-stripe.svg)](http://inch-ci.org/github/code-corps/stripity-stripe) [![Coverage Status](https://coveralls.io/repos/github/code-corps/stripity-stripe/badge.svg?branch=master)](https://coveralls.io/github/code-corps/stripity-stripe?branch=master)
-
 An Elixir library for working with [Stripe](https://stripe.com/).
 
+[![Hex.pm](https://img.shields.io/hexpm/v/stripity_stripe.svg?maxAge=2592000)](https://hex.pm/packages/stripity_stripe) [![Hex.pm](https://img.shields.io/hexpm/dt/stripity_stripe.svg?maxAge=2592000)](https://hex.pm/packages/stripity_stripe)
+
+## 2.x.x status
+
+[![Build Status](https://travis-ci.org/code-corps/stripity_stripe.svg?branch=master)](https://travis-ci.org/code-corps/stripity_stripe) [![Hex Docs](https://img.shields.io/badge/hex-docs-9768d1.svg)](https://hexdocs.pm/stripity_stripe)  [![Inline docs](http://inch-ci.org/github/code-corps/stripity_stripe.svg?branch=master)](http://inch-ci.org/github/code-corps/stripity_stripe?branch=master) [![Coverage Status](https://coveralls.io/repos/github/code-corps/stripity_stripe/badge.svg?branch=master)](https://coveralls.io/github/code-corps/stripity_stripe?branch=master)
+
+## 1.x.x status
+
+[![Build Status](https://travis-ci.org/code-corps/stripity_stripe.svg?branch=1.x.x)](https://travis-ci.org/code-corps/stripity_stripe) [![Hex Docs](https://img.shields.io/badge/hex-docs-9768d1.svg)](https://hexdocs.pm/stripity_stripe/1.6.2) [![Inline docs](http://inch-ci.org/github/code-corps/stripity_stripe.svg?branch=1.x.x)](http://inch-ci.org/github/code-corps/stripity_stripe?branch=1.x.x) [![Coverage Status](https://coveralls.io/repos/github/code-corps/stripity_stripe/badge.svg?branch=1.x.x)](https://coveralls.io/github/code-corps/stripity_stripe?branch=1.x.x)
+
 # Which version should I use?
 
 The old `1.x.x` line of releases has been kept and is being published separately for backwards compatibility, since `2.0` was a complete rewrite. To contribute to that line (bugfixes, mainly), create pull requests against the `1.x.x` branch.
@@ -12,8 +20,32 @@ The actively developed line of releases is `2.x.x` and is contained within the `
 
 # Documentation
 
+- [Latest HexDocs](https://hexdocs.pm/stripity_stripe/)
+
 - [1.x.x](https://hexdocs.pm/stripity_stripe/1.6.1/)
-- [Latest](https://hexdocs.pm/stripity_stripe/)
+
+## Installation
+
+Install the dependency:
+
+```ex
+{:stripity_stripe, "~> 2.0"}
+```
+
+Next, add to your applications:
+
+_Not necessary if using elixir >= 1.4_
+
+```ex
+defp application do
+  [applications: [:stripity_stripe]]
+end
+```
+
+# Documentation for 1.x.x
+
+<details><summary>Click to expand</summary>
+<p>
 
 ## Stripe API
 
@@ -24,7 +56,7 @@ Works with API version 2015-10-16
 Install the dependency:
 
 ```ex
-{:stripity_stripe, "~> 1.6.1"}
+{:stripity_stripe, "~> 1.6"}
 ```
 
 Next, add to your applications:
@@ -164,6 +196,9 @@ First, log in your account. Then go to the following url: https://dashboard.stri
 
 Create a connect standalone account. Grab your development `client_id`. Put it in your config file. Enter a redirect url to your endpoint. Capture the "code" request parameter. Pass it to `Stripe.Connect.oauth_token_callback` or `Stripe.Connect.get_token`.
 
+</p>
+</details>
+
 # Contributing
 
 Feedback, feature requests, and fixes are welcomed and encouraged.  Please make appropriate use of [Issues](https://github.com/code-corps/stripity-stripe/issues) and [Pull Requests](https://github.com/code-corps/stripity-stripe/pulls).  All code should have accompanying tests.

mix.exs

@@ -3,7 +3,7 @@ defmodule Stripe.Mixfile do
 
   def project do
     [ app: :stripity_stripe,
-      version: "1.6.1",
+      version: "1.6.2",
       description: description(),
       package: package(),
       deps: deps(),