Skip to content

Commit 5c21878

Browse files
committed
Tidy up gemfiles
1 parent 5beaf7c commit 5c21878

7 files changed

Lines changed: 134 additions & 190 deletions

File tree

Appraisals

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,12 @@
22

33
appraise 'rails-6.0' do
44
gem 'rails', '~> 6.0.0'
5-
gem 'sassc-rails', '~> 2.1'
6-
gem 'devise', '~> 4.7'
75

86
group :test do
9-
gem 'cancancan', '~> 3.0'
10-
gem 'kt-paperclip'
117
gem 'pundit', '~> 2.1.0'
12-
gem 'rspec-rails', '>= 4.0.0.beta2'
13-
gem 'shrine', '~> 3.0'
148
end
159

1610
group :active_record do
17-
gem 'pg', '>= 1.0.0', platforms: :ruby
18-
gem 'paper_trail', '>= 12.0'
19-
2011
platforms :jruby do
2112
gem 'activerecord-jdbcmysql-adapter', '~> 60.0'
2213
gem 'activerecord-jdbcpostgresql-adapter', '~> 60.0'
@@ -26,30 +17,13 @@ appraise 'rails-6.0' do
2617

2718
group :mongoid do
2819
gem 'mongoid', '~> 7.0'
29-
gem 'kaminari-mongoid'
30-
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
31-
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
32-
gem 'cancancan-mongoid'
33-
gem 'shrine-mongoid', '~> 1.0'
3420
end
3521
end
3622

3723
appraise 'rails-6.1' do
3824
gem 'rails', '~> 6.1.0'
39-
gem 'sassc-rails', '~> 2.1'
40-
gem 'devise', '~> 4.7'
41-
42-
group :test do
43-
gem 'cancancan', '~> 3.2'
44-
gem 'kt-paperclip'
45-
gem 'rspec-rails', '>= 4.0.0.beta2'
46-
gem 'shrine', '~> 3.0'
47-
end
4825

4926
group :active_record do
50-
gem 'pg', '>= 1.0.0', platforms: :ruby
51-
gem 'paper_trail', '>= 12.0'
52-
5327
platforms :jruby do
5428
gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
5529
gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
@@ -59,31 +33,14 @@ appraise 'rails-6.1' do
5933

6034
group :mongoid do
6135
gem 'mongoid', '~> 7.0'
62-
gem 'kaminari-mongoid'
63-
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
64-
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
65-
gem 'cancancan-mongoid'
66-
gem 'shrine-mongoid', '~> 1.0'
6736
end
6837
end
6938

7039
appraise 'rails-7.0' do
7140
gem 'rails', '~> 7.0.0'
7241
gem 'importmap-rails', require: false
73-
gem 'sassc-rails', '~> 2.1'
74-
gem 'devise', '~> 4.8'
75-
76-
group :test do
77-
gem 'cancancan', '~> 3.2'
78-
gem 'kt-paperclip'
79-
gem 'rspec-rails', '>= 4.0.0.beta2'
80-
gem 'shrine', '~> 3.0'
81-
end
8242

8343
group :active_record do
84-
gem 'pg', '>= 1.0.0', platforms: :ruby
85-
gem 'paper_trail', '>= 12.0'
86-
8744
platforms :jruby do
8845
gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
8946
gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
@@ -93,56 +50,22 @@ appraise 'rails-7.0' do
9350

9451
group :mongoid do
9552
gem 'mongoid', '~> 8.0'
96-
gem 'kaminari-mongoid'
97-
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
98-
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
99-
gem 'cancancan-mongoid'
100-
gem 'shrine-mongoid', '~> 1.0'
10153
end
10254
end
10355

10456
appraise 'rails-7.1' do
10557
gem 'rails', '~> 7.1.0'
10658
gem 'importmap-rails', require: false
107-
gem 'sassc-rails', '~> 2.1'
108-
gem 'devise', '~> 4.8'
109-
110-
group :test do
111-
gem 'cancancan', '~> 3.2'
112-
gem 'kt-paperclip'
113-
gem 'rspec-rails', '>= 4.0.0.beta2'
114-
gem 'shrine', '~> 3.0'
115-
end
116-
117-
group :active_record do
118-
gem 'pg', '>= 1.0.0', platforms: :ruby
119-
gem 'paper_trail', '>= 12.0'
120-
end
12159

12260
group :mongoid do
12361
gem 'mongoid', '~> 8.0'
124-
gem 'kaminari-mongoid'
125-
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
126-
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
127-
gem 'cancancan-mongoid'
128-
gem 'shrine-mongoid', '~> 1.0'
12962
end
13063
end
13164

13265
appraise 'composite_primary_keys' do
13366
gem 'rails', '~> 7.0.0'
134-
gem 'sassc-rails', '~> 2.1'
135-
gem 'devise', '~> 4.8'
136-
137-
group :test do
138-
gem 'cancancan', '~> 3.2'
139-
gem 'kt-paperclip'
140-
gem 'rspec-rails', '>= 4.0.0.beta2'
141-
gem 'shrine', '~> 3.0'
142-
end
14367

14468
group :active_record do
14569
gem 'composite_primary_keys'
146-
gem 'paper_trail', '>= 12.0'
14770
end
14871
end

Gemfile

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,14 @@
33
source 'https://rubygems.org'
44

55
gem 'appraisal', '>= 2.0'
6-
gem 'devise'
6+
gem 'devise', '~> 4.7'
77
gem 'net-smtp', require: false
88
gem 'rails'
9+
gem 'sassc-rails', '~> 2.1'
910
gem 'vite_rails', require: false
1011
gem 'webpacker', require: false
1112
gem 'webrick'
1213

13-
group :active_record do
14-
gem 'paper_trail'
15-
16-
platforms :ruby, :mswin, :mingw, :x64_mingw do
17-
gem 'mysql2', '>= 0.3.14'
18-
gem 'sqlite3', '>= 1.3'
19-
end
20-
end
21-
2214
group :development, :test do
2315
gem 'pry', '>= 0.9'
2416
end
@@ -32,15 +24,17 @@ group :test do
3224
gem 'dragonfly', '~> 1.0'
3325
gem 'factory_bot', '>= 4.2'
3426
gem 'generator_spec', '>= 0.8'
27+
gem 'kt-paperclip'
3528
gem 'launchy', '>= 2.2'
3629
gem 'mini_magick', '>= 3.4'
3730
gem 'pundit'
3831
gem 'rack-cache', require: 'rack/cache'
3932
gem 'rspec-expectations', '!= 3.8.3'
40-
gem 'rspec-rails', '>= 2.14'
33+
gem 'rspec-rails', '>= 4.0.0.beta2'
4134
gem 'rspec-retry'
4235
gem 'rubocop', ['~> 1.20', '!= 1.22.2'], require: false
4336
gem 'rubocop-performance', require: false
37+
gem 'shrine', '~> 3.0'
4438
gem 'simplecov', '>= 0.9', require: false
4539
gem 'simplecov-lcov', require: false
4640
gem 'timecop', '>= 0.5'
@@ -49,4 +43,22 @@ group :test do
4943
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
5044
end
5145

46+
group :active_record do
47+
gem 'paper_trail', '>= 12.0'
48+
49+
platforms :ruby, :mswin, :mingw, :x64_mingw do
50+
gem 'mysql2', '>= 0.3.14'
51+
gem 'pg', '>= 1.0.0'
52+
gem 'sqlite3', '>= 1.3'
53+
end
54+
end
55+
56+
group :mongoid do
57+
gem 'cancancan-mongoid'
58+
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
59+
gem 'kaminari-mongoid'
60+
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
61+
gem 'shrine-mongoid', '~> 1.0'
62+
end
63+
5264
gemspec

gemfiles/composite_primary_keys.gemfile

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,28 @@
33
source "https://rubygems.org"
44

55
gem "appraisal", ">= 2.0"
6-
gem "devise", "~> 4.8"
6+
gem "devise", "~> 4.7"
77
gem "net-smtp", require: false
88
gem "rails", "~> 7.0.0"
9+
gem "sassc-rails", "~> 2.1"
910
gem "vite_rails", require: false
1011
gem "webpacker", require: false
1112
gem "webrick"
12-
gem "sassc-rails", "~> 2.1"
13-
14-
group :active_record do
15-
gem "paper_trail", ">= 12.0"
16-
gem "composite_primary_keys"
17-
18-
platforms :ruby, :mswin, :mingw, :x64_mingw do
19-
gem "mysql2", ">= 0.3.14"
20-
gem "sqlite3", ">= 1.3"
21-
end
22-
end
2313

2414
group :development, :test do
2515
gem "pry", ">= 0.9"
2616
end
2717

2818
group :test do
29-
gem "cancancan", "~> 3.2"
19+
gem "cancancan", "~> 3.0"
3020
gem "carrierwave", [">= 2.0.0.rc", "< 3"]
3121
gem "cuprite"
3222
gem "database_cleaner-active_record", ">= 2.0", require: false
3323
gem "database_cleaner-mongoid", ">= 2.0", require: false
3424
gem "dragonfly", "~> 1.0"
3525
gem "factory_bot", ">= 4.2"
3626
gem "generator_spec", ">= 0.8"
27+
gem "kt-paperclip"
3728
gem "launchy", ">= 2.2"
3829
gem "mini_magick", ">= 3.4"
3930
gem "pundit"
@@ -43,12 +34,30 @@ group :test do
4334
gem "rspec-retry"
4435
gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
4536
gem "rubocop-performance", require: false
37+
gem "shrine", "~> 3.0"
4638
gem "simplecov", ">= 0.9", require: false
4739
gem "simplecov-lcov", require: false
4840
gem "timecop", ">= 0.5"
4941
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
50-
gem "kt-paperclip"
51-
gem "shrine", "~> 3.0"
42+
end
43+
44+
group :active_record do
45+
gem "paper_trail", ">= 12.0"
46+
gem "composite_primary_keys"
47+
48+
platforms :ruby, :mswin, :mingw, :x64_mingw do
49+
gem "mysql2", ">= 0.3.14"
50+
gem "pg", ">= 1.0.0"
51+
gem "sqlite3", ">= 1.3"
52+
end
53+
end
54+
55+
group :mongoid do
56+
gem "cancancan-mongoid"
57+
gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
58+
gem "kaminari-mongoid"
59+
gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
60+
gem "shrine-mongoid", "~> 1.0"
5261
end
5362

5463
gemspec path: "../"

gemfiles/rails_6.0.gemfile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,10 @@ gem "appraisal", ">= 2.0"
66
gem "devise", "~> 4.7"
77
gem "net-smtp", require: false
88
gem "rails", "~> 6.0.0"
9+
gem "sassc-rails", "~> 2.1"
910
gem "vite_rails", require: false
1011
gem "webpacker", require: false
1112
gem "webrick"
12-
gem "sassc-rails", "~> 2.1"
13-
14-
group :active_record do
15-
gem "paper_trail", ">= 12.0"
16-
gem "pg", ">= 1.0.0", platforms: :ruby
17-
18-
platforms :ruby, :mswin, :mingw, :x64_mingw do
19-
gem "mysql2", ">= 0.3.14"
20-
gem "sqlite3", ">= 1.3"
21-
end
22-
23-
platforms :jruby do
24-
gem "activerecord-jdbcmysql-adapter", "~> 60.0"
25-
gem "activerecord-jdbcpostgresql-adapter", "~> 60.0"
26-
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0"
27-
end
28-
end
2913

3014
group :development, :test do
3115
gem "pry", ">= 0.9"
@@ -40,6 +24,7 @@ group :test do
4024
gem "dragonfly", "~> 1.0"
4125
gem "factory_bot", ">= 4.2"
4226
gem "generator_spec", ">= 0.8"
27+
gem "kt-paperclip"
4328
gem "launchy", ">= 2.2"
4429
gem "mini_magick", ">= 3.4"
4530
gem "pundit", "~> 2.1.0"
@@ -49,21 +34,36 @@ group :test do
4934
gem "rspec-retry"
5035
gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
5136
gem "rubocop-performance", require: false
37+
gem "shrine", "~> 3.0"
5238
gem "simplecov", ">= 0.9", require: false
5339
gem "simplecov-lcov", require: false
5440
gem "timecop", ">= 0.5"
5541
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
56-
gem "kt-paperclip"
57-
gem "shrine", "~> 3.0"
42+
end
43+
44+
group :active_record do
45+
gem "paper_trail", ">= 12.0"
46+
47+
platforms :ruby, :mswin, :mingw, :x64_mingw do
48+
gem "mysql2", ">= 0.3.14"
49+
gem "pg", ">= 1.0.0"
50+
gem "sqlite3", ">= 1.3"
51+
end
52+
53+
platforms :jruby do
54+
gem "activerecord-jdbcmysql-adapter", "~> 60.0"
55+
gem "activerecord-jdbcpostgresql-adapter", "~> 60.0"
56+
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0"
57+
end
5858
end
5959

6060
group :mongoid do
61-
gem "mongoid", "~> 7.0"
61+
gem "cancancan-mongoid"
62+
gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
6263
gem "kaminari-mongoid"
6364
gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
64-
gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
65-
gem "cancancan-mongoid"
6665
gem "shrine-mongoid", "~> 1.0"
66+
gem "mongoid", "~> 7.0"
6767
end
6868

6969
gemspec path: "../"

0 commit comments

Comments
 (0)