Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Commit

Permalink
Deactivated JRuby, because it blocked rails 3.2.19.
Browse files Browse the repository at this point in the history
  • Loading branch information
nning committed Jul 2, 2014
1 parent 6245df2 commit d9fb40c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 27 deletions.
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem 'rails', '~> 3.2.19'

gem 'pg', platforms: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
#gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby

gem 'cancan' # Authorization
gem 'default_value_for' # Default values
Expand All @@ -24,7 +24,7 @@ gem 'yaml_db' # Database dump
group :assets do
gem 'coffee-rails'
gem 'therubyracer', platforms: :ruby
gem 'therubyrhino', platforms: :jruby
# gem 'therubyrhino', platforms: :jruby
gem 'uglifier'

gem 'sass-rails'
Expand Down Expand Up @@ -52,10 +52,10 @@ group :development, :test do
gem 'mysql2'
end

platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
gem 'activerecord-jdbcmysql-adapter'
end
# platforms :jruby do
# gem 'activerecord-jdbcsqlite3-adapter'
# gem 'activerecord-jdbcmysql-adapter'
# end
end

group :test do
Expand Down
21 changes: 0 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,6 @@ GEM
activesupport (= 3.2.19)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-jdbc-adapter (1.3.8)
activerecord (>= 2.2)
activerecord-jdbcmysql-adapter (1.3.8)
activerecord-jdbc-adapter (~> 1.3.8)
jdbc-mysql (>= 5.1.22)
activerecord-jdbcpostgresql-adapter (1.3.8)
activerecord-jdbc-adapter (~> 1.3.8)
jdbc-postgres (>= 9.1)
activerecord-jdbcsqlite3-adapter (1.3.8)
activerecord-jdbc-adapter (~> 1.3.8)
jdbc-sqlite3 (~> 3.7.2)
activeresource (3.2.19)
activemodel (= 3.2.19)
activesupport (= 3.2.19)
Expand Down Expand Up @@ -142,9 +131,6 @@ GEM
inherited_resources (1.4.1)
has_scope (~> 0.6.0.rc)
responders (~> 1.0.0.rc)
jdbc-mysql (5.1.30)
jdbc-postgres (9.3.1101)
jdbc-sqlite3 (3.7.2.1)
journey (1.0.4)
jquery-rails (3.1.1)
railties (>= 3.0, < 5.0)
Expand Down Expand Up @@ -258,9 +244,6 @@ GEM
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
therubyrhino (2.0.3)
therubyrhino_jar (>= 1.7.3)
therubyrhino_jar (1.7.4)
thor (0.19.1)
thread_safe (0.3.4)
thread_safe (0.3.4-java)
Expand All @@ -282,9 +265,6 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord-jdbcmysql-adapter
activerecord-jdbcpostgresql-adapter
activerecord-jdbcsqlite3-adapter
better_errors
binding_of_caller
bootstrap-sass (~> 3.1.1.1)
Expand Down Expand Up @@ -320,6 +300,5 @@ DEPENDENCIES
simple_form
sqlite3
therubyracer
therubyrhino
uglifier
yaml_db

0 comments on commit d9fb40c

Please sign in to comment.