Release 1.1.0

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
-## 1.1.0-dev
+## 1.1.0 (2015-12-16)
+
+See these [`1.0.x` to `1.1.0` upgrade instructions](https://gist.github.com/chrismccord/557ef22e2a03a7992624) to bring your existing apps up to speed.
 
 * Enhancements
   * [Router] Enable defining routes for custom http methods with a new `match` macro

installer/lib/phoenix_new.ex

@@ -470,8 +470,8 @@ defmodule Mix.Tasks.Phoenix.New do
     :crypto.strong_rand_bytes(length) |> Base.encode64 |> binary_part(0, length)
   end
 
-  # defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, "~> 1.1.0"}]
-  defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, github: "phoenixframework/phoenix", override: true}]
+  defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, "~> 1.1.0"}]
+  # defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, github: "phoenixframework/phoenix", override: true}]
   defp phoenix_dep(path), do: ~s[{:phoenix, path: #{inspect path}, override: true}]
 
   defp phoenix_static_path("deps/phoenix"), do: "deps/phoenix"

installer/mix.exs

@@ -3,7 +3,7 @@ defmodule Phoenix.New.Mixfile do
 
   def project do
     [app: :phoenix_new,
-     version: "1.1.0-dev",
+     version: "1.1.0",
      elixir: "~> 1.0-dev"]
   end
 

installer/templates/new/mix.exs

@@ -35,7 +35,7 @@ defmodule <%= application_module %>.Mixfile do
     [<%= phoenix_dep %>,<%= if ecto do %>
      {:phoenix_ecto, "~> 2.0"},
      {<%= inspect adapter_app %>, ">= 0.0.0"},<% end %><%= if html do %>
-     {:phoenix_html, "~> 2.1"},
+     {:phoenix_html, "~> 2.3"},
      {:phoenix_live_reload, "~> 1.0", only: :dev},<% end %>
      {:gettext, "~> 0.9"},
      {:cowboy, "~> 1.0"}]

mix.exs

@@ -1,7 +1,7 @@
 defmodule Phoenix.Mixfile do
   use Mix.Project
 
-  @version "1.1.0-dev"
+  @version "1.1.0"
 
   def project do
     [app: :phoenix,