Skip to content

Commit

Permalink
chore(#625): update SwiftFormat
Browse files Browse the repository at this point in the history
Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
  • Loading branch information
pylapp committed Jan 24, 2024
1 parent 997cea3 commit 2c097ce
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 28 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 */,
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion OrangeDesignSystemDemo/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions OrangeDesignSystemDemo/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
2 changes: 1 addition & 1 deletion THIRD-PARTY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion doctor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

# ====================
Expand Down

0 comments on commit 2c097ce

Please sign in to comment.