Skip to content

Commit 4751042

Browse files
committed
move sqlite3 dependency from Gemfile to Appraisals so different Rails versions can have different sqlite3 versions as required
1 parent 47fb683 commit 4751042

8 files changed

+18
-9
lines changed

Diff for: Appraisals

+12
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,42 @@ appraise "rails-60" do
55

66
# https://github.com/rails/rails/issues/54271
77
gem "concurrent-ruby", "< 1.3.5"
8+
9+
gem 'sqlite3', ">= 1.4.0", "< 2", :platform => [:ruby, :mswin]
810
end
911

1012
appraise "rails-61" do
1113
gem 'activerecord', '~> 6.1.0'
1214

1315
# https://github.com/rails/rails/issues/54271
1416
gem "concurrent-ruby", "< 1.3.5"
17+
18+
gem 'sqlite3', ">= 1.4.0", "< 2", :platform => [:ruby, :mswin]
1519
end
1620

1721
appraise "rails-70" do
1822
gem 'activerecord', '~> 7.0.0'
1923

2024
# https://github.com/rails/rails/issues/54271
2125
gem "concurrent-ruby", "< 1.3.5"
26+
27+
gem 'sqlite3', ">= 1.4.0", "< 2", :platform => [:ruby, :mswin]
2228
end
2329

2430
appraise "rails-71" do
2531
gem 'activerecord', '~> 7.1.0'
32+
33+
gem 'sqlite3', ">= 1.4.0", "< 3.0", :platform => [:ruby, :mswin]
2634
end
2735

2836
appraise "rails-72" do
2937
gem 'activerecord', '~> 7.2.0'
38+
39+
gem 'sqlite3', ">= 1.4.0", "< 3.0", :platform => [:ruby, :mswin]
3040
end
3141

3242
appraise "rails-80" do
3343
gem 'activerecord', '~> 8.0.0'
44+
45+
gem 'sqlite3', ">= 1.4.0", "< 3.0", :platform => [:ruby, :mswin]
3446
end

Diff for: Gemfile

-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@ group :test do
1212
gem 'redcarpet', :platform => :ruby # For fast, Github-like Markdown
1313
gem 'kramdown', :platform => :jruby # For Markdown without a C compiler
1414
gem 'test-unit'
15-
16-
# This version of sqlite3 oughta be good for activerecord 5.1+ hopefully
17-
gem 'sqlite3', ">= 1.4.0", "< 3.0", :platform => [:ruby, :mswin]
1815
end

Diff for: gemfiles/rails_60.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ source "http://rubygems.org"
55
gem "jruby-openssl", platform: :jruby
66
gem "activerecord", "~> 6.0.0"
77
gem "concurrent-ruby", "< 1.3.5"
8+
gem "sqlite3", ">= 1.4.0", "< 2", platform: [:ruby, :mswin]
89

910
group :test do
1011
gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby]
@@ -14,7 +15,6 @@ group :test do
1415
gem "redcarpet", platform: :ruby
1516
gem "kramdown", platform: :jruby
1617
gem "test-unit"
17-
gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin]
1818
end
1919

2020
gemspec path: "../"

Diff for: gemfiles/rails_61.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ source "http://rubygems.org"
55
gem "jruby-openssl", platform: :jruby
66
gem "activerecord", "~> 6.1.0"
77
gem "concurrent-ruby", "< 1.3.5"
8+
gem "sqlite3", ">= 1.4.0", "< 2", platform: [:ruby, :mswin]
89

910
group :test do
1011
gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby]
@@ -14,7 +15,6 @@ group :test do
1415
gem "redcarpet", platform: :ruby
1516
gem "kramdown", platform: :jruby
1617
gem "test-unit"
17-
gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin]
1818
end
1919

2020
gemspec path: "../"

Diff for: gemfiles/rails_70.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ source "http://rubygems.org"
55
gem "jruby-openssl", platform: :jruby
66
gem "activerecord", "~> 7.0.0"
77
gem "concurrent-ruby", "< 1.3.5"
8+
gem "sqlite3", ">= 1.4.0", "< 2", platform: [:ruby, :mswin]
89

910
group :test do
1011
gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby]
@@ -14,7 +15,6 @@ group :test do
1415
gem "redcarpet", platform: :ruby
1516
gem "kramdown", platform: :jruby
1617
gem "test-unit"
17-
gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin]
1818
end
1919

2020
gemspec path: "../"

Diff for: gemfiles/rails_71.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ source "http://rubygems.org"
44

55
gem "jruby-openssl", platform: :jruby
66
gem "activerecord", "~> 7.1.0"
7+
gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin]
78

89
group :test do
910
gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby]
@@ -13,7 +14,6 @@ group :test do
1314
gem "redcarpet", platform: :ruby
1415
gem "kramdown", platform: :jruby
1516
gem "test-unit"
16-
gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin]
1717
end
1818

1919
gemspec path: "../"

Diff for: gemfiles/rails_72.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ source "http://rubygems.org"
44

55
gem "jruby-openssl", platform: :jruby
66
gem "activerecord", "~> 7.2.0"
7+
gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin]
78

89
group :test do
910
gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby]
@@ -13,7 +14,6 @@ group :test do
1314
gem "redcarpet", platform: :ruby
1415
gem "kramdown", platform: :jruby
1516
gem "test-unit"
16-
gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin]
1717
end
1818

1919
gemspec path: "../"

Diff for: gemfiles/rails_80.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ source "http://rubygems.org"
44

55
gem "jruby-openssl", platform: :jruby
66
gem "activerecord", "~> 8.0.0"
7+
gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin]
78

89
group :test do
910
gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby]
@@ -13,7 +14,6 @@ group :test do
1314
gem "redcarpet", platform: :ruby
1415
gem "kramdown", platform: :jruby
1516
gem "test-unit"
16-
gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin]
1717
end
1818

1919
gemspec path: "../"

0 commit comments

Comments
 (0)