| @@ -1,71 +1,72 @@ | | | @@ -1,71 +1,72 @@ |
1 | $NetBSD: patch-Gemfile,v 1.3 2021/06/02 16:04:39 taca Exp $ | | 1 | $NetBSD: patch-Gemfile,v 1.4 2021/08/22 06:36:30 taca Exp $ |
2 | | | 2 | |
3 | Relax dependency. | | 3 | Relax dependency. |
4 | | | 4 | |
5 | --- Gemfile.orig 2021-04-26 14:40:21.000000000 +0000 | | 5 | --- Gemfile.orig 2021-08-01 08:00:11.000000000 +0000 |
6 | +++ Gemfile | | 6 | +++ Gemfile |
7 | @@ -3,18 +3,18 @@ source 'https://rubygems.org' | | 7 | @@ -3,19 +3,19 @@ source 'https://rubygems.org' |
8 | ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0' | | 8 | ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0' |
9 | gem "bundler", ">= 1.5.0" | | 9 | gem "bundler", ">= 1.5.0" |
10 | | | 10 | |
11 | -gem 'rails', '5.2.5' | | 11 | -gem 'rails', '5.2.6' |
12 | +gem "rails", ">= 5.2.5" | | 12 | +gem 'rails', '~> 5.2.6' |
13 | gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' | | 13 | gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' |
| | | 14 | gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') |
14 | -gem "rouge", "~> 3.12.0" | | 15 | -gem "rouge", "~> 3.12.0" |
15 | -gem "request_store", "~> 1.4.1" | | 16 | -gem "request_store", "~> 1.4.1" |
16 | +gem "rouge", ">= 3.12.0" | | 17 | +gem "rouge", ">= 3.12.0" |
17 | +gem "request_store", ">= 1.4.1" | | 18 | +gem "request_store", ">= 1.4.1" |
18 | gem "mini_mime", "~> 1.0.1" | | 19 | gem "mini_mime", "~> 1.0.1" |
19 | gem "actionpack-xml_parser" | | 20 | gem "actionpack-xml_parser" |
20 | -gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0") | | 21 | -gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0") |
21 | +gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.2") | | 22 | +gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.2") |
22 | gem 'marcel' | | 23 | gem 'marcel' |
23 | gem "mail", "~> 2.7.1" | | 24 | gem "mail", "~> 2.7.1" |
24 | gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') | | 25 | gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') |
25 | gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') | | 26 | gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') |
26 | -gem "i18n", "~> 1.6.0" | | 27 | -gem "i18n", "~> 1.6.0" |
27 | +gem "i18n", ">= 1.6.0" | | 28 | +gem "i18n", ">= 1.6.0" |
28 | gem "rbpdf", "~> 1.20.0" | | 29 | gem "rbpdf", "~> 1.20.0" |
29 | | | 30 | |
30 | # Windows does not include zoneinfo files, so bundle the tzinfo-data gem | | 31 | # Windows does not include zoneinfo files, so bundle the tzinfo-data gem |
31 | @@ -22,7 +22,7 @@ gem 'tzinfo-data', platforms: [:mingw, : | | 32 | @@ -23,7 +23,7 @@ gem 'tzinfo-data', platforms: [:mingw, : |
32 | | | 33 | |
33 | # Optional gem for LDAP authentication | | 34 | # Optional gem for LDAP authentication |
34 | group :ldap do | | 35 | group :ldap do |
35 | - gem "net-ldap", "~> 0.16.0" | | 36 | - gem "net-ldap", "~> 0.16.0" |
36 | + gem "net-ldap", "~> 0.16" | | 37 | + gem "net-ldap", "~> 0.16" |
37 | end | | 38 | end |
38 | | | 39 | |
39 | # Optional gem for OpenID authentication | | 40 | # Optional gem for OpenID authentication |
40 | @@ -33,7 +33,7 @@ end | | 41 | @@ -34,7 +34,7 @@ end |
41 | | | 42 | |
42 | # Optional gem for exporting the gantt to a PNG file | | 43 | # Optional gem for exporting the gantt to a PNG file |
43 | group :minimagick do | | 44 | group :minimagick do |
44 | - gem "mini_magick", "~> 4.9.5" | | 45 | - gem "mini_magick", "~> 4.9.5" |
45 | + gem "mini_magick", "~> 4.9" | | 46 | + gem "mini_magick", "~> 4.9" |
46 | end | | 47 | end |
47 | | | 48 | |
48 | # Optional Markdown support, not for JRuby | | 49 | # Optional Markdown support, not for JRuby |
49 | @@ -55,7 +55,7 @@ if File.exist?(database_file) | | 50 | @@ -56,7 +56,7 @@ if File.exist?(database_file) |
50 | when 'mysql2' | | 51 | when 'mysql2' |
51 | gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] | | 52 | gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] |
52 | when /postgresql/ | | 53 | when /postgresql/ |
53 | - gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] | | 54 | - gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] |
54 | + gem "pg", ">= 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] | | 55 | + gem "pg", ">= 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] |
55 | when /sqlite3/ | | 56 | when /sqlite3/ |
56 | gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] | | 57 | gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] |
57 | when /sqlserver/ | | 58 | when /sqlserver/ |
58 | @@ -72,25 +72,6 @@ else | | 59 | @@ -73,25 +73,6 @@ else |
59 | warn("Please configure your config/database.yml first") | | 60 | warn("Please configure your config/database.yml first") |
60 | end | | 61 | end |
61 | | | 62 | |
62 | -group :development do | | 63 | -group :development do |
63 | - gem "yard" | | 64 | - gem "yard" |
64 | -end | | 65 | -end |
65 | - | | 66 | - |
66 | -group :test do | | 67 | -group :test do |
67 | - gem "rails-dom-testing" | | 68 | - gem "rails-dom-testing" |
68 | - gem 'mocha', '>= 1.4.0' | | 69 | - gem 'mocha', '>= 1.4.0' |
69 | - gem "simplecov", "~> 0.17.0", :require => false | | 70 | - gem "simplecov", "~> 0.17.0", :require => false |
70 | - gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] | | 71 | - gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] |
71 | - # For running system tests | | 72 | - # For running system tests |