Skip to content

Commit

Permalink
Don't load sqlite3 within jruby/trinidad
Browse files Browse the repository at this point in the history
  • Loading branch information
drnic committed Sep 17, 2011
1 parent a867214 commit 60b3654
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
7 changes: 4 additions & 3 deletions Gemfile
Expand Up @@ -6,8 +6,9 @@ gem 'simple_form'
gem 'jquery-rails'

platform :ruby do
gem "mysql2", "~> 0.2.7"
gem "unicorn"
gem 'mysql2', '~> 0.2.7'
gem 'sqlite3'
gem 'unicorn'
end

platforms :jruby do
Expand All @@ -25,5 +26,5 @@ end
# put test-only gems in this group so their generators
# and rake tasks are available in development mode:
group :development, :test do
gem 'sqlite3'

end
21 changes: 6 additions & 15 deletions Gemfile.lock
Expand Up @@ -24,7 +24,7 @@ GEM
activesupport (= 3.0.9)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
activerecord-jdbc-adapter (1.1.3)
activerecord-jdbc-adapter (1.2.0)
activeresource (3.0.9)
activemodel (= 3.0.9)
activesupport (= 3.0.9)
Expand All @@ -37,22 +37,20 @@ GEM
i18n (0.5.0)
jdbc-mysql (5.1.13)
jdbc-sqlite3 (3.7.2)
jquery-rails (1.0.13)
jquery-rails (1.0.14)
railties (~> 3.0)
thor (~> 0.14)
jruby-openssl (0.7.4)
bouncy-castle-java
jruby-rack (1.0.9)
kgio (2.6.0)
jruby-rack (1.0.10)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
mysql2 (0.2.13)
polyglot (0.3.2)
rack (1.2.3)
rack (1.2.4)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
Expand All @@ -71,13 +69,11 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
raindrops (0.7.0)
rake (0.9.2)
rdoc (3.9.2)
simple_form (1.4.2)
rdoc (3.9.4)
simple_form (1.5.1)
actionpack (~> 3.0)
activemodel (~> 3.0)
sqlite3 (1.3.4)
thor (0.14.6)
treetop (1.4.10)
polyglot
Expand All @@ -87,14 +83,9 @@ GEM
trinidad_jars (>= 1.0.1)
trinidad_jars (1.0.1)
tzinfo (0.3.29)
unicorn (4.0.1)
kgio (~> 2.4)
rack
raindrops (~> 0.6)

PLATFORMS
java
ruby

DEPENDENCIES
activerecord-jdbc-adapter
Expand Down

0 comments on commit 60b3654

Please sign in to comment.