Skip to content

Commit 48b424b

Browse files
committed
ci: move to Xcode 16.3 (#580)
- Update to Xcode 16.3 - Add details about dependencies to use - Clean Gemfiles Closes #580 Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
1 parent 6b168a2 commit 48b424b

File tree

7 files changed

+46
-29
lines changed

7 files changed

+46
-29
lines changed

.github/DEVELOP.md

+13-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ Have a look on the locks file to know which versions we are using (*Podfile*, *P
2626

2727
If some tools are missing, pick the suitable command line below and check versions:
2828
```bash
29+
# Get updated RubyGems
30+
gem update --system 3.6.7
31+
32+
# Install bundler (at least 2.6.7)
33+
gem install bundler
34+
35+
# Install rbenv (at least 1.3.2)
36+
brew install rbenv
37+
2938
# Use Bundler to install a major part of dependencies (thanks to Gemfile and Gemfile.lock files)
3039
bundle install
3140

@@ -56,15 +65,15 @@ brew install xcodesorg/made/xcodes
5665
```
5766

5867
Ensure you have the suitable _Ruby_ version. We recommend the use of [rbenv](https://github.com/rbenv/rbenv) to load the suitable version of ruby.
59-
We use here _Ruby 3_ (>= 3.3).
68+
We use here _Ruby 3_ (>= 3.4).
6069
If you are not used to this tool:
6170

6271
```shell
6372
# List available local versions of Ruby
6473
rbenv install --list
6574

6675
# Apply the expected x.y.z version of Ruby (if listed previously with the command above)
67-
rbenv global 3.3.5
76+
rbenv global 3.4.0
6877

6978
# If you don't have the expected x.y.z version of Ruby, run:
7079
# > brew update && brew upgrade ruby-build
@@ -76,9 +85,9 @@ rbenv global 3.3.5
7685
ruby --version
7786
```
7887

79-
We use also for our GitLab CI runners **Xcode 16.2**, we suggest you use this version or newer if you want.
88+
We use also for our GitLab CI runners **Xcode 16.3**, we suggest you use this version or newer if you want.
8089

81-
**Xcode 16.2** and **Swift 6** are used for this project. You must use this configuration.
90+
**Xcode 16.3** and **Swift 6** are used for this project. You must use this configuration.
8291

8392
## Build Design System Toolbox
8493

.github/workflows/build-and-test.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
- name: Checkout code
4141
uses: actions/checkout@v4
4242

43-
- name: Set up Xcode 16
43+
- name: Set up Xcode 16.3.0
4444
run: |
45-
sudo xcode-select -s /Applications/Xcode_16.2.0.app/Contents/Developer
45+
sudo xcode-select -s /Applications/Xcode_16.3.0.app/Contents/Developer
4646
4747
- name: Set up Ruby
4848
uses: ruby/setup-ruby@v1
@@ -74,9 +74,9 @@ jobs:
7474
- name: Checkout code
7575
uses: actions/checkout@v4
7676

77-
- name: Set up Xcode 16.2
77+
- name: Set up Xcode 16.3.0
7878
run: |
79-
sudo xcode-select -s /Applications/Xcode_16.2.0.app/Contents/Developer
79+
sudo xcode-select -s /Applications/Xcode_16.3.0.app/Contents/Developer
8080
8181
- name: Set up Ruby
8282
uses: ruby/setup-ruby@v1
@@ -100,9 +100,9 @@ jobs:
100100
- name: Checkout code
101101
uses: actions/checkout@v4
102102

103-
- name: Set up Xcode 16.2
103+
- name: Set up Xcode 16.3.0
104104
run: |
105-
sudo xcode-select -s /Applications/Xcode_16.2.0.app/Contents/Developer
105+
sudo xcode-select -s /Applications/Xcode_16.3.0.app/Contents/Developer
106106
107107
- name: Set up Ruby
108108
uses: ruby/setup-ruby@v1

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515

1616
### Changed
1717

18+
- [Tool] Migration to Xcode 16.3 ([#580](https://github.com/Orange-OpenSource/ouds-ios/issues/580))
1819
- [Tool] Remove dead code and add `periphery` in CI/CD pipes
1920
- [Library] Tag component token (tokens library v0.11.0)
2021
- [Library] Chip component token (tokens library v0.11.0)

DesignToolbox/fastlane/Fastfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ platform :ios do
7373

7474
before_all do |lane, options|
7575
xcodes(
76-
version: '16.2',
76+
version: '16.3',
7777
select_for_current_build_only: true,
7878
)
7979
end

Gemfile

+16-8
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,30 @@
1313

1414
source "https://rubygems.org"
1515

16+
# Troubleshooting
17+
# ---------------
18+
19+
# Embeded in net-http RubyGem without defined version
20+
# Solves CVE-2025-27221 (https://github.com/Orange-OpenSource/ouds-ios/security/dependabot/6)
21+
# Should be removed when net-http > 0.6.0 and CVE fixed
22+
gem 'uri', '1.0.3'
23+
24+
# To fix
25+
# "warning: abbrev was loaded from the standard library, but is not part of the default gems starting from Ruby 3.4.0.
26+
# You can add abbrev to your Gemfile or gemspec to silence this warning.""
1627
gem 'abbrev', '0.1.2'
17-
gem 'cocoapods', '1.16.2'
28+
29+
# Really needed gems
30+
# ------------------
31+
1832
gem 'fastlane', '2.227.0'
1933
gem 'fastlane-plugin-changelog', '0.16.0'
2034
gem 'fastlane-plugin-mattermost', '1.3.2'
35+
gem 'cocoapods', '1.16.2'
2136
gem 'json', '2.10.2'
2237
gem 'net-http', '0.6.0'
2338
gem 'xcode-install', '2.8.1'
2439

25-
# Additional RubyGems to fix some issues or vulnerabilities
26-
27-
# Embeded in net-http RubyGem without defined version
28-
# Solves CVE-2025-27221 (https://github.com/Orange-OpenSource/ouds-ios/security/dependabot/6)
29-
# Should be removed when net-http > 0.6.0 and CVE fixed
30-
gem 'uri', '1.0.3'
31-
3240
# Magic
3341

3442
plugins_path = File.join(File.dirname(__FILE__), 'DesignToolbox/fastlane', 'Pluginfile')

Gemfile.lock

+8-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ GEM
55
base64
66
nkf
77
rexml
8-
abbrev (0.1.2)
98
activesupport (7.2.2.1)
109
base64
1110
benchmark (>= 0.3)
@@ -26,17 +25,18 @@ GEM
2625
artifactory (3.0.17)
2726
atomos (0.1.3)
2827
aws-eventstream (1.3.2)
29-
aws-partitions (1.1065.0)
30-
aws-sdk-core (3.220.1)
28+
aws-partitions (1.1084.0)
29+
aws-sdk-core (3.222.1)
3130
aws-eventstream (~> 1, >= 1.3.0)
3231
aws-partitions (~> 1, >= 1.992.0)
3332
aws-sigv4 (~> 1.9)
3433
base64
3534
jmespath (~> 1, >= 1.6.1)
35+
logger
3636
aws-sdk-kms (1.99.0)
3737
aws-sdk-core (~> 3, >= 3.216.0)
3838
aws-sigv4 (~> 1.5)
39-
aws-sdk-s3 (1.182.0)
39+
aws-sdk-s3 (1.183.0)
4040
aws-sdk-core (~> 3, >= 3.216.0)
4141
aws-sdk-kms (~> 1)
4242
aws-sigv4 (~> 1.5)
@@ -237,10 +237,10 @@ GEM
237237
json (2.10.2)
238238
jwt (2.10.1)
239239
base64
240-
logger (1.6.6)
240+
logger (1.7.0)
241241
mini_magick (4.13.2)
242242
mini_mime (1.1.5)
243-
minitest (5.25.4)
243+
minitest (5.25.5)
244244
molinillo (0.8.0)
245245
multi_json (1.15.0)
246246
multipart-post (2.4.1)
@@ -304,7 +304,7 @@ GEM
304304
colored2 (~> 3.1)
305305
nanaimo (~> 0.4.0)
306306
rexml (>= 3.3.6, < 4.0)
307-
xcpretty (0.4.0)
307+
xcpretty (0.4.1)
308308
rouge (~> 3.28.0)
309309
xcpretty-travis-formatter (1.0.1)
310310
xcpretty (~> 0.2, >= 0.0.7)
@@ -323,7 +323,6 @@ PLATFORMS
323323
x86_64-linux-musl
324324

325325
DEPENDENCIES
326-
abbrev (= 0.1.2)
327326
cocoapods (= 1.16.2)
328327
fastlane (= 2.227.0)
329328
fastlane-plugin-changelog (= 0.16.0)
@@ -334,4 +333,4 @@ DEPENDENCIES
334333
xcode-install (= 2.8.1)
335334

336335
BUNDLED WITH
337-
2.6.1
336+
2.6.7

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
[![iOS 15.0](https://img.shields.io/badge/iOS-15.0-FF1AB2?style=for-the-badge)](https://developer.apple.com/support/app-store "iOS 15 supports")
3838
[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FOrange-OpenSource%2Fouds-ios%2Fbadge%3Ftype%3Dswift-versions&style=for-the-badge)](https://swiftpackageindex.com/Orange-OpenSource/ouds-ios)
39-
[![Xcode 16.2](https://img.shields.io/badge/Xcode-16.2-blue?style=for-the-badge)](https://developer.apple.com/documentation/xcode-release-notes/xcode-16_2-release-notes)
39+
[![Xcode 16.3](https://img.shields.io/badge/Xcode-16.3-blue?style=for-the-badge)](https://developer.apple.com/documentation/xcode-release-notes/xcode-16_3-release-notes)
4040

4141
## Content
4242

0 commit comments

Comments
 (0)