From f2afa28d46fb7a2fc1062570da68736e8f57397e Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 6 Apr 2017 22:10:27 +0000 Subject: [PATCH] Gemfile: remove jruby definitions git-svn-id: http://svn.redmine.org/redmine/trunk@16517 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index cc932aa42..7ad1cb14a 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" gem "rails-html-sanitizer", ">= 1.0.3" # 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" # Optional gem for LDAP authentication @@ -49,12 +49,6 @@ platforms :mri, :mingw, :x64_mingw do 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 # configuration file require 'erb' @@ -68,17 +62,11 @@ if File.exist?(database_file) case adapter when 'mysql2' 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/ gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] - gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby when /sqlite3/ gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"), :platforms => [:mri, :mingw, :x64_mingw] - gem "jdbc-sqlite3", ">= 3.8.10.1", :platforms => :jruby - gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby when /sqlserver/ 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] -- 2.39.5