From 65daae4bf74825ec6507ddfcd4493ac147ed4c60 Mon Sep 17 00:00:00 2001 From: Madeline Date: Tue, 21 Feb 2023 00:42:27 -0500 Subject: [PATCH] Rename project to Soyuz --- .../project.pbxproj | 150 +++++++++--------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/swiftpm/Package.resolved | 14 ++ .../xcdebugger/Breakpoints_v2.xcbkptlist | 6 + .../xcschemes/xcschememanagement.plist | 0 .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 {KlipperMon => Soyuz}/Info.plist | 12 +- .../KlipperMon.xcdatamodeld/.xccurrentversion | 0 .../KlipperMon.xcdatamodel/contents | 0 {KlipperMon => Soyuz}/Persistence.swift | 0 .../Preview Assets.xcassets/Contents.json | 0 {KlipperMon => Soyuz}/PrinterConfigView.swift | 0 .../PrinterObjectsQuery.swift | 0 .../PrinterRequestManager.swift | 0 {KlipperMon => Soyuz}/PrinterStats.swift | 0 .../Soyuz.entitlements | 0 .../SoyuzApp.swift | 4 +- .../SoyuzMenuBarExtraView.swift | 4 +- .../SoyuzScratchTests.swift | 2 +- .../SoyuzTests.swift | 2 +- .../SoyuzUITests.swift | 0 .../SoyuzUITestsLaunchTests.swift | 0 25 files changed, 109 insertions(+), 87 deletions(-) rename {KlipperMon.xcodeproj => Soyuz.xcodeproj}/project.pbxproj (77%) rename {KlipperMon.xcodeproj => Soyuz.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (53%) rename {KlipperMon.xcodeproj => Soyuz.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) create mode 100644 Soyuz.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 Soyuz.xcodeproj/xcuserdata/madelinecr.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist rename {KlipperMon.xcodeproj => Soyuz.xcodeproj}/xcuserdata/madelinecr.xcuserdatad/xcschemes/xcschememanagement.plist (100%) rename {KlipperMon => Soyuz}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename {KlipperMon => Soyuz}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {KlipperMon => Soyuz}/Assets.xcassets/Contents.json (100%) rename {KlipperMon => Soyuz}/Info.plist (94%) rename {KlipperMon => Soyuz}/KlipperMon.xcdatamodeld/.xccurrentversion (100%) rename {KlipperMon => Soyuz}/KlipperMon.xcdatamodeld/KlipperMon.xcdatamodel/contents (100%) rename {KlipperMon => Soyuz}/Persistence.swift (100%) rename {KlipperMon => Soyuz}/Preview Content/Preview Assets.xcassets/Contents.json (100%) rename {KlipperMon => Soyuz}/PrinterConfigView.swift (100%) rename {KlipperMon => Soyuz}/PrinterObjectsQuery.swift (100%) rename {KlipperMon => Soyuz}/PrinterRequestManager.swift (100%) rename {KlipperMon => Soyuz}/PrinterStats.swift (100%) rename KlipperMon/KlipperMon.entitlements => Soyuz/Soyuz.entitlements (100%) rename KlipperMon/KlipperMonApp.swift => Soyuz/SoyuzApp.swift (89%) rename KlipperMon/KlipperMonMenuBarExtraView.swift => Soyuz/SoyuzMenuBarExtraView.swift (96%) rename KlipperMonTests/KlipperMonScratchTests.swift => SoyuzTests/SoyuzScratchTests.swift (86%) rename KlipperMonTests/KlipperMonTests.swift => SoyuzTests/SoyuzTests.swift (96%) rename KlipperMonUITests/KlipperMonUITests.swift => SoyuzUITests/SoyuzUITests.swift (100%) rename KlipperMonUITests/KlipperMonUITestsLaunchTests.swift => SoyuzUITests/SoyuzUITestsLaunchTests.swift (100%) diff --git a/KlipperMon.xcodeproj/project.pbxproj b/Soyuz.xcodeproj/project.pbxproj similarity index 77% rename from KlipperMon.xcodeproj/project.pbxproj rename to Soyuz.xcodeproj/project.pbxproj index b85601c..a1b0f43 100644 --- a/KlipperMon.xcodeproj/project.pbxproj +++ b/Soyuz.xcodeproj/project.pbxproj @@ -8,17 +8,17 @@ /* Begin PBXBuildFile section */ E124B9D929941A4D00C0D2D2 /* PrinterConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E124B9D829941A4D00C0D2D2 /* PrinterConfigView.swift */; }; - E16378B229A43CE1002F05E9 /* KlipperMonScratchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16378B129A43CE1002F05E9 /* KlipperMonScratchTests.swift */; }; - E180B5E92992CD9100425DB0 /* KlipperMonApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B5E82992CD9100425DB0 /* KlipperMonApp.swift */; }; + E16378B229A43CE1002F05E9 /* SoyuzScratchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16378B129A43CE1002F05E9 /* SoyuzScratchTests.swift */; }; + E180B5E92992CD9100425DB0 /* SoyuzApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B5E82992CD9100425DB0 /* SoyuzApp.swift */; }; E180B5ED2992CD9200425DB0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E180B5EC2992CD9200425DB0 /* Assets.xcassets */; }; E180B5F02992CD9200425DB0 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E180B5EF2992CD9200425DB0 /* Preview Assets.xcassets */; }; E180B5F22992CD9200425DB0 /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B5F12992CD9200425DB0 /* Persistence.swift */; }; E180B5F52992CD9200425DB0 /* KlipperMon.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = E180B5F32992CD9200425DB0 /* KlipperMon.xcdatamodeld */; }; - E180B6002992CD9300425DB0 /* KlipperMonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B5FF2992CD9300425DB0 /* KlipperMonTests.swift */; }; - E180B60A2992CD9300425DB0 /* KlipperMonUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B6092992CD9300425DB0 /* KlipperMonUITests.swift */; }; - E180B60C2992CD9300425DB0 /* KlipperMonUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B60B2992CD9300425DB0 /* KlipperMonUITestsLaunchTests.swift */; }; + E180B6002992CD9300425DB0 /* SoyuzTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B5FF2992CD9300425DB0 /* SoyuzTests.swift */; }; + E180B60A2992CD9300425DB0 /* SoyuzUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B6092992CD9300425DB0 /* SoyuzUITests.swift */; }; + E180B60C2992CD9300425DB0 /* SoyuzUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B60B2992CD9300425DB0 /* SoyuzUITestsLaunchTests.swift */; }; E180B61D2992D53700425DB0 /* PrinterObjectsQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B61C2992D53700425DB0 /* PrinterObjectsQuery.swift */; }; - E180B61F2992DBB000425DB0 /* KlipperMonMenuBarExtraView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B61E2992DBB000425DB0 /* KlipperMonMenuBarExtraView.swift */; }; + E180B61F2992DBB000425DB0 /* SoyuzMenuBarExtraView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B61E2992DBB000425DB0 /* SoyuzMenuBarExtraView.swift */; }; E180B6222993256E00425DB0 /* PrinterRequestManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E180B6212993256E00425DB0 /* PrinterRequestManager.swift */; }; E1E8B07729949E2700BABE4B /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = E1E8B07629949E2700BABE4B /* Starscream */; }; E1E8B07929955ABE00BABE4B /* PrinterStats.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E8B07829955ABE00BABE4B /* PrinterStats.swift */; }; @@ -44,21 +44,21 @@ /* Begin PBXFileReference section */ E124B9D72993FE5500C0D2D2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; E124B9D829941A4D00C0D2D2 /* PrinterConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrinterConfigView.swift; sourceTree = ""; }; - E16378B129A43CE1002F05E9 /* KlipperMonScratchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KlipperMonScratchTests.swift; sourceTree = ""; }; - E180B5E52992CD9100425DB0 /* KlipperMon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KlipperMon.app; sourceTree = BUILT_PRODUCTS_DIR; }; - E180B5E82992CD9100425DB0 /* KlipperMonApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KlipperMonApp.swift; sourceTree = ""; }; + E16378B129A43CE1002F05E9 /* SoyuzScratchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoyuzScratchTests.swift; sourceTree = ""; }; + E180B5E52992CD9100425DB0 /* Soyuz.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Soyuz.app; sourceTree = BUILT_PRODUCTS_DIR; }; + E180B5E82992CD9100425DB0 /* SoyuzApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoyuzApp.swift; sourceTree = ""; }; E180B5EC2992CD9200425DB0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; E180B5EF2992CD9200425DB0 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; E180B5F12992CD9200425DB0 /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = ""; }; E180B5F42992CD9200425DB0 /* KlipperMon.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = KlipperMon.xcdatamodel; sourceTree = ""; }; - E180B5F62992CD9200425DB0 /* KlipperMon.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KlipperMon.entitlements; sourceTree = ""; }; - E180B5FB2992CD9300425DB0 /* KlipperMonTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KlipperMonTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - E180B5FF2992CD9300425DB0 /* KlipperMonTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KlipperMonTests.swift; sourceTree = ""; }; - E180B6052992CD9300425DB0 /* KlipperMonUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KlipperMonUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - E180B6092992CD9300425DB0 /* KlipperMonUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KlipperMonUITests.swift; sourceTree = ""; }; - E180B60B2992CD9300425DB0 /* KlipperMonUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KlipperMonUITestsLaunchTests.swift; sourceTree = ""; }; + E180B5F62992CD9200425DB0 /* Soyuz.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Soyuz.entitlements; sourceTree = ""; }; + E180B5FB2992CD9300425DB0 /* SoyuzTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SoyuzTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + E180B5FF2992CD9300425DB0 /* SoyuzTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoyuzTests.swift; sourceTree = ""; }; + E180B6052992CD9300425DB0 /* SoyuzUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SoyuzUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + E180B6092992CD9300425DB0 /* SoyuzUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoyuzUITests.swift; sourceTree = ""; }; + E180B60B2992CD9300425DB0 /* SoyuzUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoyuzUITestsLaunchTests.swift; sourceTree = ""; }; E180B61C2992D53700425DB0 /* PrinterObjectsQuery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrinterObjectsQuery.swift; sourceTree = ""; }; - E180B61E2992DBB000425DB0 /* KlipperMonMenuBarExtraView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KlipperMonMenuBarExtraView.swift; sourceTree = ""; }; + E180B61E2992DBB000425DB0 /* SoyuzMenuBarExtraView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoyuzMenuBarExtraView.swift; sourceTree = ""; }; E180B6212993256E00425DB0 /* PrinterRequestManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrinterRequestManager.swift; sourceTree = ""; }; E1E8B07829955ABE00BABE4B /* PrinterStats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrinterStats.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -92,9 +92,9 @@ E180B5DC2992CD9100425DB0 = { isa = PBXGroup; children = ( - E180B5E72992CD9100425DB0 /* KlipperMon */, - E180B5FE2992CD9300425DB0 /* KlipperMonTests */, - E180B6082992CD9300425DB0 /* KlipperMonUITests */, + E180B5E72992CD9100425DB0 /* Soyuz */, + E180B5FE2992CD9300425DB0 /* SoyuzTests */, + E180B6082992CD9300425DB0 /* SoyuzUITests */, E180B5E62992CD9100425DB0 /* Products */, ); sourceTree = ""; @@ -102,30 +102,30 @@ E180B5E62992CD9100425DB0 /* Products */ = { isa = PBXGroup; children = ( - E180B5E52992CD9100425DB0 /* KlipperMon.app */, - E180B5FB2992CD9300425DB0 /* KlipperMonTests.xctest */, - E180B6052992CD9300425DB0 /* KlipperMonUITests.xctest */, + E180B5E52992CD9100425DB0 /* Soyuz.app */, + E180B5FB2992CD9300425DB0 /* SoyuzTests.xctest */, + E180B6052992CD9300425DB0 /* SoyuzUITests.xctest */, ); name = Products; sourceTree = ""; }; - E180B5E72992CD9100425DB0 /* KlipperMon */ = { + E180B5E72992CD9100425DB0 /* Soyuz */ = { isa = PBXGroup; children = ( E124B9D72993FE5500C0D2D2 /* Info.plist */, - E180B5E82992CD9100425DB0 /* KlipperMonApp.swift */, + E180B5E82992CD9100425DB0 /* SoyuzApp.swift */, E180B5EC2992CD9200425DB0 /* Assets.xcassets */, E180B5F12992CD9200425DB0 /* Persistence.swift */, - E180B5F62992CD9200425DB0 /* KlipperMon.entitlements */, + E180B5F62992CD9200425DB0 /* Soyuz.entitlements */, E180B5F32992CD9200425DB0 /* KlipperMon.xcdatamodeld */, E180B5EE2992CD9200425DB0 /* Preview Content */, E180B61C2992D53700425DB0 /* PrinterObjectsQuery.swift */, - E180B61E2992DBB000425DB0 /* KlipperMonMenuBarExtraView.swift */, + E180B61E2992DBB000425DB0 /* SoyuzMenuBarExtraView.swift */, E180B6212993256E00425DB0 /* PrinterRequestManager.swift */, E124B9D829941A4D00C0D2D2 /* PrinterConfigView.swift */, E1E8B07829955ABE00BABE4B /* PrinterStats.swift */, ); - path = KlipperMon; + path = Soyuz; sourceTree = ""; }; E180B5EE2992CD9200425DB0 /* Preview Content */ = { @@ -136,30 +136,30 @@ path = "Preview Content"; sourceTree = ""; }; - E180B5FE2992CD9300425DB0 /* KlipperMonTests */ = { + E180B5FE2992CD9300425DB0 /* SoyuzTests */ = { isa = PBXGroup; children = ( - E180B5FF2992CD9300425DB0 /* KlipperMonTests.swift */, - E16378B129A43CE1002F05E9 /* KlipperMonScratchTests.swift */, + E180B5FF2992CD9300425DB0 /* SoyuzTests.swift */, + E16378B129A43CE1002F05E9 /* SoyuzScratchTests.swift */, ); - path = KlipperMonTests; + path = SoyuzTests; sourceTree = ""; }; - E180B6082992CD9300425DB0 /* KlipperMonUITests */ = { + E180B6082992CD9300425DB0 /* SoyuzUITests */ = { isa = PBXGroup; children = ( - E180B6092992CD9300425DB0 /* KlipperMonUITests.swift */, - E180B60B2992CD9300425DB0 /* KlipperMonUITestsLaunchTests.swift */, + E180B6092992CD9300425DB0 /* SoyuzUITests.swift */, + E180B60B2992CD9300425DB0 /* SoyuzUITestsLaunchTests.swift */, ); - path = KlipperMonUITests; + path = SoyuzUITests; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - E180B5E42992CD9100425DB0 /* KlipperMon */ = { + E180B5E42992CD9100425DB0 /* Soyuz */ = { isa = PBXNativeTarget; - buildConfigurationList = E180B60F2992CD9300425DB0 /* Build configuration list for PBXNativeTarget "KlipperMon" */; + buildConfigurationList = E180B60F2992CD9300425DB0 /* Build configuration list for PBXNativeTarget "Soyuz" */; buildPhases = ( E180B5E12992CD9100425DB0 /* Sources */, E180B5E22992CD9100425DB0 /* Frameworks */, @@ -169,17 +169,17 @@ ); dependencies = ( ); - name = KlipperMon; + name = Soyuz; packageProductDependencies = ( E1E8B07629949E2700BABE4B /* Starscream */, ); productName = KlipperMon; - productReference = E180B5E52992CD9100425DB0 /* KlipperMon.app */; + productReference = E180B5E52992CD9100425DB0 /* Soyuz.app */; productType = "com.apple.product-type.application"; }; - E180B5FA2992CD9300425DB0 /* KlipperMonTests */ = { + E180B5FA2992CD9300425DB0 /* SoyuzTests */ = { isa = PBXNativeTarget; - buildConfigurationList = E180B6122992CD9300425DB0 /* Build configuration list for PBXNativeTarget "KlipperMonTests" */; + buildConfigurationList = E180B6122992CD9300425DB0 /* Build configuration list for PBXNativeTarget "SoyuzTests" */; buildPhases = ( E180B5F72992CD9300425DB0 /* Sources */, E180B5F82992CD9300425DB0 /* Frameworks */, @@ -190,14 +190,14 @@ dependencies = ( E180B5FD2992CD9300425DB0 /* PBXTargetDependency */, ); - name = KlipperMonTests; + name = SoyuzTests; productName = KlipperMonTests; - productReference = E180B5FB2992CD9300425DB0 /* KlipperMonTests.xctest */; + productReference = E180B5FB2992CD9300425DB0 /* SoyuzTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - E180B6042992CD9300425DB0 /* KlipperMonUITests */ = { + E180B6042992CD9300425DB0 /* SoyuzUITests */ = { isa = PBXNativeTarget; - buildConfigurationList = E180B6152992CD9300425DB0 /* Build configuration list for PBXNativeTarget "KlipperMonUITests" */; + buildConfigurationList = E180B6152992CD9300425DB0 /* Build configuration list for PBXNativeTarget "SoyuzUITests" */; buildPhases = ( E180B6012992CD9300425DB0 /* Sources */, E180B6022992CD9300425DB0 /* Frameworks */, @@ -208,9 +208,9 @@ dependencies = ( E180B6072992CD9300425DB0 /* PBXTargetDependency */, ); - name = KlipperMonUITests; + name = SoyuzUITests; productName = KlipperMonUITests; - productReference = E180B6052992CD9300425DB0 /* KlipperMonUITests.xctest */; + productReference = E180B6052992CD9300425DB0 /* SoyuzUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; /* End PBXNativeTarget section */ @@ -236,7 +236,7 @@ }; }; }; - buildConfigurationList = E180B5E02992CD9100425DB0 /* Build configuration list for PBXProject "KlipperMon" */; + buildConfigurationList = E180B5E02992CD9100425DB0 /* Build configuration list for PBXProject "Soyuz" */; compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -252,9 +252,9 @@ projectDirPath = ""; projectRoot = ""; targets = ( - E180B5E42992CD9100425DB0 /* KlipperMon */, - E180B5FA2992CD9300425DB0 /* KlipperMonTests */, - E180B6042992CD9300425DB0 /* KlipperMonUITests */, + E180B5E42992CD9100425DB0 /* Soyuz */, + E180B5FA2992CD9300425DB0 /* SoyuzTests */, + E180B6042992CD9300425DB0 /* SoyuzUITests */, ); }; /* End PBXProject section */ @@ -295,9 +295,9 @@ E180B5F52992CD9200425DB0 /* KlipperMon.xcdatamodeld in Sources */, E124B9D929941A4D00C0D2D2 /* PrinterConfigView.swift in Sources */, E180B5F22992CD9200425DB0 /* Persistence.swift in Sources */, - E180B5E92992CD9100425DB0 /* KlipperMonApp.swift in Sources */, + E180B5E92992CD9100425DB0 /* SoyuzApp.swift in Sources */, E180B6222993256E00425DB0 /* PrinterRequestManager.swift in Sources */, - E180B61F2992DBB000425DB0 /* KlipperMonMenuBarExtraView.swift in Sources */, + E180B61F2992DBB000425DB0 /* SoyuzMenuBarExtraView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -305,8 +305,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E180B6002992CD9300425DB0 /* KlipperMonTests.swift in Sources */, - E16378B229A43CE1002F05E9 /* KlipperMonScratchTests.swift in Sources */, + E180B6002992CD9300425DB0 /* SoyuzTests.swift in Sources */, + E16378B229A43CE1002F05E9 /* SoyuzScratchTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -314,8 +314,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E180B60A2992CD9300425DB0 /* KlipperMonUITests.swift in Sources */, - E180B60C2992CD9300425DB0 /* KlipperMonUITestsLaunchTests.swift in Sources */, + E180B60A2992CD9300425DB0 /* SoyuzUITests.swift in Sources */, + E180B60C2992CD9300425DB0 /* SoyuzUITestsLaunchTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -324,12 +324,12 @@ /* Begin PBXTargetDependency section */ E180B5FD2992CD9300425DB0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = E180B5E42992CD9100425DB0 /* KlipperMon */; + target = E180B5E42992CD9100425DB0 /* Soyuz */; targetProxy = E180B5FC2992CD9300425DB0 /* PBXContainerItemProxy */; }; E180B6072992CD9300425DB0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = E180B5E42992CD9100425DB0 /* KlipperMon */; + target = E180B5E42992CD9100425DB0 /* Soyuz */; targetProxy = E180B6062992CD9300425DB0 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -453,23 +453,25 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = KlipperMon/KlipperMon.entitlements; + CODE_SIGN_ENTITLEMENTS = Soyuz/Soyuz.entitlements; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"KlipperMon/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = "Soyuz/Preview\\ Content"; DEVELOPMENT_TEAM = W9ASV855X5; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = KlipperMon/Info.plist; + INFOPLIST_FILE = Soyuz/Info.plist; + INFOPLIST_KEY_LSUIElement = NO; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = info.maddie.KlipperMon; + PRODUCT_BUNDLE_IDENTIFIER = info.maddie.Soyuz; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -481,23 +483,25 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = KlipperMon/KlipperMon.entitlements; + CODE_SIGN_ENTITLEMENTS = Soyuz/Soyuz.entitlements; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"KlipperMon/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = "Soyuz/Preview\\ Content"; DEVELOPMENT_TEAM = W9ASV855X5; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = KlipperMon/Info.plist; + INFOPLIST_FILE = Soyuz/Info.plist; + INFOPLIST_KEY_LSUIElement = NO; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = info.maddie.KlipperMon; + PRODUCT_BUNDLE_IDENTIFIER = info.maddie.Soyuz; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -519,7 +523,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KlipperMon.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/KlipperMon"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Soyuz.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Soyuz"; }; name = Debug; }; @@ -538,7 +542,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KlipperMon.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/KlipperMon"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Soyuz.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Soyuz"; }; name = Release; }; @@ -579,7 +583,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - E180B5E02992CD9100425DB0 /* Build configuration list for PBXProject "KlipperMon" */ = { + E180B5E02992CD9100425DB0 /* Build configuration list for PBXProject "Soyuz" */ = { isa = XCConfigurationList; buildConfigurations = ( E180B60D2992CD9300425DB0 /* Debug */, @@ -588,7 +592,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E180B60F2992CD9300425DB0 /* Build configuration list for PBXNativeTarget "KlipperMon" */ = { + E180B60F2992CD9300425DB0 /* Build configuration list for PBXNativeTarget "Soyuz" */ = { isa = XCConfigurationList; buildConfigurations = ( E180B6102992CD9300425DB0 /* Debug */, @@ -597,7 +601,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E180B6122992CD9300425DB0 /* Build configuration list for PBXNativeTarget "KlipperMonTests" */ = { + E180B6122992CD9300425DB0 /* Build configuration list for PBXNativeTarget "SoyuzTests" */ = { isa = XCConfigurationList; buildConfigurations = ( E180B6132992CD9300425DB0 /* Debug */, @@ -606,7 +610,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E180B6152992CD9300425DB0 /* Build configuration list for PBXNativeTarget "KlipperMonUITests" */ = { + E180B6152992CD9300425DB0 /* Build configuration list for PBXNativeTarget "SoyuzUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( E180B6162992CD9300425DB0 /* Debug */, diff --git a/KlipperMon.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Soyuz.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 53% rename from KlipperMon.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Soyuz.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 919434a..3128429 100644 --- a/KlipperMon.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Soyuz.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:/Volumes/SNAP/Users/averyadapace/Code/MacOS/KlipperMon/Soyuz.xcodeproj"> diff --git a/KlipperMon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Soyuz.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from KlipperMon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Soyuz.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Soyuz.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Soyuz.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..ff34a11 --- /dev/null +++ b/Soyuz.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "starscream", + "kind" : "remoteSourceControl", + "location" : "https://github.com/daltoniam/Starscream.git", + "state" : { + "revision" : "df8d82047f6654d8e4b655d1b1525c64e1059d21", + "version" : "4.0.4" + } + } + ], + "version" : 2 +} diff --git a/Soyuz.xcodeproj/xcuserdata/madelinecr.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Soyuz.xcodeproj/xcuserdata/madelinecr.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..c1840cd --- /dev/null +++ b/Soyuz.xcodeproj/xcuserdata/madelinecr.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,6 @@ + + + diff --git a/KlipperMon.xcodeproj/xcuserdata/madelinecr.xcuserdatad/xcschemes/xcschememanagement.plist b/Soyuz.xcodeproj/xcuserdata/madelinecr.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from KlipperMon.xcodeproj/xcuserdata/madelinecr.xcuserdatad/xcschemes/xcschememanagement.plist rename to Soyuz.xcodeproj/xcuserdata/madelinecr.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/KlipperMon/Assets.xcassets/AccentColor.colorset/Contents.json b/Soyuz/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from KlipperMon/Assets.xcassets/AccentColor.colorset/Contents.json rename to Soyuz/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/KlipperMon/Assets.xcassets/AppIcon.appiconset/Contents.json b/Soyuz/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from KlipperMon/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Soyuz/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/KlipperMon/Assets.xcassets/Contents.json b/Soyuz/Assets.xcassets/Contents.json similarity index 100% rename from KlipperMon/Assets.xcassets/Contents.json rename to Soyuz/Assets.xcassets/Contents.json diff --git a/KlipperMon/Info.plist b/Soyuz/Info.plist similarity index 94% rename from KlipperMon/Info.plist rename to Soyuz/Info.plist index ad569a5..65adf3a 100644 --- a/KlipperMon/Info.plist +++ b/Soyuz/Info.plist @@ -2,13 +2,6 @@ - LSUIElement - - NSBonjourServices - - _moonraker._tcp. - _http._tcp. - CFBundleURLTypes @@ -22,6 +15,11 @@ + NSBonjourServices + + _moonraker._tcp. + _http._tcp. + NSServices diff --git a/KlipperMon/KlipperMon.xcdatamodeld/.xccurrentversion b/Soyuz/KlipperMon.xcdatamodeld/.xccurrentversion similarity index 100% rename from KlipperMon/KlipperMon.xcdatamodeld/.xccurrentversion rename to Soyuz/KlipperMon.xcdatamodeld/.xccurrentversion diff --git a/KlipperMon/KlipperMon.xcdatamodeld/KlipperMon.xcdatamodel/contents b/Soyuz/KlipperMon.xcdatamodeld/KlipperMon.xcdatamodel/contents similarity index 100% rename from KlipperMon/KlipperMon.xcdatamodeld/KlipperMon.xcdatamodel/contents rename to Soyuz/KlipperMon.xcdatamodeld/KlipperMon.xcdatamodel/contents diff --git a/KlipperMon/Persistence.swift b/Soyuz/Persistence.swift similarity index 100% rename from KlipperMon/Persistence.swift rename to Soyuz/Persistence.swift diff --git a/KlipperMon/Preview Content/Preview Assets.xcassets/Contents.json b/Soyuz/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from KlipperMon/Preview Content/Preview Assets.xcassets/Contents.json rename to Soyuz/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/KlipperMon/PrinterConfigView.swift b/Soyuz/PrinterConfigView.swift similarity index 100% rename from KlipperMon/PrinterConfigView.swift rename to Soyuz/PrinterConfigView.swift diff --git a/KlipperMon/PrinterObjectsQuery.swift b/Soyuz/PrinterObjectsQuery.swift similarity index 100% rename from KlipperMon/PrinterObjectsQuery.swift rename to Soyuz/PrinterObjectsQuery.swift diff --git a/KlipperMon/PrinterRequestManager.swift b/Soyuz/PrinterRequestManager.swift similarity index 100% rename from KlipperMon/PrinterRequestManager.swift rename to Soyuz/PrinterRequestManager.swift diff --git a/KlipperMon/PrinterStats.swift b/Soyuz/PrinterStats.swift similarity index 100% rename from KlipperMon/PrinterStats.swift rename to Soyuz/PrinterStats.swift diff --git a/KlipperMon/KlipperMon.entitlements b/Soyuz/Soyuz.entitlements similarity index 100% rename from KlipperMon/KlipperMon.entitlements rename to Soyuz/Soyuz.entitlements diff --git a/KlipperMon/KlipperMonApp.swift b/Soyuz/SoyuzApp.swift similarity index 89% rename from KlipperMon/KlipperMonApp.swift rename to Soyuz/SoyuzApp.swift index 4bc4945..22d85b9 100644 --- a/KlipperMon/KlipperMonApp.swift +++ b/Soyuz/SoyuzApp.swift @@ -8,7 +8,7 @@ import SwiftUI @main -struct KlipperMonMenuBarApp: App { +struct SoyuzApp: App { let persistenceController = PersistenceController.shared @State var currentIcon = "move.3d" @@ -26,7 +26,7 @@ struct KlipperMonMenuBarApp: App { .windowResizability(.contentSize) MenuBarExtra("Soyuz", systemImage: currentIcon) { - KlipperMonMenuBarExtraView(currentMenuBarIcon: $currentIcon) + SoyuzMenuBarExtraView(currentMenuBarIcon: $currentIcon) .padding([.top, .leading, .trailing], 8) .padding([.bottom], 6) } diff --git a/KlipperMon/KlipperMonMenuBarExtraView.swift b/Soyuz/SoyuzMenuBarExtraView.swift similarity index 96% rename from KlipperMon/KlipperMonMenuBarExtraView.swift rename to Soyuz/SoyuzMenuBarExtraView.swift index b042009..cb9392f 100644 --- a/KlipperMon/KlipperMonMenuBarExtraView.swift +++ b/Soyuz/SoyuzMenuBarExtraView.swift @@ -9,7 +9,7 @@ import SwiftUI import AppKit import Network -struct KlipperMonMenuBarExtraView: View { +struct SoyuzMenuBarExtraView: View { // The threshhold considered a burn-risk, at which point certain UI elements turn red. let DANGERTEMP = 40.0 @@ -101,7 +101,7 @@ struct KlipperMonMenuBarExtraView: View { struct KlipperMonMenuBarExtraView_Previews: PreviewProvider { @State static var currentMenuBarIcon = "move.3d" static var previews: some View { - KlipperMonMenuBarExtraView(currentMenuBarIcon: $currentMenuBarIcon) + SoyuzMenuBarExtraView(currentMenuBarIcon: $currentMenuBarIcon) } } diff --git a/KlipperMonTests/KlipperMonScratchTests.swift b/SoyuzTests/SoyuzScratchTests.swift similarity index 86% rename from KlipperMonTests/KlipperMonScratchTests.swift rename to SoyuzTests/SoyuzScratchTests.swift index 361a632..710e2f3 100644 --- a/KlipperMonTests/KlipperMonScratchTests.swift +++ b/SoyuzTests/SoyuzScratchTests.swift @@ -7,7 +7,7 @@ import XCTest -class ScratchTests: XCTestCase { +class SoyuzScratchTests: XCTestCase { func testOneAndOneIsEqual() { let a = 1 diff --git a/KlipperMonTests/KlipperMonTests.swift b/SoyuzTests/SoyuzTests.swift similarity index 96% rename from KlipperMonTests/KlipperMonTests.swift rename to SoyuzTests/SoyuzTests.swift index cc1f175..1a3f297 100644 --- a/KlipperMonTests/KlipperMonTests.swift +++ b/SoyuzTests/SoyuzTests.swift @@ -8,7 +8,7 @@ import XCTest @testable import KlipperMon -final class KlipperMonTests: XCTestCase { +final class SoyuzTests: XCTestCase { override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class. diff --git a/KlipperMonUITests/KlipperMonUITests.swift b/SoyuzUITests/SoyuzUITests.swift similarity index 100% rename from KlipperMonUITests/KlipperMonUITests.swift rename to SoyuzUITests/SoyuzUITests.swift diff --git a/KlipperMonUITests/KlipperMonUITestsLaunchTests.swift b/SoyuzUITests/SoyuzUITestsLaunchTests.swift similarity index 100% rename from KlipperMonUITests/KlipperMonUITestsLaunchTests.swift rename to SoyuzUITests/SoyuzUITestsLaunchTests.swift