Bump to v1.6.0-dev

CHANGELOG.md

@@ -1,58 +1,13 @@
-# Changelog for v1.5
+# Changelog for v1.6
 
-See the [upgrade guides](https://gist.github.com/chrismccord/e53e79ef8b34adf5d8122a47db44d22f) to bring your Phoenix 1.4.x apps up to speed
-
-## Phoenix.PubSub 2.0 released
-
-Phoenix.PubSub 2.0 has been released with a more flexible and powerful fastlane mechanism. We use this opportunity to also move Phoenix.PubSub out of the endpoint and explicitly into your supervision tree. To update, you will need to remove or update the `{:phoenix_pubsub, "~> 1.x"}` entry in your `mix.exs` to at least "2.0".
-
-Then once you start an application, you will get a warning about the `:pubsub` key in your endpoint being deprecated. Follow the steps in the warning and you are good to go!
-
-## Guides revamped
-
-Phoenix built-in guides have been restructured and revamped, providing a better navigation structure and more content.
-
-## 1.5.0 (2020-04-22)
+## 1.6.0-dev
 
 ### Enhancements
 
-  * [Channel] Do not block the channel supervisor on join
-  * [ConnTest] Add `init_test_session` to Phoenix.ConnTest
-  * [Controller] Support `:disposition` option in `send_download/3`
-  * [Endpoint] Automatically perform connection draining when shutting down the VM
-  * [Endpoint] Allow named params to be used when defining socket paths
-  * [Endpoint] Raise if `force_ssl` has changed from compile time to runtime
-  * [Generator] Add `mix phx.gen.live` for LiveView CRUD generation
-  * [PubSub] Migrate to PubSub 2.0 with a more flexible fastlaning mechanism
-  * [View] Add `render_layout` which makes it easy to work with nested layouts
-  * [Transport] Transports can now optionally implement `handle_control/2` for handling control frames such as `:ping` and `:pong`
-
 ### Deprecations
 
-  * [ChannelTest] `use Phoenix.ChannelTest` is deprecated in favor of `import Phoenix.ChannelTest`
-  * [ConnTest] `use Phoenix.ConnTest` is deprecated in favor of `import Plug.Conn; import Phoenix.ConnTest`
-  * [Endpoint] The outdated `Phoenix.Endpoint.CowboyAdapter` for Cowboy 1 is deprecated. Please make sure `{:plug_cowboy, "~> 2.1"}` or later is listed in your `mix.exs`
-  * [Endpoint] `subscribe` and `unsubscribe` via the endpoint is deprecated, please use `Phoenix.PubSub` directly instead
-  * [Endpoint] `Phoenix.Endpoint.instrument/4` is deprecated and has no effect. Use `:telemetry` instead. See `Phoenix.Logger` for more information
-  * [Endpoint] The `:pubsub` key for endpoint is deprecated. Once you start your app, you will see step-by-step instructions on how to use the new PubSub config
-  * [Layout] Use `<%= @inner_content %>` instead of `<%= render @view_module, @view_template, assigns %>` for rendering the child layout
-
-### phx.new installer
-
-  * Built-in support for MSSQL databases via [`Ecto.Adapters.Tds`](https://hexdocs.pm/ecto_sql/Ecto.Adapters.Tds.html)
-  * `Phoenix.PubSub` is now started directly in your application supervision tree
-  * `Phoenix.Ecto.CheckRepoStatus` is now added to new applications that use Ecto
-  * Automatically use `System.get_env("MIX_TEST_PARTITION")` in the database name in the test environment for built-in CI test partitioning
-  * Generate a `MyApp.Telemetry` module with examples of Telemetry Metrics you may want to track in your app
-  * Support the `--live` flag for generating apps with out-of-the-box LiveView support
-  * Include scss support by default when using webpack
-
-### JavaScript client
-
-  * Ensure all channel event listeners are called
-  * Fix rejoining channels after explicit disconnect following be immediate reconnect
-  * Prevent duplicate join race conditions by immediately leaving duplicate channel on client
+  * [Endpoint] Phoenix now requires Cowboy v2.7+
 
-## v1.4
+## v1.5
 
-The CHANGELOG for v1.4 releases can be found [in the v1.4 branch](https://github.com/phoenixframework/phoenix/blob/v1.4/CHANGELOG.md).
+The CHANGELOG for v1.4 releases can be found [in the v1.5 branch](https://github.com/phoenixframework/phoenix/blob/v1.5/CHANGELOG.md).

mix.exs

@@ -1,7 +1,7 @@
 defmodule Phoenix.MixProject do
   use Mix.Project
 
-  @version "1.5.0"
+  @version "1.6.0-dev"
 
   # If the elixir requirement is updated, we need to make the installer
   # use at least the minimum requirement used here. Although often the