diff --git a/Gemfile b/Gemfile index bc1c9e0..f27e05e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source :gemcutter -gem "activerecord", "~> 3.0" +gem "activerecord", "~> 3.0pre" group :development do gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock index e8b627b..b2485e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,30 +1,34 @@ GEM remote: http://rubygems.org/ specs: - activemodel (3.0.6) - activesupport (= 3.0.6) - builder (~> 2.1.2) - i18n (~> 0.5.0) - activerecord (3.0.6) - activemodel (= 3.0.6) - activesupport (= 3.0.6) - arel (~> 2.0.2) - tzinfo (~> 0.3.23) + activemodel (3.1.0.rc4) + activesupport (= 3.1.0.rc4) + bcrypt-ruby (~> 2.1.4) + builder (~> 3.0.0) + i18n (~> 0.6) + activerecord (3.1.0.rc4) + activemodel (= 3.1.0.rc4) + activesupport (= 3.1.0.rc4) + arel (~> 2.1.1) + tzinfo (~> 0.3.27) activerecord-jdbc-adapter (1.1.1) activerecord-jdbcmysql-adapter (1.1.1) activerecord-jdbc-adapter (= 1.1.1) jdbc-mysql (~> 5.1.0) - activesupport (3.0.6) + activesupport (3.1.0.rc4) + multi_json (~> 1.0) archive-tar-minitar (0.5.2) - arel (2.0.9) - builder (2.1.2) + arel (2.1.1) + bcrypt-ruby (2.1.4) + bcrypt-ruby (2.1.4-java) + builder (3.0.0) chronic (0.3.0) columnize (0.3.2) delorean (0.2.1) chronic factory_girl (1.3.3) git (1.2.5) - i18n (0.5.0) + i18n (0.6.0) jdbc-mysql (5.1.13) jeweler (1.5.2) bundler (~> 1.0.0) @@ -33,6 +37,7 @@ GEM linecache (0.43) linecache19 (0.5.12) ruby_core_source (>= 0.1.4) + multi_json (1.0.3) mysql (2.8.1) mysql2 (0.2.7) pg (0.9.0) @@ -56,14 +61,14 @@ GEM sqlite3 (1.3.3) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) - tzinfo (0.3.26) + tzinfo (0.3.28) PLATFORMS java ruby DEPENDENCIES - activerecord (~> 3.0) + activerecord (~> 3.0pre) activerecord-jdbcmysql-adapter delorean (~> 0.2.0) factory_girl (~> 1.3.3)