diff --git a/examples/todo-sinatra/Gemfile b/examples/todo-sinatra/Gemfile index 36ce130..5fd9c49 100644 --- a/examples/todo-sinatra/Gemfile +++ b/examples/todo-sinatra/Gemfile @@ -2,7 +2,7 @@ source "http://rubygems.org" gem "rake" gem "sinatra", :require => ["sinatra/base"] -gem "activerecord", :require => ["active_record"] +gem "activerecord", ">= 3.2.14", :require => ["active_record"] gem "erubis" platforms :ruby_18, :jruby do diff --git a/examples/todo-sinatra/Gemfile.lock b/examples/todo-sinatra/Gemfile.lock index 50b842e..69a8132 100644 --- a/examples/todo-sinatra/Gemfile.lock +++ b/examples/todo-sinatra/Gemfile.lock @@ -1,25 +1,26 @@ GEM remote: http://rubygems.org/ specs: - activemodel (3.2.1) - activesupport (= 3.2.1) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.1) - activemodel (= 3.2.1) - activesupport (= 3.2.1) - arel (~> 3.0.0) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + arel (~> 3.0.2) tzinfo (~> 0.3.29) activerecord-jdbc-adapter (1.2.2) activerecord-jdbcsqlite3-adapter (1.2.2) activerecord-jdbc-adapter (~> 1.2.2) jdbc-sqlite3 (~> 3.7.2) - activesupport (3.2.1) - i18n (~> 0.6) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.2.6) - arel (3.0.0) - builder (3.0.0) + arel (3.0.3) + builder (3.0.4) coderay (1.0.5) + concurrent-ruby (1.1.10) daemons (1.1.6) engineyard (1.4.22) engineyard-serverside-adapter (= 1.5.27) @@ -38,7 +39,8 @@ GEM eventmachine (0.12.10-java) ffi (1.0.11-java) highline (1.6.11) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jdbc-sqlite3 (3.7.2) json_pure (1.6.5) launchy (2.0.5) @@ -50,7 +52,7 @@ GEM method_source (0.7.0) mime-types (1.17.2) minitest (2.11.0) - multi_json (1.0.4) + multi_json (1.15.0) mustache (0.99.4) net-ssh (2.2.2) pry (0.9.8) @@ -86,14 +88,14 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) tilt (1.3.3) - tzinfo (0.3.31) + tzinfo (0.3.60) PLATFORMS java ruby DEPENDENCIES - activerecord + activerecord (>= 3.2.14) activerecord-jdbcsqlite3-adapter engineyard erubis @@ -107,3 +109,6 @@ DEPENDENCIES sinatra sqlite3 thin + +BUNDLED WITH + 2.1.4