Skip to content

Commit e38c12d

Browse files
committedNov 23, 2024··
Follow-up for #3702
- Fix Rails 7.0/7.1 builds - Remove spec/dummy_app/Gemfile.rails6, as it's not used much
1 parent 5412857 commit e38c12d

File tree

7 files changed

+19
-60
lines changed

7 files changed

+19
-60
lines changed
 

‎Appraisals

+14-6
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ appraise 'rails-7.0' do
5656
gem 'importmap-rails', require: false
5757

5858
group :active_record do
59+
platforms :ruby, :mswin, :mingw, :x64_mingw do
60+
gem 'sqlite3', '~> 1.3'
61+
end
62+
5963
platforms :jruby do
6064
gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
6165
gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
@@ -78,6 +82,12 @@ appraise 'rails-7.1' do
7882
gem 'rails', '~> 7.1.0'
7983
gem 'importmap-rails', require: false
8084

85+
group :active_record do
86+
platforms :ruby, :mswin, :mingw, :x64_mingw do
87+
gem 'sqlite3', '~> 1.3'
88+
end
89+
end
90+
8191
group :mongoid do
8292
gem 'cancancan-mongoid'
8393
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
@@ -97,18 +107,16 @@ end
97107
appraise 'rails-8.0' do
98108
gem 'rails', '~> 8.0.0'
99109
gem 'importmap-rails', require: false
100-
101-
group :active_record do
102-
platforms :ruby, :mswin, :mingw, :x64_mingw do
103-
gem 'sqlite3', '~> 2.2'
104-
end
105-
end
106110
end
107111

108112
appraise 'composite_primary_keys' do
109113
gem 'rails', '~> 7.0.0'
110114

111115
group :active_record do
112116
gem 'composite_primary_keys'
117+
118+
platforms :ruby, :mswin, :mingw, :x64_mingw do
119+
gem 'sqlite3', '~> 1.3'
120+
end
113121
end
114122
end

‎gemfiles/composite_primary_keys.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ group :active_record do
4848
platforms :ruby, :mswin, :mingw, :x64_mingw do
4949
gem "mysql2", ">= 0.3.14"
5050
gem "pg", ">= 1.0.0"
51-
gem "sqlite3", ">= 1.3.0"
51+
gem "sqlite3", "~> 1.3"
5252
end
5353
end
5454

‎gemfiles/rails_7.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ group :active_record do
4848
platforms :ruby, :mswin, :mingw, :x64_mingw do
4949
gem "mysql2", ">= 0.3.14"
5050
gem "pg", ">= 1.0.0"
51-
gem "sqlite3", ">= 1.3.0"
51+
gem "sqlite3", "~> 1.3"
5252
end
5353

5454
platforms :jruby do

‎gemfiles/rails_7.1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ group :active_record do
4848
platforms :ruby, :mswin, :mingw, :x64_mingw do
4949
gem "mysql2", ">= 0.3.14"
5050
gem "pg", ">= 1.0.0"
51-
gem "sqlite3", ">= 1.3.0"
51+
gem "sqlite3", "~> 1.3"
5252
end
5353
end
5454

‎gemfiles/rails_8.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ group :active_record do
4848
platforms :ruby, :mswin, :mingw, :x64_mingw do
4949
gem "mysql2", ">= 0.3.14"
5050
gem "pg", ">= 1.0.0"
51-
gem "sqlite3", "~> 2.2"
51+
gem "sqlite3", ">= 1.3.0"
5252
end
5353
end
5454

‎spec/dummy_app/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ gem 'devise', '>= 3.2'
2626
gem 'dragonfly', '~> 1.0'
2727
gem 'importmap-rails', require: false
2828
gem 'mini_magick', '>= 3.4'
29-
gem 'mlb', '>= 0.7', github: 'mshibuya/mlb', branch: 'ruby-3'
29+
gem 'mlb', '>= 0.7'
3030
gem 'paperclip', '>= 3.4'
3131
gem 'rails_admin', path: '../../'
3232
gem 'shrine', '~> 3.0'

‎spec/dummy_app/Gemfile.rails6

-49
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.