From 78e1af49f8eb5b491adf04a5513f7c66d1bd67ee Mon Sep 17 00:00:00 2001
From: Andrew Haines <andrew@haines.org.nz>
Date: Tue, 25 Jun 2013 17:03:52 +0100
Subject: [PATCH] Rails 4.0 :sparkles:

Test against released Rails 4.0 and Rails 4.1 dev; use Rails 4.0 by
default in development.
---
 .travis.yml          | 3 ++-
 Gemfile              | 4 ++--
 gemfiles/4.0.gemfile | 2 +-
 gemfiles/4.1.gemfile | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 gemfiles/4.1.gemfile

diff --git a/.travis.yml b/.travis.yml
index b495e63..36ee1f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ env:
   - "RAILS_VERSION=3.2"
   - "RAILS_VERSION=3.1"
   - "RAILS_VERSION=3.0"
+  - "RAILS_VERSION=4.1"
 
 matrix:
   allow_failures:
-    - env: "RAILS_VERSION=4.0"
+    - env: "RAILS_VERSION=4.1"
diff --git a/Gemfile b/Gemfile
index 4fc6b14..67f31fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,9 +8,9 @@ end
 
 platforms :jruby do
   gem "minitest", ">= 3.0"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.beta2"
 end
 
-version = ENV["RAILS_VERSION"] || "3.2"
+version = ENV["RAILS_VERSION"] || "4.0"
 
 eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)
diff --git a/gemfiles/4.0.gemfile b/gemfiles/4.0.gemfile
index eae7afc..d974eb0 100644
--- a/gemfiles/4.0.gemfile
+++ b/gemfiles/4.0.gemfile
@@ -1,3 +1,3 @@
-gem "rails", github: "rails/rails", branch: "4-0-0"
+gem "rails", "~> 4.0.0"
 gem "mongoid", github: "mongoid/mongoid"
 gem "devise", github: "plataformatec/devise"
diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile
new file mode 100644
index 0000000..531d4ec
--- /dev/null
+++ b/gemfiles/4.1.gemfile
@@ -0,0 +1,2 @@
+gem "rails", github: "rails/rails"
+gem "devise", github: "plataformatec/devise"