| @@ -1,18 +1,18 @@ | | | @@ -1,18 +1,18 @@ |
1 | $NetBSD: patch-Gemfile,v 1.7 2022/10/09 15:31:46 taca Exp $ | | 1 | $NetBSD: patch-Gemfile,v 1.8 2022/12/03 06:40:09 taca Exp $ |
2 | | | 2 | |
3 | Relax dependency. | | 3 | Relax dependency. |
4 | | | 4 | |
5 | --- Gemfile.orig 2022-10-02 20:10:08.000000000 +0000 | | 5 | --- Gemfile.orig 2022-12-01 15:40:06.000000000 +0000 |
6 | +++ Gemfile | | 6 | +++ Gemfile |
7 | @@ -3,17 +3,17 @@ source 'https://rubygems.org' | | 7 | @@ -3,17 +3,17 @@ source 'https://rubygems.org' |
8 | ruby '>= 2.4.0', '< 2.8.0' | | 8 | ruby '>= 2.4.0', '< 2.8.0' |
9 | gem 'bundler', '>= 1.12.0' | | 9 | gem 'bundler', '>= 1.12.0' |
10 | | | 10 | |
11 | -gem 'rails', '5.2.8.1' | | 11 | -gem 'rails', '5.2.8.1' |
12 | +gem 'rails', '~> 5.2.8' | | 12 | +gem 'rails', '~> 5.2.8' |
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 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') |
15 | -gem 'rouge', '~> 3.26.0' | | 15 | -gem 'rouge', '~> 3.26.0' |
16 | +gem 'rouge', '>= 3.26.0' | | 16 | +gem 'rouge', '>= 3.26.0' |
17 | gem 'request_store', '~> 1.5.0' | | 17 | gem 'request_store', '~> 1.5.0' |
18 | -gem "mini_mime", "~> 1.0.1" | | 18 | -gem "mini_mime", "~> 1.0.1" |
| @@ -34,40 +34,41 @@ Relax dependency. | | | @@ -34,40 +34,41 @@ Relax dependency. |
34 | +gem 'i18n', '~> 1.8' | | 34 | +gem 'i18n', '~> 1.8' |
35 | gem "rbpdf", "~> 1.20.0" | | 35 | gem "rbpdf", "~> 1.20.0" |
36 | gem 'addressable' | | 36 | gem 'addressable' |
37 | gem 'rubyzip', '~> 2.3.0' | | 37 | gem 'rubyzip', '~> 2.3.0' |
38 | @@ -70,7 +70,7 @@ if File.exist?(database_file) | | 38 | @@ -70,7 +70,7 @@ if File.exist?(database_file) |
39 | when 'mysql2' | | 39 | when 'mysql2' |
40 | gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] | | 40 | gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] |
41 | when /postgresql/ | | 41 | when /postgresql/ |
42 | - gem "pg", "~> 1.2.2", :platforms => [:mri, :mingw, :x64_mingw] | | 42 | - gem "pg", "~> 1.2.2", :platforms => [:mri, :mingw, :x64_mingw] |
43 | + gem "pg", "~> 1.2", :platforms => [:mri, :mingw, :x64_mingw] | | 43 | + gem "pg", "~> 1.2", :platforms => [:mri, :mingw, :x64_mingw] |
44 | when /sqlite3/ | | 44 | when /sqlite3/ |
45 | gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] | | 45 | gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] |
46 | when /sqlserver/ | | 46 | when /sqlserver/ |
47 | @@ -87,26 +87,6 @@ else | | 47 | @@ -87,27 +87,6 @@ else |
48 | warn("Please configure your config/database.yml first") | | 48 | warn("Please configure your config/database.yml first") |
49 | end | | 49 | end |
50 | | | 50 | |
51 | -group :development do | | 51 | -group :development do |
52 | - gem "yard" | | 52 | - gem "yard" |
53 | -end | | 53 | -end |
54 | - | | 54 | - |
55 | -group :test do | | 55 | -group :test do |
56 | - gem "rails-dom-testing" | | 56 | - gem "rails-dom-testing" |
57 | - gem 'mocha', '>= 1.4.0' | | 57 | - gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0') |
58 | - gem 'simplecov', '~> 0.18.5', :require => false | | 58 | - gem 'simplecov', '~> 0.18.5', :require => false |
59 | - gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] | | 59 | - gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] |
60 | - # For running system tests | | 60 | - # For running system tests |
61 | - gem 'puma' | | 61 | - # TODO: Remove version specification once Capybara supports Puma 6 |
| | | 62 | - gem 'puma', '< 6.0.0' |
62 | - gem 'capybara', '~> 3.31.0' | | 63 | - gem 'capybara', '~> 3.31.0' |
63 | - gem "selenium-webdriver" | | 64 | - gem "selenium-webdriver", "~> 3.142.7" |
64 | - gem 'webdrivers', '~> 4.4', require: false | | 65 | - gem 'webdrivers', '~> 4.4', require: false |
65 | - # RuboCop | | 66 | - # RuboCop |
66 | - gem 'rubocop', '~> 1.12.0' | | 67 | - gem 'rubocop', '~> 1.12.0' |
67 | - gem 'rubocop-performance', '~> 1.10.1' | | 68 | - gem 'rubocop-performance', '~> 1.10.1' |
68 | - gem 'rubocop-rails', '~> 2.9.0' | | 69 | - gem 'rubocop-rails', '~> 2.9.0' |
69 | -end | | 70 | -end |
70 | - | | 71 | - |
71 | local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") | | 72 | local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") |
72 | if File.exists?(local_gemfile) | | 73 | if File.exists?(local_gemfile) |
73 | eval_gemfile local_gemfile | | 74 | eval_gemfile local_gemfile |