Skip to content

Commit 1e1f467

Browse files
committed
Restore Ruby 2.3 Caboose tooling
1 parent 71f6783 commit 1e1f467

4 files changed

Lines changed: 17 additions & 7 deletions

File tree

.rubocop_gradual.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
[571, 48, 1, "Style/TrailingCommaInArguments: Avoid comma after the last parameter of a method call.", 177545],
4545
[573, 21, 1, "Style/TrailingCommaInArguments: Avoid comma after the last parameter of a method call.", 177545]
4646
],
47-
"oauth2.gemspec:2324570894": [
47+
"oauth2.gemspec:3554116155": [
4848
[81, 5, 36, "Style/TrailingCommaInArrayLiteral: Put a comma after the last item of a multiline array.", 3227795012],
4949
[106, 5, 9, "Style/TrailingCommaInArrayLiteral: Put a comma after the last item of a multiline array.", 1146747705],
50-
[178, 3, 68, "Gemspec/OrderedDependencies: Dependencies should be sorted in an alphabetical order within their section of the gemspec. Dependency `backports` should appear before `rexml`.", 4213155631]
50+
[186, 3, 68, "Gemspec/OrderedDependencies: Dependencies should be sorted in an alphabetical order within their section of the gemspec. Dependency `backports` should appear before `rexml`.", 4213155631]
5151
],
5252
"spec/examples/google_spec.rb:2278649676": [
5353
[17, 35, 1, "Style/TrailingCommaInArguments: Avoid comma after the last parameter of a method call.", 177545]

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Please file a bug if you notice a violation of semantic versioning.
2929
### Fixed
3030

3131
- Updated CI workflow maintenance: QLTY uploads now use OIDC, harden-runner is pinned to v2.19.4, and Caboose dependency installation logs are visible on failure.
32+
- Restored Ruby 2.3 Caboose CI bundle resolution by using the last compatible kettle development/test toolchain on that EOL runtime.
3233
- Replaced stale platform CI `rake magic` commands with portable spec commands.
3334
- Pinned `multi_xml` below 0.9 for TruffleRuby compatibility.
3435
- Marked EOL TruffleRuby 22.3, 23.0, and 23.1 CI as experimental because they can crash inside the interpreter during Bundler setup.

docs/file.CHANGELOG.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ <h3 id="fixed">Fixed</h3>
8484

8585
<ul>
8686
<li>Updated CI workflow maintenance: QLTY uploads now use OIDC, harden-runner is pinned to v2.19.4, and Caboose dependency installation logs are visible on failure.</li>
87+
<li>Restored Ruby 2.3 Caboose CI bundle resolution by using the last compatible kettle development/test toolchain on that EOL runtime.</li>
8788
<li>Replaced stale platform CI <code>rake magic</code> commands with portable spec commands.</li>
8889
<li>Pinned <code>multi_xml</code> below 0.9 for TruffleRuby compatibility.</li>
8990
<li>Marked EOL TruffleRuby 22.3, 23.0, and 23.1 CI as experimental because they can crash inside the interpreter during Bundler setup.</li>
@@ -1405,7 +1406,7 @@ <h2 id="001---2010-04-22">
14051406
</div></div>
14061407

14071408
<div id="footer">
1408-
Generated on Wed Jun 3 19:00:56 2026 by
1409+
Generated on Wed Jun 3 19:07:25 2026 by
14091410
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
14101411
0.9.44 (ruby-4.0.4).
14111412
</div>

oauth2.gemspec

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Gem::Specification.new do |spec|
125125
# However, development dependencies in gemspec will install on
126126
# all versions of Ruby that will run in CI.
127127
# This gem, and its gemspec runtime dependencies, will install on Ruby down to 2.2.0.
128-
# This gem, and its gemspec development dependencies, will install on Ruby down to 2.4.
128+
# This gem, and its standard gemspec development dependencies, will install on Ruby down to 2.4.
129129
# Thus, dev dependencies in gemspec must have
130130
#
131131
# required_ruby_version ">= 2.4" (or lower)
@@ -134,7 +134,11 @@ Gem::Specification.new do |spec|
134134
# and preferably a modular one (see gemfiles/modular/*.gemfile).
135135

136136
# Dev, Test, & Release Tasks
137-
spec.add_development_dependency("kettle-dev", "~> 2.0", ">= 2.0.8") # ruby >= 2.4
137+
if Gem.ruby_version < Gem::Version.new("2.4")
138+
spec.add_development_dependency("kettle-dev", "~> 2.0", "= 2.0.0") # ruby >= 2.3.0
139+
else
140+
spec.add_development_dependency("kettle-dev", "~> 2.0", ">= 2.0.8") # ruby >= 2.4.0
141+
end
138142

139143
# Security
140144
spec.add_development_dependency("bundler-audit", "~> 0.9.3") # ruby >= 2.0.0
@@ -147,8 +151,12 @@ Gem::Specification.new do |spec|
147151

148152
# Testing
149153
spec.add_development_dependency("appraisal2", "~> 3.0", ">= 3.0.6") # ruby >= 1.8.7, for testing against multiple versions of dependencies
150-
spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.3") # ruby >= 2.4
151-
spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.1") # ruby >= 2.4.0, default kettle-test runner
154+
if Gem.ruby_version < Gem::Version.new("2.4")
155+
spec.add_development_dependency("kettle-test", "~> 1.0", ">= 1.0.10") # ruby >= 2.3.0
156+
else
157+
spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.3") # ruby >= 2.4.0
158+
spec.add_development_dependency("turbo_tests2", "~> 3.1", ">= 3.1.1") # ruby >= 2.4.0, default kettle-test runner
159+
end
152160

153161
# Releasing
154162
spec.add_development_dependency("ruby-progressbar", "~> 1.13") # ruby >= 0

0 commit comments

Comments
 (0)