Rails master is now the default gemfile

Conflicts:
	Gemfile
	Gemfile.lock

.travis.yml

@@ -6,12 +6,12 @@ rvm:
   - rbx
   - jruby-19mode
 gemfile:
-  - gemfiles/Gemfile.rails-head
+  - gemfiles/Gemfile.rails-4-0-stable
   - gemfiles/Gemfile.rails-4-1-stable
   - Gemfile
 matrix:
   allow_failures:
-    - gemfile: gemfiles/Gemfile.rails-head
+    - gemfile: Gemfile
     - gemfile: gemfiles/Gemfile.rails-4-1-stable
 notifications:
   email: false

Gemfile

@@ -3,9 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'country_select', '~> 1.1.1'
-gem 'railties', '>= 4.0.0', '< 4.1'
-gem 'activemodel', '>= 4.0.0', '< 4.1'
-gem 'actionpack', '>= 4.0.0', '< 4.1'
+gem 'railties', github: 'rails/rails'
+gem 'activemodel', github: 'rails/rails'
+gem 'actionpack', github: 'rails/rails'
 gem 'rake'
-gem 'rdoc'
-gem 'tzinfo'

Gemfile.lock

@@ -1,61 +1,65 @@
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: d41154094a332a3dd797c4148894fbcd1e5ad5ff
+  specs:
+    actionpack (4.2.0.alpha)
+      actionview (= 4.2.0.alpha)
+      activesupport (= 4.2.0.alpha)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.2.0.alpha)
+      activesupport (= 4.2.0.alpha)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.2.0.alpha)
+      activesupport (= 4.2.0.alpha)
+      builder (~> 3.1)
+    activesupport (4.2.0.alpha)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    railties (4.2.0.alpha)
+      actionpack (= 4.2.0.alpha)
+      activesupport (= 4.2.0.alpha)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+
 PATH
   remote: .
   specs:
     simple_form (3.0.1)
-      actionpack (>= 4.0.0, < 4.1)
-      activemodel (>= 4.0.0, < 4.1)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.9)
-    builder (3.1.4)
+    atomic (1.1.15)
+    builder (3.2.2)
     country_select (1.1.3)
     erubis (2.7.0)
-    i18n (0.6.4)
-    json (1.7.7)
-    minitest (4.7.5)
-    multi_json (1.7.7)
+    i18n (0.6.9)
+    json (1.8.1)
+    minitest (5.3.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.0.4)
-    rdoc (4.0.1)
-      json (~> 1.4)
+    rake (10.1.1)
     thor (0.18.1)
-    thread_safe (0.1.0)
-      atomic
-    tzinfo (0.3.37)
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (>= 4.0.0, < 4.1)
-  activemodel (>= 4.0.0, < 4.1)
+  actionpack!
+  activemodel!
   country_select (~> 1.1.1)
-  railties (>= 4.0.0, < 4.1)
+  railties!
   rake
-  rdoc
   simple_form!
-  tzinfo

gemfiles/Gemfile.rails-4-0-stable

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end
+
+gem 'country_select', '~> 1.1.1'
+gem 'railties', github: 'rails/rails', branch: '4-0-stable'
+gem 'activemodel', github: 'rails/rails', branch: '4-0-stable'
+gem 'actionpack', github: 'rails/rails', branch: '4-0-stable'
+gem 'rake'
+gem 'tzinfo'
+gem 'rdoc'

simple_form.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "simple_form"
 
-  s.add_dependency('activemodel', '>= 4.0.0', '< 4.1')
-  s.add_dependency('actionpack', '>= 4.0.0', '< 4.1')
+  s.add_dependency('activemodel', '~> 4.0')
+  s.add_dependency('actionpack', '~> 4.0')
 end