Merge branch 'meta-dev' into meta

MetaCubeX · Oct 8, 2023 · 68b950c · 68b950c
2 parents a853766 + df1ff50
commit 68b950c
Show file tree

Hide file tree

Showing 22 changed files with 1,377 additions and 2,025 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -51,20 +51,20 @@ jobs:
 
 
     - name: install deps
-      run: bash install_dependency.sh
+      run: |
+        bash install_dependency.sh
+        xcodebuild -resolvePackageDependencies -project ClashX.xcodeproj
         
 
     - name: build
       if: startsWith(github.ref, 'refs/tags/')
       run: |
-        xcodebuild -resolvePackageDependencies -project ClashX.xcodeproj
         xcodebuild archive -project ClashX.xcodeproj -scheme ClashX\ Meta -archivePath archive/ClashX.xcarchive -showBuildTimingSummary -allowProvisioningUpdates
 
 
     - name: build-SwiftUI
       run: |
-        xcodebuild -resolvePackageDependencies -project ClashX\ SwiftUI.xcodeproj
-        xcodebuild archive -project ClashX\ SwiftUI.xcodeproj -scheme ClashX\ Meta -archivePath archive/ClashX\ SwiftUI.xcarchive -showBuildTimingSummary -allowProvisioningUpdates
+        xcodebuild archive -project ClashX.xcodeproj -scheme ClashX\ Meta\ SwiftUI -archivePath archive/ClashX\ SwiftUI.xcarchive -showBuildTimingSummary -allowProvisioningUpdates
 
 
     - name: create zip

diff --git a/ClashX SwiftUI.xcodeproj/project.pbxproj b/ClashX SwiftUI.xcodeproj/project.pbxproj
diff --git a/ClashX SwiftUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ClashX SwiftUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ClashX SwiftUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ClashX SwiftUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/ClashX SwiftUI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ClashX SwiftUI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/... SwiftUI.xcodeproj/xcshareddata/xcschemes/com.metacubex.ClashX.ProxyConfigHelper.xcscheme b/... SwiftUI.xcodeproj/xcshareddata/xcschemes/com.metacubex.ClashX.ProxyConfigHelper.xcscheme