Merge commit 'f778b97'

This commit is contained in:
maddiebaka
2023-07-10 14:14:24 -04:00
20 changed files with 456 additions and 377 deletions

View File

@@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
C15B60A82A2423760052F712 /* UserNotificationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15B60A72A2423760052F712 /* UserNotificationHandler.swift */; };
C15F06A62A20198300C14CD8 /* Soyuz.help in Resources */ = {isa = PBXBuildFile; fileRef = C15F06A42A20171E00C14CD8 /* Soyuz.help */; };
C1A11C182A4B5F67006524B8 /* MoonrakerSocketManagerNative.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A11C172A4B5F67006524B8 /* MoonrakerSocketManagerNative.swift */; };
E124B9D929941A4D00C0D2D2 /* PrinterConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E124B9D829941A4D00C0D2D2 /* PrinterConfigView.swift */; };
E16378B429A491E6002F05E9 /* MoonrakerSocketManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16378B329A491E6002F05E9 /* MoonrakerSocketManagerTests.swift */; };
E180B5E92992CD9100425DB0 /* SoyuzApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B5E82992CD9100425DB0 /* SoyuzApp.swift */; };
@@ -48,7 +47,6 @@
/* Begin PBXFileReference section */
C15B60A72A2423760052F712 /* UserNotificationHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserNotificationHandler.swift; sourceTree = "<group>"; };
C15F06A42A20171E00C14CD8 /* Soyuz.help */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Soyuz.help; sourceTree = "<group>"; };
C1A11C172A4B5F67006524B8 /* MoonrakerSocketManagerNative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoonrakerSocketManagerNative.swift; sourceTree = "<group>"; };
E124B9D72993FE5500C0D2D2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
E124B9D829941A4D00C0D2D2 /* PrinterConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrinterConfigView.swift; sourceTree = "<group>"; };
E16378B329A491E6002F05E9 /* MoonrakerSocketManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoonrakerSocketManagerTests.swift; sourceTree = "<group>"; };
@@ -177,7 +175,6 @@
E180B6212993256E00425DB0 /* MoonrakerSocketManager.swift */,
E1A93C6629C932E200BAE750 /* BonjourBrowser.swift */,
C15B60A72A2423760052F712 /* UserNotificationHandler.swift */,
C1A11C172A4B5F67006524B8 /* MoonrakerSocketManagerNative.swift */,
);
path = ViewModels;
sourceTree = "<group>";
@@ -321,7 +318,6 @@
files = (
E180B61D2992D53700425DB0 /* PrinterObjectsQuery.swift in Sources */,
E180B5F52992CD9200425DB0 /* KlipperMon.xcdatamodeld in Sources */,
C1A11C182A4B5F67006524B8 /* MoonrakerSocketManagerNative.swift in Sources */,
E124B9D929941A4D00C0D2D2 /* PrinterConfigView.swift in Sources */,
E180B5F22992CD9200425DB0 /* Persistence.swift in Sources */,
C15B60A82A2423760052F712 /* UserNotificationHandler.swift in Sources */,
@@ -490,7 +486,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_ASSET_PATHS = "Soyuz/Preview\\ Content";
DEVELOPMENT_TEAM = W9ASV855X5;
ENABLE_HARDENED_RUNTIME = YES;
@@ -522,7 +518,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_ASSET_PATHS = "Soyuz/Preview\\ Content";
DEVELOPMENT_TEAM = W9ASV855X5;
ENABLE_HARDENED_RUNTIME = YES;

View File

@@ -14,8 +14,8 @@
filePath = "SoyuzTests/MoonrakerSocketManagerTests.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "71"
endingLineNumber = "71"
startingLineNumber = "70"
endingLineNumber = "70"
landmarkName = "setUp()"
landmarkType = "7">
</BreakpointContent>
@@ -41,8 +41,8 @@
filePath = "SoyuzTests/MoonrakerSocketManagerTests.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "73"
endingLineNumber = "73"
startingLineNumber = "72"
endingLineNumber = "72"
landmarkName = "setUp()"
landmarkType = "7">
</BreakpointContent>
@@ -57,8 +57,8 @@
filePath = "Soyuz/Views/SoyuzMenuBarExtraView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "15"
endingLineNumber = "15"
startingLineNumber = "14"
endingLineNumber = "14"
landmarkName = "SoyuzMenuBarExtraView"
landmarkType = "14">
</BreakpointContent>

View File

@@ -11,22 +11,6 @@
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>E180B5E42992CD9100425DB0</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E180B5FA2992CD9300425DB0</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E180B6042992CD9300425DB0</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
<dict/>
</dict>
</plist>