Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion platforms/swift/.swiftformat
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@
--swiftversion 5.7.1
--extensionacl on-declarations
--exclude Sources/ShopifyCheckoutKit/Models.swift
--exclude Sources/ShopifyCheckoutProtocol/Generated
--exclude Samples/MobileBuyIntegration/MobileBuyIntegration/Sources/Generated
--exclude Samples/ShopifyAcceleratedCheckoutsApp/ShopifyAcceleratedCheckoutsApp/Generated
8 changes: 4 additions & 4 deletions platforms/swift/Scripts/lint
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ if [[ "$VERBOSE" == "false" ]]; then
QUIET_FLAG="--quiet"
fi

if [[ "$MODE" == "fix" ]]; then
$SWIFTLINT lint --fix --no-cache $QUIET_FLAG
fi

# SwiftLint doesn't report errors when running in fix mode
# Running again in strict mode to ensure no errors are missed.
# Run from the directory containing .swiftlint.yml so its `included:` paths
# resolve consistently.
PROJECT_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
if [[ "$MODE" == "fix" ]]; then
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you say there was a second config file we could clean up?

(cd "$PROJECT_ROOT" && $SWIFTLINT lint --fix --no-cache $QUIET_FLAG)
fi

(cd "$PROJECT_ROOT" && $SWIFTLINT lint --strict --no-cache $QUIET_FLAG)
LINT_STATUS=$?

Expand Down
Loading