Update CodeEditTextView to 0.6.2 (#1251)

* Updated CodeEditTextView to 0.6.2

* Removed the now unused Preferences package

* Fixed tests

* Fixed tests by removing reference to Preferences package

Author: austincondiff

CodeEdit.xcodeproj/project.pbxproj

@@ -247,7 +247,6 @@
 		58F2EB0D292FB2B0004A9BDE /* ThemeSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58F2EAE0292FB2B0004A9BDE /* ThemeSettings.swift */; };
 		58F2EB0E292FB2B0004A9BDE /* SoftwareUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58F2EAE1292FB2B0004A9BDE /* SoftwareUpdater.swift */; };
 		58F2EB17292FB74D004A9BDE /* CodeEditTextView in Frameworks */ = {isa = PBXBuildFile; productRef = 58F2EB16292FB74D004A9BDE /* CodeEditTextView */; };
-		58F2EB1A292FB91C004A9BDE /* Preferences in Frameworks */ = {isa = PBXBuildFile; productRef = 58F2EB19292FB91C004A9BDE /* Preferences */; };
 		58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 58F2EB1D292FB954004A9BDE /* Sparkle */; };
 		58FD7608291EA1CB0051D6E4 /* CommandPaletteViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FD7605291EA1CB0051D6E4 /* CommandPaletteViewModel.swift */; };
 		58FD7609291EA1CB0051D6E4 /* CommandPaletteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FD7607291EA1CB0051D6E4 /* CommandPaletteView.swift */; };
@@ -782,7 +781,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				58F2EB1A292FB91C004A9BDE /* Preferences in Frameworks */,
 				58F2EB17292FB74D004A9BDE /* CodeEditTextView in Frameworks */,
 				58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */,
 				6C147C4529A329350089B630 /* OrderedCollections in Frameworks */,
@@ -2321,7 +2319,6 @@
 				2816F593280CF50500DD548B /* CodeEditSymbols */,
 				58798289292ED15F0085B254 /* SwiftTerm */,
 				58F2EB16292FB74D004A9BDE /* CodeEditTextView */,
-				58F2EB19292FB91C004A9BDE /* Preferences */,
 				58F2EB1D292FB954004A9BDE /* Sparkle */,
 				6C147C4429A329350089B630 /* OrderedCollections */,
 				6C81916A29B41DD300B75C92 /* DequeModule */,
@@ -2413,7 +2410,6 @@
 				287136B1292A407E00E9F5F4 /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */,
 				58798288292ED15F0085B254 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
 				58F2EB15292FB74D004A9BDE /* XCRemoteSwiftPackageReference "CodeEditTextView" */,
-				58F2EB18292FB91C004A9BDE /* XCRemoteSwiftPackageReference "Preferences" */,
 				58F2EB1C292FB954004A9BDE /* XCRemoteSwiftPackageReference "Sparkle" */,
 				583E529A29361BAB001AB554 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
 				6C147C4329A329350089B630 /* XCRemoteSwiftPackageReference "swift-collections" */,
@@ -3757,15 +3753,7 @@
 			repositoryURL = "https://github.com/CodeEditApp/CodeEditTextView.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.6.1;
-			};
-		};
-		58F2EB18292FB91C004A9BDE /* XCRemoteSwiftPackageReference "Preferences" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/sindresorhus/Preferences.git";
-			requirement = {
-				kind = exactVersion;
-				version = 2.6.0;
+				version = 0.6.2;
 			};
 		};
 		58F2EB1C292FB954004A9BDE /* XCRemoteSwiftPackageReference "Sparkle" */ = {
@@ -3820,11 +3808,6 @@
 			package = 58F2EB15292FB74D004A9BDE /* XCRemoteSwiftPackageReference "CodeEditTextView" */;
 			productName = CodeEditTextView;
 		};
-		58F2EB19292FB91C004A9BDE /* Preferences */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 58F2EB18292FB91C004A9BDE /* XCRemoteSwiftPackageReference "Preferences" */;
-			productName = Preferences;
-		};
 		58F2EB1D292FB954004A9BDE /* Sparkle */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 58F2EB1C292FB954004A9BDE /* XCRemoteSwiftPackageReference "Sparkle" */;

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -23,17 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/CodeEditApp/CodeEditTextView.git",
       "state" : {
-        "revision" : "cfceb13ef453a9cdf8d587d5a1fe140d37077f8e",
-        "version" : "0.6.1"
-      }
-    },
-    {
-      "identity" : "preferences",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/sindresorhus/Preferences.git",
-      "state" : {
-        "revision" : "2651cd144615009242c994b087508fef99e9275c",
-        "version" : "2.6.0"
+        "revision" : "045bd359ef9c4addf2a5bf51e22ba660d69c5d10",
+        "version" : "0.6.2"
       }
     },
     {
@@ -59,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/krzyzanowskim/STTextView.git",
       "state" : {
-        "revision" : "d6bec568df43028352c4062215fc3b5fab07c2d2",
-        "version" : "0.4.3"
+        "revision" : "77a37aed80277467990c2c8d224ed951899446f0",
+        "version" : "0.6.0"
       }
     },
     {

CodeEdit/AppDelegate.swift

@@ -1,12 +1,11 @@
 //
-//  CodeEditorAppDelegate.swift
+//  AppDelegate.swift
 //  CodeEdit
 //
 //  Created by Pavel Kasila on 12.03.22.
 //
 
 import SwiftUI
-import Preferences
 import CodeEditSymbols
 
 final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {

CodeEdit/Features/CodeFile/CodeFileView.swift

@@ -74,11 +74,11 @@ struct CodeFileView: View {
         CodeEditTextView(
             $codeFile.content,
             language: getLanguage(),
-            theme: $selectedTheme.editor.editorTheme,
-            font: $font,
-            tabWidth: $defaultTabWidth,
-            lineHeight: $lineHeightMultiple,
-            wrapLines: $wrapLinesToEditorWidth,
+            theme: selectedTheme.editor.editorTheme,
+            font: font,
+            tabWidth: defaultTabWidth,
+            lineHeight: lineHeightMultiple,
+            wrapLines: wrapLinesToEditorWidth,
             cursorPosition: $codeFile.cursorPosition,
             useThemeBackground: useThemeBackground,
             contentInsets: edgeInsets.nsEdgeInsets,

CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsDetailsView.swift

@@ -9,6 +9,7 @@ import SwiftUI
 
 struct AccountsSettingsDetailsView: View {
     @AppSettings(\.accounts.sourceControlAccounts.sshKey) var sshKey
+    @AppSettings(\.accounts.sourceControlAccounts.gitAccounts) var gitAccounts
 
     @Binding var account: SourceControlAccount
 
@@ -83,9 +84,8 @@ struct AccountsSettingsDetailsView: View {
     }
 
     private func handleAccountDelete() {
-        let gitAccounts = settings.accounts.sourceControlAccounts.gitAccounts
         // Delete account by finding the position of the account and remove by position
         // We can abort if it is `nil` because account should exist
-        settings.accounts.sourceControlAccounts.gitAccounts.remove(at: gitAccounts.firstIndex(of: account)!)
+        gitAccounts.remove(at: gitAccounts.firstIndex(of: account)!)
     }
 }

CodeEdit/Features/Settings/Pages/ThemeSettings/ThemeSettingsView.swift

@@ -6,7 +6,6 @@
 //
 
 import SwiftUI
-import Preferences
 
 /// A view that implements the `Theme` preference section
 struct ThemeSettingsView: View {