Skip to content

Commit a18ded8

Browse files
authored
Merge pull request #160 from moiristo/dependency-update
Remove EOL ruby & rails versions from test build, bump uri
2 parents e0ab076 + ae109aa commit a18ded8

29 files changed

Lines changed: 129 additions & 616 deletions

.github/workflows/ruby.yml

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,52 +15,11 @@ on:
1515

1616
jobs:
1717
test:
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:
21-
ruby-version: [2.3.0, 2.4.4, 2.5.5, 2.6.3]
22-
appraisal: ["3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2", "6.0"]
23-
include:
24-
- ruby-version: 2.7.5
25-
appraisal: "7.0"
26-
- ruby-version: 3.3.5
27-
appraisal: "8.0"
28-
exclude:
29-
- ruby-version: 2.3.0
30-
appraisal: "4.0"
31-
- ruby-version: 2.3.0
32-
appraisal: "4.2"
33-
- ruby-version: 2.3.0
34-
appraisal: "6.0"
35-
- ruby-version: 2.4.4
36-
appraisal: "3.2"
37-
- ruby-version: 2.4.4
38-
appraisal: "4.0"
39-
- ruby-version: 2.4.4
40-
appraisal: "4.1"
41-
- ruby-version: 2.4.4
42-
appraisal: "4.2"
43-
- ruby-version: 2.4.4
44-
appraisal: "6.0"
45-
- ruby-version: 2.5.5
46-
appraisal: "3.2"
47-
- ruby-version: 2.5.5
48-
appraisal: "4.0"
49-
- ruby-version: 2.5.5
50-
appraisal: "4.1"
51-
- ruby-version: 2.5.5
52-
appraisal: "4.2"
53-
- ruby-version: 2.5.5
54-
appraisal: "5.2"
55-
- ruby-version: 2.6.3
56-
appraisal: "3.2"
57-
- ruby-version: 2.6.3
58-
appraisal: "4.0"
59-
- ruby-version: 2.6.3
60-
appraisal: "4.1"
61-
- ruby-version: 2.6.3
62-
appraisal: "4.2"
63-
21+
ruby-version: [3.3.5, 3.4.4]
22+
appraisal: ["7.1", "8.0"]
6423
steps:
6524
- uses: actions/checkout@v4
6625
- name: Set up Ruby

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.3.5

Appraisals

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,6 @@
11
# frozen_string_literal: true
2-
3-
appraise '3.2' do
4-
gem 'activerecord', '~> 3.2.0'
5-
gem 'i18n', '~> 0.6.5'
6-
gem 'sqlite3', '~> 1.3.13'
7-
end
8-
9-
appraise '4.0' do
10-
gem 'activerecord', '~> 4.0.0'
11-
gem 'i18n', '~> 0.6.5'
12-
gem 'sqlite3', '~> 1.3.13'
13-
end
14-
15-
appraise '4.1' do
16-
gem 'activerecord', '~> 4.1.0'
17-
gem 'i18n', '~> 0.6.9'
18-
gem 'sqlite3', '~> 1.3.13'
19-
end
20-
21-
appraise '4.2' do
22-
gem 'activerecord', '~> 4.2.3'
23-
gem 'i18n', '~> 0.7.0'
24-
gem 'sqlite3', '~> 1.3.13'
25-
end
26-
27-
appraise '5.0' do
28-
gem 'activerecord', '~> 5.0.0'
29-
gem 'i18n', '~> 0.7.0'
30-
gem 'sqlite3', '~> 1.3.13'
31-
end
32-
33-
appraise '5.1' do
34-
gem 'activerecord', '~> 5.1.0'
35-
gem 'i18n', '~> 0.7.0'
36-
gem 'sqlite3', '~> 1.3.13'
37-
end
38-
39-
appraise '5.2' do
40-
gem 'activerecord', '~> 5.2.0'
41-
gem 'i18n', '~> 0.7.0'
42-
gem 'sqlite3', '~> 1.3.13'
43-
end
44-
45-
appraise '6.0' do
46-
gem 'activerecord', '~> 6.0.0'
47-
gem 'sqlite3', '~> 1.4.1'
48-
end
49-
50-
appraise '7.0' do
51-
gem 'activerecord', '~> 7.0.0'
52-
gem 'sqlite3', '~> 1.4.1'
2+
appraise '7.1' do
3+
gem 'activerecord', '~> 7.1.0'
534
end
545

556
appraise '8.0' do

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
### Removed
11+
12+
- Removed EOL ruby versions from test build
13+
- Removed EOL rails versions from test build
14+
1015
## [3.2.1] - 2024-11-20
1116

1217
### Added

Gemfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ source 'http://rubygems.org'
44

55
gem 'activerecord', '>= 3.1.0', '< 9'
66
gem 'bundler', :group => :test
7-
gem 'rake', '~> 12.3', :group => :test
8-
97
gem 'appraisal', :group => :test
108
gem 'minitest', :group => :test
11-
gem 'sqlite3', '~> 2.2', :group => :test
12-
gem 'concurrent-ruby', '1.3.4', :group => :test
9+
gem 'sqlite3', :group => :test
10+
gem 'logger', :group => :test

Gemfile.lock

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activemodel (8.0.0)
5-
activesupport (= 8.0.0)
6-
activerecord (8.0.0)
7-
activemodel (= 8.0.0)
8-
activesupport (= 8.0.0)
4+
activemodel (8.0.2)
5+
activesupport (= 8.0.2)
6+
activerecord (8.0.2)
7+
activemodel (= 8.0.2)
8+
activesupport (= 8.0.2)
99
timeout (>= 0.4.0)
10-
activesupport (8.0.0)
10+
activesupport (8.0.2)
1111
base64
1212
benchmark (>= 0.3)
1313
bigdecimal
@@ -24,26 +24,26 @@ GEM
2424
bundler
2525
rake
2626
thor (>= 0.14.0)
27-
base64 (0.2.0)
28-
benchmark (0.4.0)
29-
bigdecimal (3.1.8)
30-
concurrent-ruby (1.3.4)
31-
connection_pool (2.4.1)
32-
drb (2.2.1)
33-
i18n (1.14.6)
27+
base64 (0.3.0)
28+
benchmark (0.4.1)
29+
bigdecimal (3.2.2)
30+
concurrent-ruby (1.3.5)
31+
connection_pool (2.5.3)
32+
drb (2.2.3)
33+
i18n (1.14.7)
3434
concurrent-ruby (~> 1.0)
35-
logger (1.6.1)
36-
mini_portile2 (2.8.7)
37-
minitest (5.25.1)
38-
rake (12.3.3)
39-
securerandom (0.3.2)
35+
logger (1.7.0)
36+
mini_portile2 (2.8.8)
37+
minitest (5.25.5)
38+
rake (13.3.0)
39+
securerandom (0.4.1)
4040
sqlite3 (2.2.0)
4141
mini_portile2 (~> 2.8.0)
4242
thor (1.3.2)
43-
timeout (0.4.2)
43+
timeout (0.4.3)
4444
tzinfo (2.0.6)
4545
concurrent-ruby (~> 1.0)
46-
uri (1.0.2)
46+
uri (1.0.3)
4747

4848
PLATFORMS
4949
ruby
@@ -52,10 +52,9 @@ DEPENDENCIES
5252
activerecord (>= 3.1.0, < 9)
5353
appraisal
5454
bundler
55-
concurrent-ruby (= 1.3.4)
55+
logger
5656
minitest
57-
rake (~> 12.3)
58-
sqlite3 (~> 2.2)
57+
sqlite3
5958

6059
BUNDLED WITH
6160
2.5.20

gemfiles/3.2.gemfile.lock

Lines changed: 0 additions & 42 deletions
This file was deleted.

gemfiles/4.0.gemfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

gemfiles/4.0.gemfile.lock

Lines changed: 0 additions & 47 deletions
This file was deleted.

gemfiles/4.1.gemfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)