Skip to content

Commit 9af2c6d

Browse files
authored
ci: move from Xcode 26.2 to Xcode 26.3 (#1375) (#1376)
Update documentation files, tutorials and sample projects to refer to Xcode 26.3 and not anymore Xcode 26.2 Assisted-by: GitHub Copilot Acked-by: Ludovic Pinel <ludovic.pinel@orange.com> Reviewed-by: GitHub Copilot [bot] <198982749+Copilot@users.noreply.github.com> Signed-off-by: Pierre-Yves Lapersonne <pierreyves.lapersonne@orange.com>
1 parent 08bb12f commit 9af2c6d

17 files changed

+31
-33
lines changed

.github/DEVELOP.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,17 @@ source ~/.zshrc
116116
ruby --version
117117
```
118118

119-
We use also for our GitLab CI runners **Xcode 26.2**, we suggest you use this version or newer if you want (but not recommended).
119+
We use also for our GitLab CI runners **Xcode 26.3**, we suggest you use this version or newer if you want (but not recommended).
120120

121121
> [!IMPORTANT]
122-
> Xcode 26.2 and Swift 6.2 are used for this project. You must use this configuration.
122+
> Xcode 26.3 and Swift 6.2 are used for this project. You must use this configuration.
123123
> No retrocompatibility is planned.
124124
> If needed, contact us and open a discussino on GitHub Orange-OpenSource/ouds-ios
125125
126126
## Build OUDS Package
127127

128128
To build the OUDS package:
129-
1. Open the folder containing the *Package.swift. file in Xcode
129+
1. Open the folder containing the *Package.swift* file in Xcode
130130
2. Select the "OUDS-Package" scheme
131131
3. Build
132132

@@ -148,20 +148,14 @@ the online version based on [_GitHub Pages_](https://pages.github.com/), this ve
148148

149149
### Illustrations
150150

151-
The illustrations in use for the documentation is versioned in the Swift Package library.
152-
However it is the [design system toolbox project](https://github.com/Orange-OpenSource/ouds-ios-design-system-toolbox) which updates it using UI tests.
151+
The illustrations in use for the documentation are versioned in the [Swift Package project](https://github.com/Orange-OpenSource/ouds-ios).
152+
They are made manually with iPhone 17 Pro, in english, portrait, light mode without increased size text.
153+
Because 4 themes are available with dedicated fonts and tokens, it was not possible to implement and maintain a test suite with one codebase for all cases.
153154

154155
To update the illustrations, you have to:
155-
- select the device from Xcode (i.e. *iPhone 12 Pro*) (see details in `AppTestCase+Dimensions.swift` file)
156-
- keep the device in portrait mode
157-
- check the color scheme in use you need (light or dark mode)
158-
- run the debug app: this is the app wich will be compiled and used for tests and screenshots
159-
- select the theme you want from the app; your choice will be kept in user defaults
160-
- then run the UI tests (*DesignToolboxUITests* scheme), all *DocumentationScreenshots* test cases
161-
162-
Xcode will then run the tests and put the illustrations, here cropped screenshots of the app in selected device, in attachments of tests.
163-
164-
Then copy/paste these files in the location you want for the Swift Package library. having a local reference of it in your Xcode is more comfortable.
156+
- have such iPhone (e.g. simulator or real device)
157+
- configure it with the theme you want
158+
- make screenshots and crop them then
165159

166160
Repeat this process for the other themes if needed.
167161

.github/copilot-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Everything is available on [our guidelines](https://a11y-guidelines.orange.com/f
212212
## 7. Development requirements
213213

214214
- Minimum Swift 6.2 (e.g. 6.2.3)
215-
- Xcode 26.2 or later
215+
- Xcode 26.3 or later
216216
- Minimum deployment: iOS 15.0, iPadOS 15.0, macOS 13.0, visionOS 1.0, watchOS 11.6, tvOS 16.6
217217
- Apple Developer account for device testing
218218

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ jobs:
5656
- name: Checkout code
5757
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5858

59-
- name: Set up Xcode 26.2
59+
- name: Set up Xcode 26.3.0
6060
run: |
61-
sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
61+
sudo xcode-select -s /Applications/Xcode_26.3.0.app/Contents/Developer
6262
6363
- name: Set up Ruby
6464
uses: ruby/setup-ruby@eab2afb99481ca09a4e91171a8e0aee0e89bfedd # v1.296.0, https://github.com/ruby/setup-ruby
@@ -81,9 +81,9 @@ jobs:
8181
- name: Checkout code
8282
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8383

84-
- name: Set up Xcode 26.2
84+
- name: Set up Xcode 26.3.0
8585
run: |
86-
sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
86+
sudo xcode-select -s /Applications/Xcode_26.3.0.app/Contents/Developer
8787
8888
- name: Set up Ruby
8989
uses: ruby/setup-ruby@eab2afb99481ca09a4e91171a8e0aee0e89bfedd # v1.296.0, https://github.com/ruby/setup-ruby

.github/workflows/build-documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ jobs:
5555
- name: Checkout code
5656
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5757

58-
- name: Set up Xcode 26.2
58+
- name: Set up Xcode 26.3.0
5959
run: |
60-
sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
60+
sudo xcode-select -s /Applications/Xcode_26.3.0.app/Contents/Developer
6161
6262
- name: Build documentation
6363
run: |

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased](https://github.com/Orange-OpenSource/ouds-ios/compare/1.3.0...develop)
88

9+
### Changed
10+
11+
- Move from Xcode 26.2 to Xcode 26.3 (Orange-OpenSource/ouds-ios#1375)
12+
913
## [1.3.0](https://github.com/Orange-OpenSource/ouds-ios/compare/1.2.0...1.3.0) - 2026-03-26
1014

1115
### Added

OUDS/Core/Components/Sources/Navigations/TabBar/Internal/DeviceModifier.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct DeviceModifier: ViewModifier {
2525
///
2626
/// **WARNING:**:
2727
/// - Computed at initialization to avoid AttributeGraph cycles from accessing UIScreen/UIApplication during SwiftUI updates in iOS 26.x.
28-
/// - Can still male troubles since Xcode 26.1 and Xcode 26.2 with AttributeGraph cycles
28+
/// - Can still make troubles since Xcode 26.1 and Xcode 26.2 with AttributeGraph cycles
2929
private let device: iPhoneDevice = { // See #1249, #1271
3030
guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
3131
let window = windowScene.windows.first else { return iPhoneDevice.unknown }

OUDS/Core/ThemesContract/Sources/_ThemesContract.docc/Tutorial_discovery/tutorial-discovery-1-package-and-librairies.tutorial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@Image(source: "ic_unified_ds", alt: "Logo of OUDS")
88
}
99

10-
@XcodeRequirement(title: "Xcode 26.2", destination: "https://developer.apple.com/download/")
10+
@XcodeRequirement(title: "Xcode 26.3", destination: "https://developer.apple.com/download/")
1111

1212
@Section(title: "Import the Swift Package and the libraries") {
1313

OUDS/Core/ThemesContract/Sources/_ThemesContract.docc/Tutorial_discovery/tutorial-discovery-2-instanciate-theme.tutorial

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
@Image(source: "ic_theme_intro", alt: "OUDS themes logo")
77
}
88

9-
@XcodeRequirement(title: "Xcode 26.2", destination: "https://developer.apple.com/download/")
9+
@XcodeRequirement(title: "Xcode 26.3", destination: "https://developer.apple.com/download/")
1010

1111
@Section(title: "Basic structure for the app") {
1212

1313
@ContentAndMedia {
1414
OUDS must be used in SwiftUI projects.
1515

1616
We suppose you already have an app or a freshly created new one, with OUDS Swift Package integrated and the librairies added to the target.
17-
We supposed also you have Xcode 26.2 at least, and for example an iPhone 17 Pro Max simulator.
17+
We supposed also you have Xcode 26.3 at least, and for example an iPhone 17 Pro Max simulator.
1818
Source code and tokens here are the ones of version 0.20.0 ; things can change in the future.
1919
}
2020

OUDS/Core/ThemesContract/Sources/_ThemesContract.docc/Tutorial_discovery/tutorial-discovery-3-use-first-components.tutorial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@Image(source: "ic_component_intro", alt: "OUDS components logo")
77
}
88

9-
@XcodeRequirement(title: "Xcode 26.2", destination: "https://developer.apple.com/download/")
9+
@XcodeRequirement(title: "Xcode 26.3", destination: "https://developer.apple.com/download/")
1010

1111
@Section(title: "Add basic components") {
1212

0 commit comments

Comments
 (0)