Merge branch 'master' into 1.0.x

hanami · Mar 31, 2017 · d1c2797 · d1c2797
2 parents 0456c6b + 967fe47
commit d1c2797
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
+## v1.0.0.rc1 - 2017-03-31
+
 ## v1.0.0.beta3 - 2017-03-17
 ### Changed
 - [Luca Guidi] `Action#flash` is now public API

diff --git a/Gemfile b/Gemfile
@@ -7,11 +7,11 @@ unless ENV['TRAVIS']
 end
 
 gem 'minitest',      '~> 5.8'
-gem 'hanami-utils',  '~> 1.0.0.beta1', require: false, github: 'hanami/utils',  branch: '1.0.x'
-gem 'hanami-router', '~> 1.0.0.beta1', require: false, github: 'hanami/router', branch: '1.0.x'
+gem 'hanami-utils',  '~> 1.0.0.rc1', require: false, github: 'hanami/utils',  branch: '1.0.x'
+gem 'hanami-router', '~> 1.0.0.rc1', require: false, github: 'hanami/router', branch: '1.0.x'
 
 group :validations do
-  gem 'hanami-validations', '~> 1.0.0.beta1', require: false, github: 'hanami/validations', branch: '1.0.x'
+  gem 'hanami-validations', '~> 1.0.0.rc1', require: false, github: 'hanami/validations', branch: '1.0.x'
 end
 
 gem 'coveralls', require: false
diff --git a/hanami-controller.gemspec b/hanami-controller.gemspec
@@ -6,8 +6,8 @@ require 'hanami/controller/version'
 Gem::Specification.new do |spec|
   spec.name          = 'hanami-controller'
   spec.version       = Hanami::Controller::VERSION
-  spec.authors       = ['Luca Guidi', 'Trung Lê', 'Alfonso Uceda']
-  spec.email         = ['me@lucaguidi.com', 'trung.le@ruby-journal.com', 'uceda73@gmail.com']
+  spec.authors       = ['Luca Guidi']
+  spec.email         = ['me@lucaguidi.com']
   spec.description   = %q{Complete, fast and testable actions for Rack}
   spec.summary       = %q{Complete, fast and testable actions for Rack and Hanami}
   spec.homepage      = 'http://hanamirb.org'
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_dependency 'rack',         '~> 2.0'
-  spec.add_dependency 'hanami-utils', '~> 1.0.0.beta1'
+  spec.add_dependency 'hanami-utils', '~> 1.0.0.rc1'
 
   spec.add_development_dependency 'bundler',   '~> 1.6'
   spec.add_development_dependency 'rack-test', '~> 0.6'

diff --git a/lib/hanami/controller/version.rb b/lib/hanami/controller/version.rb
@@ -3,6 +3,6 @@ module Controller
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.0.0.beta3'.freeze
+    VERSION = '1.0.0.rc1'.freeze
   end
 end
diff --git a/test/version_test.rb b/test/version_test.rb
@@ -2,6 +2,6 @@
 
 describe Hanami::Controller::VERSION do
   it 'returns the current version' do
-    Hanami::Controller::VERSION.must_equal '1.0.0.beta3'
+    Hanami::Controller::VERSION.must_equal '1.0.0.rc1'
   end
 end