Skip to content

Commit 7321553

Browse files
authored
Tweak sqlite3 and appraisal dependencies (#287)
- `sqlite3` 1.4.x wasn't compiling on my machine; I see no reason to keep it pinned to 1.4.x, so am relaxing that - I happened to see that `appraisals` was pointed to the bleeding edge on Thoughtbot's Github repo; I'm reverting that to the latest `~> 2.5` stable release.
1 parent f22f3f1 commit 7321553

22 files changed

+41
-45
lines changed

Appraisals

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,28 @@ appraisals = {
1414
instance_eval(&rails_dependencies)
1515

1616
gem 'rails', '~> 6.1.0'
17-
gem 'sqlite3', '~> 1.4.0', platform: %i[ruby mswin mingw]
17+
gem 'sqlite3', '~> 1.4', platform: %i[ruby mswin mingw]
1818
end,
1919
rails_7_0:
2020
proc do
2121
instance_eval(&rails_dependencies)
2222

2323
gem 'rails', '~> 7.0.0'
24-
gem 'sqlite3', '~> 1.4.0', platform: %i[ruby mswin mingw]
24+
gem 'sqlite3', '~> 1.4', platform: %i[ruby mswin mingw]
2525
end,
2626
rails_7_1:
2727
proc do
2828
instance_eval(&rails_dependencies)
2929

3030
gem 'rails', '~> 7.1.0'
31-
gem 'sqlite3', '~> 1.4.0', platform: %i[ruby mswin mingw]
31+
gem 'sqlite3', '~> 1.4', platform: %i[ruby mswin mingw]
3232
end,
3333
rails_7_2:
3434
proc do
3535
instance_eval(&rails_dependencies)
3636

3737
gem 'rails', '~> 7.2.0'
38-
gem 'sqlite3', '~> 1.4.0', platform: %i[ruby mswin mingw]
38+
gem 'sqlite3', '~> 1.4', platform: %i[ruby mswin mingw]
3939
end,
4040
rails_8_0:
4141
proc do

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
- Fix `logger` dependency issues in CI. [#277](https://github.com/splitwise/super_diff/pull/277)
2323
- Updated permalink to rspec differ in README.md [#258](https://github.com/splitwise/super_diff/pull/276) by [@sealocal](https://github.com/sealocal)
24+
- Tweak `sqlite3` and `appraisal` dev dependencies. [#287](https://github.com/splitwise/super_diff/pull/287)
2425

2526
## 0.15.0 - 2025-01-06
2627

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
44

55
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
66

7-
gem 'appraisal', github: 'thoughtbot/appraisal'
7+
gem 'appraisal', '~> 2.5'
88
gem 'bundler-audit'
99
gem 'childprocess'
1010
gem 'climate_control'

Gemfile.lock

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
GIT
2-
remote: https://github.com/thoughtbot/appraisal
3-
revision: 24feeea4c5c1d2e7a5f95d053da61858c6bfb2b1
4-
specs:
5-
appraisal (2.5.0)
6-
bundler
7-
rake
8-
thor (>= 0.14.0)
9-
101
PATH
112
remote: .
123
specs:
@@ -18,6 +9,10 @@ PATH
189
GEM
1910
remote: https://rubygems.org/
2011
specs:
12+
appraisal (2.5.0)
13+
bundler
14+
rake
15+
thor (>= 0.14.0)
2116
ast (2.4.2)
2217
attr_extras (7.1.0)
2318
bundler-audit (0.9.2)
@@ -91,7 +86,7 @@ PLATFORMS
9186
ruby
9287

9388
DEPENDENCIES
94-
appraisal!
89+
appraisal (~> 2.5)
9590
bundler-audit
9691
childprocess
9792
climate_control

gemfiles/no_rails_rspec_gte_3_10.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal", git: "https://github.com/thoughtbot/appraisal"
5+
gem "appraisal", "~> 2.5"
66
gem "bundler-audit"
77
gem "childprocess"
88
gem "climate_control"

gemfiles/no_rails_rspec_gte_3_13.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal", git: "https://github.com/thoughtbot/appraisal"
5+
gem "appraisal", "~> 2.5"
66
gem "bundler-audit"
77
gem "childprocess"
88
gem "climate_control"

gemfiles/no_rails_rspec_lt_3_10.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal", git: "https://github.com/thoughtbot/appraisal"
5+
gem "appraisal", "~> 2.5"
66
gem "bundler-audit"
77
gem "childprocess"
88
gem "climate_control"

gemfiles/rails_6_1_rspec_gte_3_10.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal", git: "https://github.com/thoughtbot/appraisal"
5+
gem "appraisal", "~> 2.5"
66
gem "bundler-audit"
77
gem "childprocess"
88
gem "climate_control"
@@ -19,7 +19,7 @@ gem "jdbc-sqlite3", platform: :jruby
1919
gem "net-ftp"
2020
gem "combustion"
2121
gem "rails", "~> 6.1.0"
22-
gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
22+
gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw]
2323
gem "rspec", "3.12.0"
2424
gem "rspec-core", "3.12.0"
2525
gem "rspec-expectations", "3.12.3"

gemfiles/rails_6_1_rspec_gte_3_13.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal", git: "https://github.com/thoughtbot/appraisal"
5+
gem "appraisal", "~> 2.5"
66
gem "bundler-audit"
77
gem "childprocess"
88
gem "climate_control"
@@ -19,7 +19,7 @@ gem "jdbc-sqlite3", platform: :jruby
1919
gem "net-ftp"
2020
gem "combustion"
2121
gem "rails", "~> 6.1.0"
22-
gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
22+
gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw]
2323
gem "rspec", "3.13.0"
2424
gem "rspec-core", "3.13.0"
2525
gem "rspec-expectations", "3.13.0"

gemfiles/rails_6_1_rspec_lt_3_10.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal", git: "https://github.com/thoughtbot/appraisal"
5+
gem "appraisal", "~> 2.5"
66
gem "bundler-audit"
77
gem "childprocess"
88
gem "climate_control"
@@ -19,7 +19,7 @@ gem "jdbc-sqlite3", platform: :jruby
1919
gem "net-ftp"
2020
gem "combustion"
2121
gem "rails", "~> 6.1.0"
22-
gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
22+
gem "sqlite3", "~> 1.4", platform: [:ruby, :mswin, :mingw]
2323
gem "rspec", "~> 3.9.0"
2424
gem "rspec-rails"
2525

0 commit comments

Comments
 (0)