Skip to content

Commit

Permalink
fix sqlite for jruby
Browse files Browse the repository at this point in the history
  • Loading branch information
seanlinsley committed Jan 12, 2014
1 parent 1a369be commit c427f53
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -5,7 +5,7 @@ rvm:
- 1.9.3
- 2.1.0
- rbx
- jruby-19mode
- jruby
env:
- RAILS=3.2.16
- RAILS=4.0.2
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
@@ -1,5 +1,4 @@
source 'https://rubygems.org'

gemspec

ACTIVE_ADMIN_PATH = File.dirname(__FILE__) unless defined?(ACTIVE_ADMIN_PATH)
Expand All @@ -14,6 +13,8 @@ gem 'arbre', github: 'gregbell/arbre' # until gregbell/arbre#16 makes it into an
gem 'rake', require: false
gem 'rails-i18n' # Provides default i18n for many languages

gem RUBY_PLATFORM =~ /java/ ? 'jdbc-sqlite3' : 'sqlite3'

group :development do
# Debugging
gem 'better_errors' # Web UI to debug exceptions. Go to /__better_errors to access the latest one
Expand Down Expand Up @@ -44,5 +45,4 @@ group :test do
gem 'parallel_tests'
gem 'rspec-rails'
gem 'shoulda-matchers'
gem 'sqlite3'
end

0 comments on commit c427f53

Please sign in to comment.