Skip to content

Commit baf632c

Browse files
chadlwilsonkares
chadlwilson
authored and
kares
committed
Bump/synchronize appraisals
1 parent d1f299a commit baf632c

18 files changed

+119
-124
lines changed

‎.github/workflows/maven.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ jobs:
9797
java_version: '17' # JRuby 10 requires Java 21
9898
fail-fast: false
9999

100+
env:
101+
BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile
102+
JRUBY_VERSION: ${{ matrix.jruby_version }}
103+
100104
steps:
101105
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
102106

@@ -111,11 +115,9 @@ jobs:
111115
uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
112116
with:
113117
ruby-version: jruby-${{ matrix.jruby_version }}
114-
bundler: 2.3.27 # use version that is OK for JRuby 9.3
118+
bundler-cache: 'false' # Need to install later so we can vary from Gemfile.lock as required for JRuby version compatibility
119+
bundler: ${{ startsWith(matrix.jruby_version, '9.3') && '2.3.27' || 'Gemfile.lock' }}
115120

116121
- name: Run appraisal for ${{ matrix.appraisal }}
117-
env:
118-
BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile
119-
JRUBY_VERSION: ${{ matrix.jruby_version }}
120122
run: bundle install && bundle exec rake spec
121123

‎gemfiles/rails50.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem "rspec", group: :test
77
gem "rails", "~> 5.0.0"
88

99
group :default do
10-
gem "rack", "~> 2.2", "< 3.0"
10+
gem "rack", "~> 2.2"
1111
end
1212

1313
group :development do

‎gemfiles/rails50.gemfile.lock

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@ GEM
4747
concurrent-ruby (1.3.5)
4848
crass (1.0.6)
4949
date (3.4.1-java)
50-
diff-lcs (1.6.0)
50+
diff-lcs (1.6.2)
5151
erubis (2.7.0)
5252
globalid (1.1.0)
5353
activesupport (>= 5.0)
5454
i18n (1.14.7)
5555
concurrent-ruby (~> 1.0)
56-
loofah (2.24.0)
56+
logger (1.7.0)
57+
loofah (2.24.1)
5758
crass (~> 1.0.2)
5859
nokogiri (>= 1.12.0)
5960
mail (2.8.1)
@@ -63,8 +64,8 @@ GEM
6364
net-smtp
6465
method_source (1.1.0)
6566
mini_mime (1.1.5)
66-
minitest (5.25.4)
67-
net-imap (0.5.6)
67+
minitest (5.25.5)
68+
net-imap (0.5.8)
6869
date
6970
net-protocol
7071
net-pop (0.1.2)
@@ -74,10 +75,10 @@ GEM
7475
net-smtp (0.5.1)
7576
net-protocol
7677
nio4r (2.7.4-java)
77-
nokogiri (1.18.3-java)
78+
nokogiri (1.18.8-java)
7879
racc (~> 1.4)
7980
racc (1.8.1-java)
80-
rack (2.2.11)
81+
rack (2.2.15)
8182
rack-test (0.6.3)
8283
rack (>= 1.0)
8384
rails (5.0.7.2)
@@ -112,15 +113,16 @@ GEM
112113
rspec-mocks (~> 3.13.0)
113114
rspec-core (3.13.3)
114115
rspec-support (~> 3.13.0)
115-
rspec-expectations (3.13.3)
116+
rspec-expectations (3.13.4)
116117
diff-lcs (>= 1.2.0, < 2.0)
117118
rspec-support (~> 3.13.0)
118-
rspec-mocks (3.13.2)
119+
rspec-mocks (3.13.4)
119120
diff-lcs (>= 1.2.0, < 2.0)
120121
rspec-support (~> 3.13.0)
121-
rspec-support (3.13.2)
122-
sprockets (4.2.1)
122+
rspec-support (3.13.3)
123+
sprockets (4.2.2)
123124
concurrent-ruby (~> 1.0)
125+
logger
124126
rack (>= 2.2.4, < 4)
125127
sprockets-rails (3.2.2)
126128
actionpack (>= 4.0)
@@ -143,7 +145,7 @@ PLATFORMS
143145

144146
DEPENDENCIES
145147
appraisal
146-
rack (~> 2.2, < 3.0)
148+
rack (~> 2.2)
147149
rails (~> 5.0.0)
148150
rake (~> 13.2)
149151
rspec

‎gemfiles/rails52.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem "rspec", group: :test
77
gem "rails", "~> 5.2.0"
88

99
group :default do
10-
gem "rack", "~> 2.2", "< 3.0"
10+
gem "rack", "~> 2.2"
1111
end
1212

1313
group :development do

‎gemfiles/rails52.gemfile.lock

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,14 @@ GEM
5252
concurrent-ruby (1.3.5)
5353
crass (1.0.6)
5454
date (3.4.1-java)
55-
diff-lcs (1.6.0)
55+
diff-lcs (1.6.2)
5656
erubi (1.13.1)
5757
globalid (1.1.0)
5858
activesupport (>= 5.0)
5959
i18n (1.14.7)
6060
concurrent-ruby (~> 1.0)
61-
loofah (2.24.0)
61+
logger (1.7.0)
62+
loofah (2.24.1)
6263
crass (~> 1.0.2)
6364
nokogiri (>= 1.12.0)
6465
mail (2.8.1)
@@ -69,8 +70,8 @@ GEM
6970
marcel (1.0.4)
7071
method_source (1.1.0)
7172
mini_mime (1.1.5)
72-
minitest (5.25.4)
73-
net-imap (0.5.6)
73+
minitest (5.25.5)
74+
net-imap (0.5.8)
7475
date
7576
net-protocol
7677
net-pop (0.1.2)
@@ -80,10 +81,10 @@ GEM
8081
net-smtp (0.5.1)
8182
net-protocol
8283
nio4r (2.7.4-java)
83-
nokogiri (1.18.3-java)
84+
nokogiri (1.18.8-java)
8485
racc (~> 1.4)
8586
racc (1.8.1-java)
86-
rack (2.2.11)
87+
rack (2.2.15)
8788
rack-test (2.2.0)
8889
rack (>= 1.3)
8990
rails (5.2.8.1)
@@ -119,15 +120,16 @@ GEM
119120
rspec-mocks (~> 3.13.0)
120121
rspec-core (3.13.3)
121122
rspec-support (~> 3.13.0)
122-
rspec-expectations (3.13.3)
123+
rspec-expectations (3.13.4)
123124
diff-lcs (>= 1.2.0, < 2.0)
124125
rspec-support (~> 3.13.0)
125-
rspec-mocks (3.13.2)
126+
rspec-mocks (3.13.4)
126127
diff-lcs (>= 1.2.0, < 2.0)
127128
rspec-support (~> 3.13.0)
128-
rspec-support (3.13.2)
129-
sprockets (4.2.1)
129+
rspec-support (3.13.3)
130+
sprockets (4.2.2)
130131
concurrent-ruby (~> 1.0)
132+
logger
131133
rack (>= 2.2.4, < 4)
132134
sprockets-rails (3.4.2)
133135
actionpack (>= 5.2)
@@ -151,7 +153,7 @@ PLATFORMS
151153

152154
DEPENDENCIES
153155
appraisal
154-
rack (~> 2.2, < 3.0)
156+
rack (~> 2.2)
155157
rails (~> 5.2.0)
156158
rake (~> 13.2)
157159
rspec

‎gemfiles/rails60.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem "rspec", group: :test
77
gem "rails", "~> 6.0.0"
88

99
group :default do
10-
gem "rack", "~> 2.2", "< 3.0"
10+
gem "rack", "~> 2.2"
1111
end
1212

1313
group :development do

‎gemfiles/rails60.gemfile.lock

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,14 @@ GEM
6565
concurrent-ruby (1.3.5)
6666
crass (1.0.6)
6767
date (3.4.1-java)
68-
diff-lcs (1.6.0)
68+
diff-lcs (1.6.2)
6969
erubi (1.13.1)
7070
globalid (1.1.0)
7171
activesupport (>= 5.0)
7272
i18n (1.14.7)
7373
concurrent-ruby (~> 1.0)
74-
loofah (2.24.0)
74+
logger (1.7.0)
75+
loofah (2.24.1)
7576
crass (~> 1.0.2)
7677
nokogiri (>= 1.12.0)
7778
mail (2.8.1)
@@ -82,8 +83,8 @@ GEM
8283
marcel (1.0.4)
8384
method_source (1.1.0)
8485
mini_mime (1.1.5)
85-
minitest (5.25.4)
86-
net-imap (0.5.6)
86+
minitest (5.25.5)
87+
net-imap (0.5.8)
8788
date
8889
net-protocol
8990
net-pop (0.1.2)
@@ -93,10 +94,10 @@ GEM
9394
net-smtp (0.5.1)
9495
net-protocol
9596
nio4r (2.7.4-java)
96-
nokogiri (1.18.3-java)
97+
nokogiri (1.18.8-java)
9798
racc (~> 1.4)
9899
racc (1.8.1-java)
99-
rack (2.2.11)
100+
rack (2.2.15)
100101
rack-test (2.2.0)
101102
rack (>= 1.3)
102103
rails (6.0.6.1)
@@ -134,15 +135,16 @@ GEM
134135
rspec-mocks (~> 3.13.0)
135136
rspec-core (3.13.3)
136137
rspec-support (~> 3.13.0)
137-
rspec-expectations (3.13.3)
138+
rspec-expectations (3.13.4)
138139
diff-lcs (>= 1.2.0, < 2.0)
139140
rspec-support (~> 3.13.0)
140-
rspec-mocks (3.13.2)
141+
rspec-mocks (3.13.4)
141142
diff-lcs (>= 1.2.0, < 2.0)
142143
rspec-support (~> 3.13.0)
143-
rspec-support (3.13.2)
144-
sprockets (4.2.1)
144+
rspec-support (3.13.3)
145+
sprockets (4.2.2)
145146
concurrent-ruby (~> 1.0)
147+
logger
146148
rack (>= 2.2.4, < 4)
147149
sprockets-rails (3.4.2)
148150
actionpack (>= 5.2)
@@ -157,7 +159,7 @@ GEM
157159
base64
158160
websocket-extensions (>= 0.1.0)
159161
websocket-extensions (0.1.5)
160-
zeitwerk (2.6.18)
162+
zeitwerk (2.7.2)
161163

162164
PLATFORMS
163165
universal-java-1.8
@@ -167,7 +169,7 @@ PLATFORMS
167169

168170
DEPENDENCIES
169171
appraisal
170-
rack (~> 2.2, < 3.0)
172+
rack (~> 2.2)
171173
rails (~> 6.0.0)
172174
rake (~> 13.2)
173175
rspec

‎gemfiles/rails61.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem "rspec", group: :test
77
gem "rails", "~> 6.1.0"
88

99
group :default do
10-
gem "rack", "~> 2.2", "< 3.0"
10+
gem "rack", "~> 2.2"
1111
end
1212

1313
group :development do

‎gemfiles/rails61.gemfile.lock

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,14 @@ GEM
6969
concurrent-ruby (1.3.5)
7070
crass (1.0.6)
7171
date (3.4.1-java)
72-
diff-lcs (1.6.0)
72+
diff-lcs (1.6.2)
7373
erubi (1.13.1)
7474
globalid (1.2.1)
7575
activesupport (>= 6.1)
7676
i18n (1.14.7)
7777
concurrent-ruby (~> 1.0)
78-
loofah (2.24.0)
78+
logger (1.7.0)
79+
loofah (2.24.1)
7980
crass (~> 1.0.2)
8081
nokogiri (>= 1.12.0)
8182
mail (2.8.1)
@@ -86,8 +87,8 @@ GEM
8687
marcel (1.0.4)
8788
method_source (1.1.0)
8889
mini_mime (1.1.5)
89-
minitest (5.25.4)
90-
net-imap (0.5.6)
90+
minitest (5.25.5)
91+
net-imap (0.5.8)
9192
date
9293
net-protocol
9394
net-pop (0.1.2)
@@ -97,10 +98,10 @@ GEM
9798
net-smtp (0.5.1)
9899
net-protocol
99100
nio4r (2.7.4-java)
100-
nokogiri (1.18.3-java)
101+
nokogiri (1.18.8-java)
101102
racc (~> 1.4)
102103
racc (1.8.1-java)
103-
rack (2.2.11)
104+
rack (2.2.15)
104105
rack-test (2.2.0)
105106
rack (>= 1.3)
106107
rails (6.1.7.10)
@@ -138,15 +139,16 @@ GEM
138139
rspec-mocks (~> 3.13.0)
139140
rspec-core (3.13.3)
140141
rspec-support (~> 3.13.0)
141-
rspec-expectations (3.13.3)
142+
rspec-expectations (3.13.4)
142143
diff-lcs (>= 1.2.0, < 2.0)
143144
rspec-support (~> 3.13.0)
144-
rspec-mocks (3.13.2)
145+
rspec-mocks (3.13.4)
145146
diff-lcs (>= 1.2.0, < 2.0)
146147
rspec-support (~> 3.13.0)
147-
rspec-support (3.13.2)
148-
sprockets (4.2.1)
148+
rspec-support (3.13.3)
149+
sprockets (4.2.2)
149150
concurrent-ruby (~> 1.0)
151+
logger
150152
rack (>= 2.2.4, < 4)
151153
sprockets-rails (3.5.2)
152154
actionpack (>= 6.1)
@@ -160,7 +162,7 @@ GEM
160162
base64
161163
websocket-extensions (>= 0.1.0)
162164
websocket-extensions (0.1.5)
163-
zeitwerk (2.6.18)
165+
zeitwerk (2.7.2)
164166

165167
PLATFORMS
166168
universal-java-1.8
@@ -170,7 +172,7 @@ PLATFORMS
170172

171173
DEPENDENCIES
172174
appraisal
173-
rack (~> 2.2, < 3.0)
175+
rack (~> 2.2)
174176
rails (~> 6.1.0)
175177
rake (~> 13.2)
176178
rspec

‎gemfiles/rails62.gemfile

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

0 commit comments

Comments
 (0)