From 2c097ce47c73babd4d094c1ae4e39ac91ae01954 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Lapersonne Date: Wed, 24 Jan 2024 10:22:40 +0100 Subject: [PATCH] chore(#625): update SwiftFormat Signed-off-by: Pierre-Yves Lapersonne --- CHANGELOG.md | 2 ++ .../project.pbxproj | 21 ------------------- OrangeDesignSystemDemo/Podfile | 2 +- OrangeDesignSystemDemo/Podfile.lock | 8 +++---- THIRD-PARTY.md | 2 +- doctor.sh | 2 +- 6 files changed, 9 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30c0108b..427e4f9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## Unreleased + 0.49.18 +- [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 diff --git a/OrangeDesignSystemDemo/OrangeDesignSystemDemo.xcodeproj/project.pbxproj b/OrangeDesignSystemDemo/OrangeDesignSystemDemo.xcodeproj/project.pbxproj index 642022c8..023dbc5f 100644 --- a/OrangeDesignSystemDemo/OrangeDesignSystemDemo.xcodeproj/project.pbxproj +++ b/OrangeDesignSystemDemo/OrangeDesignSystemDemo.xcodeproj/project.pbxproj @@ -970,7 +970,6 @@ buildConfigurationList = EB0AA554275652AF0012E192 /* Build configuration list for PBXNativeTarget "OrangeDesignSystemDemo" */; buildPhases = ( BBC04BF489B25C64717CAA71 /* [CP] Check Pods Manifest.lock */, - F913B86C2767A0D5001CB0AA /* SwiftFormat (headers of sources) */, F913B86D2767A147001CB0AA /* SwiftLint */, EB0AA52C275652AE0012E192 /* Sources */, EB0AA52D275652AE0012E192 /* Frameworks */, @@ -1192,26 +1191,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - F913B86C2767A0D5001CB0AA /* SwiftFormat (headers of sources) */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "SwiftFormat (headers of sources)"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# ------------------------------\n# Check if SwiftFormat available\n# ------------------------------\nif which \"${PROJECT_DIR}/Pods/SwiftFormat/CommandLineTool/swiftformat\" >/dev/null; then\n\n # Header to apply\n HEADER=\"//\\n//Software Name: Orange Design System\\n// SPDX-FileCopyrightText: Copyright (c) Orange SA\\n// SPDX-License-Identifier: MIT\\n//\\n// This software is distributed under the MIT license,\\n// the text of which is available at https://opensource.org/license/MIT/\\n//or see the \\\"LICENSE\\\" file for more details.\\n//\\n// Authors: See CONTRIBUTORS.txt\\n// Software description: A SwiftUI components library with code examples for Orange Design System\\n//\"\n \n # Format sources of Demo App\n \"${PROJECT_DIR}/Pods/SwiftFormat/CommandLineTool/swiftformat\" --header \"$HEADER\" \"$SRCROOT\"\n \n # Format sources of Orange Theme \n \"${PROJECT_DIR}/Pods/SwiftFormat/CommandLineTool/swiftformat\" --header \"$HEADER\" \"$SRCROOT/../OrangeTheme\"\n \n # Format sources of Innovation Cup Theme\n \"${PROJECT_DIR}/Pods/SwiftFormat/CommandLineTool/swiftformat\" --header \"$HEADER\" \"$SRCROOT/../InnovationCupTheme\"\n \n # Format sources of library\n \"${PROJECT_DIR}/Pods/SwiftFormat/CommandLineTool/swiftformat\" --header \"$HEADER\" \"$SRCROOT/../OrangeDesignSystem\"\n\n# ------------------------- \n# SwiftFormat not available\n# -------------------------\nelse\n echo \"warning: SwiftFormat not installed, download from https://github.com/xxx/swiftformat\"\nfi\n"; - showEnvVarsInLog = 0; - }; F913B86D2767A147001CB0AA /* SwiftLint */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; diff --git a/OrangeDesignSystemDemo/Podfile b/OrangeDesignSystemDemo/Podfile index 0da27923..3ff5f9db 100644 --- a/OrangeDesignSystemDemo/Podfile +++ b/OrangeDesignSystemDemo/Podfile @@ -21,7 +21,7 @@ target 'OrangeDesignSystemDemo' do inherit! :search_paths pod 'SwiftLint', '0.54.0' - pod 'SwiftFormat/CLI', '0.49.18' + pod 'SwiftFormat/CLI', '0.53.0' end end diff --git a/OrangeDesignSystemDemo/Podfile.lock b/OrangeDesignSystemDemo/Podfile.lock index a59292d8..2356f5bf 100644 --- a/OrangeDesignSystemDemo/Podfile.lock +++ b/OrangeDesignSystemDemo/Podfile.lock @@ -2,12 +2,12 @@ PODS: - Down (0.9.5) - Parma (0.3.0): - Down (~> 0.9.3) - - SwiftFormat/CLI (0.49.18) + - SwiftFormat/CLI (0.53.0) - SwiftLint (0.54.0) DEPENDENCIES: - Parma (= 0.3.0) - - SwiftFormat/CLI (= 0.49.18) + - SwiftFormat/CLI (= 0.53.0) - SwiftLint (= 0.54.0) SPEC REPOS: @@ -20,9 +20,9 @@ SPEC REPOS: SPEC CHECKSUMS: Down: 7321a72d0747ed0061dce948bcff518fcb6df2bd Parma: 679bca1c20ac336fffcdf9ff1ba0db9388a86a13 - SwiftFormat: 2402d29b26746f169cce5454d5af88314cbb2e35 + SwiftFormat: 5c50ccf2c2b178fe5e46cc75e43555b09d72b103 SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211 -PODFILE CHECKSUM: e81a1b3363c0a24bda79b314990b7d1c0253ef99 +PODFILE CHECKSUM: 9f12b5beee8fdd74ccc3219fcee5a672836ce9b7 COCOAPODS: 1.14.3 diff --git a/THIRD-PARTY.md b/THIRD-PARTY.md index 9e822515..1a732875 100644 --- a/THIRD-PARTY.md +++ b/THIRD-PARTY.md @@ -95,7 +95,7 @@ You may download the source code on the [following website](https://github.com/g ### SwiftFormat -Version 0.49.18 +Version 0.53.0 Copyright 2016 Nick Lockwood. diff --git a/doctor.sh b/doctor.sh index 8e2ea7cb..c4e896fe 100755 --- a/doctor.sh +++ b/doctor.sh @@ -110,7 +110,7 @@ echo -e "\n" read -p "✋ Let's check version of SwiftFormat (for headers and code style)... [PRESS ANY KEY]" echo -e "\n" -CheckIfRuntimeExists "SwiftFormat" "swiftformat --version" "0.49.18" +CheckIfRuntimeExists "SwiftFormat" "swiftformat --version" "0.53.0" echo -e "\n" # ====================