Skip to content

Commit a5c8412

Browse files
authored
Use Ruby 3.4.9 and re-bundle (#729)
2 parents cc0ffdd + d43af2d commit a5c8412

6 files changed

Lines changed: 22 additions & 24 deletions

File tree

.buildkite/shared-pipeline-vars

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
22

3-
export IMAGE_ID="xcode-26.1.1"
3+
export IMAGE_ID="xcode-26.6"
44
export CI_TOOLKIT="automattic/a8c-ci-toolkit#5.7.0"
55
export DOCKER_PLUGIN="docker#v5.13.0"
66
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
7-
export RUBY_VERSION="$(cat "$SCRIPT_DIR/../.ruby-version")"
7+
RUBY_VERSION="$(cat "$SCRIPT_DIR/../.ruby-version")"
8+
export RUBY_VERSION
89
export DOCKER_RUBY_IMAGE="public.ecr.aws/docker/library/ruby:$RUBY_VERSION"

.ruby-version

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
3.2.2
2-
1+
3.4.9

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ _None_
2525
- Added regression coverage for `upload_github_release_assets` direct release lookup errors. [#755]
2626
- Centralized `.strings` duplicate-key detection behind `StringsFileValidationHelper.scan_for_duplicate_keys`, returning a `[:scanned | :unsupported_format | :unscannable, payload]` tri-state that callers can map to their own warn-and-skip vs fail-closed policy. [#741]
2727
- `L10nHelper.strings_file_type` and `StringsFileValidationHelper.scan_for_duplicate_keys` accept `assume_valid:` to skip a redundant `plutil -lint` when the caller has already parsed the file. [#741]
28+
- Bumped development Ruby version to 3.4.9 [#729]
2829

2930
## 14.10.0
3031

Gemfile

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,27 @@ source('https://rubygems.org')
44

55
gemspec
66

7+
# Only needed for specs (Time.use_zone, String#to_time, Hash#slice!)
8+
gem 'activesupport', '~> 8.1'
79
gem 'buildkite-test_collector', '~> 2.3'
810
gem 'codecov', require: false
911
gem 'danger-dangermattic', '~> 1.0'
10-
gem 'webmock', require: false
11-
gem 'yard'
12-
1312
# Security:
1413
# - https://github.com/lostisland/faraday/pull/1665
1514
# - https://github.com/lostisland/faraday/pull/1681
15+
#
1616
# Faraday 2.0 is not compatible with Fastlane
17+
#
18+
# See also:
19+
# - https://github.com/fastlane/fastlane/issues/21334
20+
# - https://github.com/fastlane/fastlane/pull/30089
1721
gem 'faraday', '~> 1.10', '>= 1.10.6'
22+
gem 'pry', '~> 0.12.2'
23+
gem 'rmagick', '~> 5.3'
24+
gem 'rspec', '~> 3.8'
25+
gem 'rspec_junit_formatter', '~> 0.4.1'
26+
gem 'rubocop', '~> 1.65'
27+
gem 'rubocop-rspec', '3.0'
28+
gem 'simplecov', '~> 0.16.1'
29+
gem 'webmock', require: false
30+
gem 'yard'

Gemfile.lock

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,11 +438,9 @@ PLATFORMS
438438
DEPENDENCIES
439439
activesupport (~> 8.1)
440440
buildkite-test_collector (~> 2.3)
441-
bundler (~> 2.0)
442441
codecov
443442
danger-dangermattic (~> 1.0)
444443
faraday (~> 1.10, >= 1.10.6)
445-
fastlane (~> 2.210)
446444
fastlane-plugin-wpmreleasetoolkit!
447445
pry (~> 0.12.2)
448446
rmagick (~> 5.3)
@@ -455,4 +453,4 @@ DEPENDENCIES
455453
yard
456454

457455
BUNDLED WITH
458-
2.6.8
456+
4.0.17

fastlane-plugin-wpmreleasetoolkit.gemspec

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,4 @@ Gem::Specification.new do |spec|
4242

4343
# `google-cloud-storage` is required by fastlane, but we pin it in case it's not in the future
4444
spec.add_dependency 'google-cloud-storage', '~> 1.31'
45-
46-
# Only needed for specs (Time.use_zone, String#to_time, Hash#slice!)
47-
spec.add_development_dependency 'activesupport', '~> 8.1'
48-
spec.add_development_dependency 'bundler', '~> 2.0'
49-
# Use at least Fastlane 2.210.0 to ensure compatibility with the Xcode 14 toolchain
50-
# See https://github.com/fastlane/fastlane/releases/tag/2.210.0
51-
spec.add_development_dependency 'fastlane', '~> 2.210'
52-
spec.add_development_dependency 'pry', '~> 0.12.2'
53-
spec.add_development_dependency 'rmagick', '~> 5.3'
54-
spec.add_development_dependency 'rspec', '~> 3.8'
55-
spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
56-
spec.add_development_dependency 'rubocop', '~> 1.65'
57-
spec.add_development_dependency 'rubocop-rspec', '3.0'
58-
spec.add_development_dependency 'simplecov', '~> 0.16.1'
5945
end

0 commit comments

Comments
 (0)