Skip to content
This repository
Browse code

Remove dynamic code from gemspec because it can only be built one way

  • Loading branch information...
commit ebbe21cd4fd8b1da57b2b618d5b0242efc833c09 1 parent 11f5982
Erik Michaels-Ober authored

Showing 3 changed files with 16 additions and 11 deletions. Show diff stats Hide diff stats

  1. +9 5 Gemfile
  2. +0 1  rails_admin.gemspec
  3. +7 5 spec/dummy_app/Gemfile
14 Gemfile
... ... @@ -1,14 +1,13 @@
1 1 source 'http://rubygems.org'
2 2
3   -gemspec
4   -
5 3 # Bundle gems for the local environment. Make sure to
6 4 # put test-only gems in this group so their generators
7 5 # and rake tasks are available in development mode:
8 6 group :development, :test do
9 7 gem 'rails', '~> 3.0.7'
10 8
11   - if 'java' == RUBY_PLATFORM
  9 + platforms :jruby do
  10 + gem 'jruby-openssl', '~> 0.7'
12 11 case ENV['CI_DB_ADAPTER']
13 12 when 'mysql'
14 13 gem 'activerecord-jdbcmysql-adapter', '~> 1.1', :platform => :jruby
@@ -20,7 +19,9 @@ group :development, :test do
20 19 gem 'activerecord-jdbcsqlite3-adapter', '~> 1.1', :platform => :jruby
21 20 gem 'jdbc-sqlite3', '~> 3.6', :platform => :jruby
22 21 end
23   - else
  22 + end
  23 +
  24 + platforms :ruby, :mswin, :mingw do
24 25 case ENV['CI_DB_ADAPTER']
25 26 when 'mysql'
26 27 gem 'mysql', '~> 2.8'
@@ -30,7 +31,10 @@ group :development, :test do
30 31 gem 'sqlite3', '~> 1.3'
31 32 end
32 33 end
33   - gem "cancan" if ENV["AUTHORIZATION_ADAPTER"] == "cancan"
  34 +
  35 + gem 'cancan' if ENV['AUTHORIZATION_ADAPTER'] == 'cancan'
34 36 gem 'factory_girl', '2.0.0.beta2'
35 37 gem 'generator_spec'
36 38 end
  39 +
  40 +gemspec
1  rails_admin.gemspec
@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
14 14 s.add_development_dependency('ZenTest', '~> 4.5')
15 15 # If you add a runtime dependency, please maintain alphabetical order
16 16 s.add_runtime_dependency('builder', '~> 2.1.0')
17   - s.add_runtime_dependency('jruby-openssl', '~> 0.7.2') if RUBY_PLATFORM == 'java'
18 17 s.add_runtime_dependency('rails', '~> 3.0.6')
19 18 s.authors = ["Erik Michaels-Ober", "Bogdan Gaza"]
20 19 s.description = %q{RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data}
12 spec/dummy_app/Gemfile
@@ -6,11 +6,10 @@ gem 'paperclip', '~> 2.3'
6 6 gem 'rails_admin', :path => '../../'
7 7 gem 'mlb'
8 8
9   -# Bundle gems for the local environment. Make sure to
10   -# put test-only gems in this group so their generators
11   -# and rake tasks are available in development mode:
12 9 group :development, :test do
13   - if 'java' == RUBY_PLATFORM
  10 +
  11 + platforms :jruby do
  12 + gem 'jruby-openssl', '~> 0.7'
14 13 case ENV['CI_DB_ADAPTER']
15 14 when 'mysql'
16 15 gem 'activerecord-jdbcmysql-adapter', '~> 1.1', :platform => :jruby
@@ -22,7 +21,9 @@ group :development, :test do
22 21 gem 'activerecord-jdbcsqlite3-adapter', '~> 1.1', :platform => :jruby
23 22 gem 'jdbc-sqlite3', '~> 3.6', :platform => :jruby
24 23 end
25   - else
  24 + end
  25 +
  26 + platforms :ruby, :mswin, :mingw do
26 27 case ENV['CI_DB_ADAPTER']
27 28 when 'mysql'
28 29 gem 'mysql', '~> 2.8'
@@ -32,4 +33,5 @@ group :development, :test do
32 33 gem 'sqlite3', '~> 1.3'
33 34 end
34 35 end
  36 +
35 37 end

0 comments on commit ebbe21c

Please sign in to comment.
Something went wrong with that request. Please try again.