From a0f3777dadf75b4202a9a3bbeee43cafbd500699 Mon Sep 17 00:00:00 2001 From: LudovicPinel Date: Wed, 24 Jan 2024 20:03:17 +0100 Subject: [PATCH] [#638] Upgrade to Xcode 15 in C/ICD chain (#640) * Update files * Move file to right place * Move file to right place * Update version * review: remove unwanted changes Reviewed-by: Pierre-Yves Lapersonne --- CHANGELOG.md | 15 +++++---------- OrangeDesignSystemDemo/.xcode-version | 1 + .../project.pbxproj | 6 ++++-- .../Screens/Components/ComponentList.swift | 1 - OrangeDesignSystemDemo/fastlane/Fastfile | 4 ++++ 5 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 OrangeDesignSystemDemo/.xcode-version diff --git a/CHANGELOG.md b/CHANGELOG.md index c6e83ef9..3d4ecc25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,15 +3,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## Unreleased - -- [DemoApp/SDK] Update version of SwiftUI-Flow from 1.1.0 to 1.2.0 -- [Tooling] Update version of jekyll-relative-links from 0.6.1 to 0.7.0 -- [DemoApp/SDK] Update version of BottomSheet from 3.1.0 to 3.1.1 -- [Tooling] Update version of SwiftFormat from 0.49.18 to 0.53.0 -- [Tooling] Update version of SwiftLint from 0.48.0 to 0.54.0 -- [Tooling] Update version of Fastlane from 2.213.0 to 2.219.0 -- [Tooling] Update version of CocoaPods from 1.13.0 to 1.14.0 +## [Unreleased](https://github.com/Orange-OpenSource/ods-ios/compare/0.16.0...qualif) + +- [Tooling] Upgrate to xcode 15 ([#638](https://github.com/Orange-OpenSource/ods-ios/issues/638)) +- [Tooling] Upgrade tools versions and internal librairies ([#639](https://github.com/Orange-OpenSource/ods-ios/issues/639)) - [Docs] Update documentation with illustration ([#602](https://github.com/Orange-OpenSource/ods-ios/issues/602)) - [Tooling] Add GitHub Actions for Gitleaks runs to look for secrets leaks ([#605](https://github.com/Orange-OpenSource/ods-ios/issues/605)) - [DemoApp/Tooling] Update sources header, license file content, build phase and template ([#582](https://github.com/Orange-OpenSource/ods-ios/issues/582)) @@ -20,7 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [DemoApp] Update technical documentation with versions of tools ([#549](https://github.com/Orange-OpenSource/ods-ios/issues/549)) - [DemoApp/SDK] Apps recirculation ([#64](https://github.com/Orange-OpenSource/ods-ios/issues/64)) -## [0.16.0]\(https://github.com/Orange-OpenSource/ods-ios/compare/0.16.0...0.15.0) - 2024-01-15 +## [0.16.0](https://github.com/Orange-OpenSource/ods-ios/compare/0.16.0...0.15.0) - 2024-01-15 - [SDK/DemoApp] Options are overlapped in Setup page of the about module. This needs update in Chips Pickers (Bug [#577] (https://github.com/Orange-OpenSource/ods-ios/issues/577)) - [SDK] Size of filter chips is not inconsistent in selected and unselected states (Bug [#594](https://github.com/Orange-OpenSource/ods-ios/issues/594)) diff --git a/OrangeDesignSystemDemo/.xcode-version b/OrangeDesignSystemDemo/.xcode-version new file mode 100644 index 00000000..dafb659a --- /dev/null +++ b/OrangeDesignSystemDemo/.xcode-version @@ -0,0 +1 @@ +15.2 diff --git a/OrangeDesignSystemDemo/OrangeDesignSystemDemo.xcodeproj/project.pbxproj b/OrangeDesignSystemDemo/OrangeDesignSystemDemo.xcodeproj/project.pbxproj index 023dbc5f..5dbd270c 100644 --- a/OrangeDesignSystemDemo/OrangeDesignSystemDemo.xcodeproj/project.pbxproj +++ b/OrangeDesignSystemDemo/OrangeDesignSystemDemo.xcodeproj/project.pbxproj @@ -161,6 +161,7 @@ /* Begin PBXFileReference section */ 021ED547747F959E94B4EA22 /* Pods-OrangeDesignSystemDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OrangeDesignSystemDemo.release.xcconfig"; path = "Target Support Files/Pods-OrangeDesignSystemDemo/Pods-OrangeDesignSystemDemo.release.xcconfig"; sourceTree = ""; }; + 070E3C012B6152F3008A8856 /* .xcode-version */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".xcode-version"; sourceTree = ""; }; 07210C402A8FAC6500507988 /* THIRD-PARTY.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = "THIRD-PARTY.md"; path = "../THIRD-PARTY.md"; sourceTree = ""; }; 07210C412A8FAC6500507988 /* NOTICE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NOTICE.txt; path = ../NOTICE.txt; sourceTree = ""; }; 07210C422A8FAC6500507988 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; @@ -352,6 +353,7 @@ 07210C472A8FAD0000507988 /* Fastlane */ = { isa = PBXGroup; children = ( + 070E3C012B6152F3008A8856 /* .xcode-version */, 07210C492A8FAD1600507988 /* Appfile */, 07210C482A8FAD1500507988 /* Fastfile */, ); @@ -1551,7 +1553,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.16.0; + MARKETING_VERSION = 0.17.0; PRODUCT_BUNDLE_IDENTIFIER = "soft.cocoa.ods-ios-demo.dev"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1588,7 +1590,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.16.0; + MARKETING_VERSION = 0.17.0; PRODUCT_BUNDLE_IDENTIFIER = "soft.cocoa.ods-ios-demo.dev"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/OrangeDesignSystemDemo/OrangeDesignSystemDemo/Screens/Components/ComponentList.swift b/OrangeDesignSystemDemo/OrangeDesignSystemDemo/Screens/Components/ComponentList.swift index 550149eb..f92492af 100644 --- a/OrangeDesignSystemDemo/OrangeDesignSystemDemo/Screens/Components/ComponentList.swift +++ b/OrangeDesignSystemDemo/OrangeDesignSystemDemo/Screens/Components/ComponentList.swift @@ -45,7 +45,6 @@ struct ComponentsList: View { TextFieldComponent(), ToolBarComponent(), ] - self.components = components.sorted { $0.name < $1.name } } diff --git a/OrangeDesignSystemDemo/fastlane/Fastfile b/OrangeDesignSystemDemo/fastlane/Fastfile index 466cbb79..4bb93f57 100644 --- a/OrangeDesignSystemDemo/fastlane/Fastfile +++ b/OrangeDesignSystemDemo/fastlane/Fastfile @@ -31,6 +31,10 @@ default_platform(:ios) platform :ios do + before_all do + xcodes(select_for_current_build_only: true) + end + # --------- # RUN TESTS # ---------