Commit f6600cf3 authored by marutosijp's avatar marutosijp

Gemfile: remove jruby definitions

git-svn-id: https://svn.redmine.org/redmine/trunk@16517 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 2b7a93c5
...@@ -23,7 +23,7 @@ gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" ...@@ -23,7 +23,7 @@ gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
gem "rails-html-sanitizer", ">= 1.0.3" gem "rails-html-sanitizer", ">= 1.0.3"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby] gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
gem "rbpdf", "1.19.0" gem "rbpdf", "1.19.0"
# Optional gem for LDAP authentication # Optional gem for LDAP authentication
...@@ -49,12 +49,6 @@ platforms :mri, :mingw, :x64_mingw do ...@@ -49,12 +49,6 @@ platforms :mri, :mingw, :x64_mingw do
end end
end end
platforms :jruby do
# jruby-openssl is bundled with JRuby 1.7.0
gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
gem "activerecord-jdbc-adapter", "~> 1.3.2"
end
# Include database gems for the adapters found in the database # Include database gems for the adapters found in the database
# configuration file # configuration file
require 'erb' require 'erb'
...@@ -68,17 +62,11 @@ if File.exist?(database_file) ...@@ -68,17 +62,11 @@ if File.exist?(database_file)
case adapter case adapter
when 'mysql2' when 'mysql2'
gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw] gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when 'mysql'
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when /postgresql/ when /postgresql/
gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
when /sqlite3/ when /sqlite3/
gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"), gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"),
:platforms => [:mri, :mingw, :x64_mingw] :platforms => [:mri, :mingw, :x64_mingw]
gem "jdbc-sqlite3", ">= 3.8.10.1", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
when /sqlserver/ when /sqlserver/
gem "tiny_tds", (RUBY_VERSION >= "2.0" ? "~> 1.0.5" : "~> 0.7.0"), :platforms => [:mri, :mingw, :x64_mingw] gem "tiny_tds", (RUBY_VERSION >= "2.0" ? "~> 1.0.5" : "~> 0.7.0"), :platforms => [:mri, :mingw, :x64_mingw]
gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw] gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment