Permalink
Browse files

Merge branch 'master' into ci

Conflicts:
	Gemfile
  • Loading branch information...
2 parents 3efd5bd + be0e011 commit e5f05ecb08adf733e16291583a55e431af15c018 @sferik committed Dec 22, 2010
Showing with 24 additions and 19 deletions.
  1. +6 −6 Gemfile
  2. +1 −1 rails_admin.gemspec
  3. +7 −8 spec/dummy_app/Gemfile
  4. +10 −4 spec/dummy_app/Gemfile.lock
View
12 Gemfile
@@ -9,14 +9,14 @@ group :development, :test do
if 'java' == RUBY_PLATFORM
case ENV['CI_DB_ADAPTER']
when 'mysql'
- gem 'jdbc-mysql', '~> 5.1'
- gem 'activerecord-jdbcmysql-adapter', '~> 1.1'
+ gem 'activerecord-jdbcmysql-adapter', '~> 1.1', :platform => :jruby
+ gem 'jdbc-mysql', '~> 5.1', :platform => :jruby
when 'postgresql'
- gem 'jdbc-postgres', '~> 8.4'
- gem 'activerecord-jdbcpostgresql-adapter', '~> 1.1'
+ gem 'activerecord-jdbcpostgresql-adapter', '~> 1.1', :platform => :jruby
+ gem 'jdbc-postgres', '~> 9.0', :platform => :jruby
else
- gem 'jdbc-sqlite3', '~> 3.6'
- gem 'activerecord-jdbcsqlite3-adapter', '~> 0.9'
+ gem 'activerecord-jdbcsqlite3-adapter', '~> 1.1', :platform => :jruby
+ gem 'jdbc-sqlite3', '~> 3.6', :platform => :jruby
end
else
case ENV['CI_DB_ADAPTER']
View
2 rails_admin.gemspec
@@ -4,11 +4,11 @@ require File.expand_path('../lib/rails_admin/version', __FILE__)
Gem::Specification.new do |s|
s.add_development_dependency('devise', '~> 1.1')
s.add_development_dependency('dummy_data', '~> 0.9')
+ s.add_development_dependency('paperclip', '~> 2.3')
s.add_development_dependency('rspec-rails', '~> 2.3')
s.add_development_dependency('simplecov', '~> 0.3')
s.add_development_dependency('webrat', '~> 0.7')
s.add_development_dependency('ZenTest', '~> 4.4')
- s.add_development_dependency('paperclip', '~> 2.3.8')
s.add_runtime_dependency('builder', '~> 2.1.0')
s.add_runtime_dependency('rails', '~> 3.0.3')
s.authors = ["Erik Michaels-Ober", "Bogdan Gaza"]
View
15 spec/dummy_app/Gemfile
@@ -1,9 +1,8 @@
source 'http://rubygems.org'
gem 'rails', '~> 3.0.3'
-gem 'builder', '~> 2.1.0'
gem 'devise', '~> 1.1'
-gem 'paperclip', '~> 2.3.8'
+gem 'paperclip', '~> 2.3'
gem 'rails_admin', :path => '../../'
# Bundle gems for the local environment. Make sure to
@@ -13,14 +12,14 @@ group :development, :test do
if 'java' == RUBY_PLATFORM
case ENV['CI_DB_ADAPTER']
when 'mysql'
- gem 'jdbc-mysql', '~> 5.1'
- gem 'activerecord-jdbcmysql-adapter', '~> 1.1'
+ gem 'activerecord-jdbcmysql-adapter', '~> 1.1', :platform => :jruby
+ gem 'jdbc-mysql', '~> 5.1', :platform => :jruby
when 'postgresql'
- gem 'jdbc-postgres', '~> 8.4'
- gem 'activerecord-jdbcpostgresql-adapter', '~> 1.1'
+ gem 'activerecord-jdbcpostgresql-adapter', '~> 1.1', :platform => :jruby
+ gem 'jdbc-postgres', '~> 9.0', :platform => :jruby
else
- gem 'jdbc-sqlite3', '~> 3.6'
- gem 'activerecord-jdbcsqlite3-adapter', '~> 0.9'
+ gem 'activerecord-jdbcsqlite3-adapter', '~> 1.1', :platform => :jruby
+ gem 'jdbc-sqlite3', '~> 3.6', :platform => :jruby
end
else
case ENV['CI_DB_ADAPTER']
View
14 spec/dummy_app/Gemfile.lock
@@ -31,19 +31,25 @@ GEM
activesupport (= 3.0.3)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
+ activerecord-jdbc-adapter (1.1.0)
+ activerecord-jdbcsqlite3-adapter (1.1.0)
+ activerecord-jdbc-adapter (= 1.1.0)
+ jdbc-sqlite3 (~> 3.6.0)
activeresource (3.0.3)
activemodel (= 3.0.3)
activesupport (= 3.0.3)
activesupport (3.0.3)
arel (2.0.6)
bcrypt-ruby (2.1.3)
+ bcrypt-ruby (2.1.3-java)
builder (2.1.2)
devise (1.1.5)
bcrypt-ruby (~> 2.1.2)
warden (~> 1.0.2)
erubis (2.6.6)
abstract (>= 1.0.0)
i18n (0.5.0)
+ jdbc-sqlite3 (3.6.14.2.056-java)
mail (2.2.12)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
@@ -73,7 +79,6 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
- sqlite3-ruby (1.3.2)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
@@ -82,12 +87,13 @@ GEM
rack (>= 1.0.0)
PLATFORMS
+ java
ruby
DEPENDENCIES
- builder (~> 2.1.0)
+ activerecord-jdbcsqlite3-adapter (~> 1.1)
devise (~> 1.1)
- paperclip
+ jdbc-sqlite3 (~> 3.6)
+ paperclip (~> 2.3)
rails (~> 3.0.3)
rails_admin!
- sqlite3-ruby (~> 1.3)

0 comments on commit e5f05ec

Please sign in to comment.