misc: add swift format config

MDX-Tom · Sep 5, 2023 · 14f1f38 · 14f1f38
1 parent 4df2c0b
commit 14f1f38
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/ClashX.xcodeproj/project.pbxproj b/ClashX.xcodeproj/project.pbxproj
@@ -696,6 +696,7 @@
  buildConfigurationList = 49CF3B2D20CD7465001EBF94 /* Build configuration list for PBXNativeTarget "ClashX" */;
  buildPhases = (
  2FD76081F5FF64514C3E5C9D /* [CP] Check Pods Manifest.lock */,
+ 49A7A54F2AA6C0980083025C /* Swift Format */,
  49CF3B1920CD7463001EBF94 /* Sources */,
  49CF3B1A20CD7463001EBF94 /* Frameworks */,
  49CF3B1B20CD7463001EBF94 /* Resources */,
@@ -843,6 +844,25 @@
  shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ClashX/Pods-ClashX-resources.sh\"\n";
  showEnvVarsInLog = 0;
  };
+ 49A7A54F2AA6C0980083025C /* Swift Format */ = {
+ isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ );
+ name = "Swift Format";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${PODS_ROOT}/SwiftFormat/CommandLineTool/swiftformat\" \"$SRCROOT\" --swiftversion 5.6 --disable unusedArguments,numberFormatting,redundantReturn,andOperator,wrapMultilineStatementBraces,trailingCommas\n";
+ };
  49B93AD42A3965B40080967C /* Swift Lint */ = {
  isa = PBXShellScriptBuildPhase;
  alwaysOutOfDate = 1;
@@ -860,7 +880,7 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "${PODS_ROOT}/SwiftLint/swiftlint --fix && ${PODS_ROOT}/SwiftLint/swiftlint\n";
+ shellScript = "${PODS_ROOT}/SwiftLint/swiftlint\n";
  };
  A741C26F5755233F0D7CEC6F /* [CP] Embed Pods Frameworks */ = {
  isa = PBXShellScriptBuildPhase;

diff --git a/Podfile b/Podfile
@@ -32,5 +32,6 @@ target 'ClashX' do
  pod "FlexibleDiff"
  pod 'GzipSwift'
  pod 'SwiftLint'
+ pod 'SwiftFormat/CLI', '~> 0.49'
 end
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -19,6 +19,7 @@ PODS:
  - RxSwift (6.5.0)
  - Sparkle (2.4.2)
  - Starscream (3.1.1)
+ - SwiftFormat/CLI (0.52.3)
  - SwiftLint (0.52.4)
  - SwiftyJSON (5.0.1)
  - WebViewJavascriptBridge (6.0.3)
@@ -35,6 +36,7 @@ DEPENDENCIES:
  - RxSwift
  - Sparkle (~> 2.0)
  - Starscream (= 3.1.1)
+ - SwiftFormat/CLI (~> 0.49)
  - SwiftLint
  - SwiftyJSON
  - WebViewJavascriptBridge
@@ -52,6 +54,7 @@ SPEC REPOS:
  - RxSwift
  - Sparkle
  - Starscream
+ - SwiftFormat
  - SwiftLint
  - SwiftyJSON
  - WebViewJavascriptBridge
@@ -68,10 +71,11 @@ SPEC CHECKSUMS:
  RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
  Sparkle: 5ef7097e655c60f4aeb23fd1658fc3e8dd50f4ec
  Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0
+ SwiftFormat: 5de81c42f043741a16e17ae2da012bbddc7c0b58
  SwiftLint: 1cc5cd61ba9bacb2194e340aeb47a2a37fda00b3
  SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e
  WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29
 
-PODFILE CHECKSUM: 063fb0a8853b3bc465ec93e15b75c951093e400a
+PODFILE CHECKSUM: d3e952c889c7931151a654c076812b3b3294aa59
 
 COCOAPODS: 1.12.1