feat: 迁移项目依赖至swift package manager

qwertyyb · Sep 16, 2023 · 01bef08 · 01bef08
1 parent fcea75a
commit 01bef08
Show file tree

Hide file tree

Showing 18 changed files with 266,603 additions and 742 deletions.
diff --git a/Fire.xcodeproj/project.pbxproj b/Fire.xcodeproj/project.pbxproj
diff --git a/Fire.xcodeproj/xcshareddata/xcschemes/Fire.xcscheme b/Fire.xcodeproj/xcshareddata/xcschemes/Fire.xcscheme
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1430"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "451E6043232E227B007B0463"
+               BlueprintIdentifier = "67C99FE72AB53DB2000B5281"
                BuildableName = "Fire.app"
                BlueprintName = "Fire"
                ReferencedContainer = "container:Fire.xcodeproj">
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -53,7 +52,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "451E6043232E227B007B0463"
+            BlueprintIdentifier = "67C99FE72AB53DB2000B5281"
             BuildableName = "Fire.app"
             BlueprintName = "Fire"
             ReferencedContainer = "container:Fire.xcodeproj">
@@ -70,7 +69,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "451E6043232E227B007B0463"
+            BlueprintIdentifier = "67C99FE72AB53DB2000B5281"
             BuildableName = "Fire.app"
             BlueprintName = "Fire"
             ReferencedContainer = "container:Fire.xcodeproj">

diff --git a/Fire.xcodeproj/xcshareddata/xcschemes/TableBuilder.xcscheme b/Fire.xcodeproj/xcshareddata/xcschemes/TableBuilder.xcscheme
diff --git a/Fire.xcodeproj/xcshareddata/xcschemes/build-dict.xcscheme b/Fire.xcodeproj/xcshareddata/xcschemes/build-dict.xcscheme
diff --git a/Fire.xcodeproj/xcshareddata/xcschemes/install Fire.xcscheme b/Fire.xcodeproj/xcshareddata/xcschemes/install Fire.xcscheme
diff --git a/Fire/FireInputController.swift b/Fire/FireInputController.swift
@@ -9,7 +9,6 @@
 import SwiftUI
 import InputMethodKit
 import Sparkle
-import Preferences
 import Defaults
 
 typealias NotificationObserver = (name: Notification.Name, callback: (_ notification: Notification) -> Void)
@@ -293,7 +292,7 @@ class FireInputController: IMKInputController {
     }
 
     override func handle(_ event: NSEvent!, client sender: Any!) -> Bool {
-        guard let event = event else { return }
+        guard let event = event else { return false }
         NSLog("[FireInputController] handle: \(event.debugDescription)")
 
         // 在activateServer中有把IMKInputController绑定给CandidatesWindow

diff --git a/Fire/Preferences/ApplicationPane.swift b/Fire/Preferences/ApplicationPane.swift
@@ -7,7 +7,7 @@
 //
 
 import SwiftUI
-import Preferences
+import Settings
 import Defaults
 
 struct ApplicationSettingItemView: View {
@@ -108,8 +108,8 @@ struct ApplicationPane: View {
     }
 
     var body: some View {
-        Preferences.Container(contentWidth: 450) {
-            Preferences.Section(title: "") {
+        Settings.Container(contentWidth: 450) {
+            Settings.Section(title: "") {
                 VStack(alignment: .leading) {
                     HStack {
                         Text("自动切换")