Profile swiftui2

.gitmodules

@@ -1,12 +1,6 @@
-[submodule "XprobePlugin"]
-	path = XprobePlugin
-	url = https://github.com/johnno1962/XprobePlugin
 [submodule "SwiftTrace"]
 	path = SwiftTrace
 	url = https://github.com/johnno1962/SwiftTrace
-[submodule "Remote"]
-	path = Remote
-	url = https://github.com/johnno1962/Remote.git
 [submodule "HotReloading"]
 	path = HotReloading
 	url = https://github.com/johnno1962/HotReloading.git

InjectionBundle/XprobeSwift-Bridging-Header.h

@@ -5,7 +5,9 @@
 #import "SimpleSocket.h"
 #import "UserDefaults.h"
 #import "InjectionClient.h"
+#if SWIFT_PACKAGE
 #import "../XprobePlugin/Sources/Xprobe/include/Xprobe.h"
+#endif
 #import "DLKitC.h"
 
 @interface NSObject(InjectionSweep)

InjectionIII.xcodeproj/project.pbxproj

@@ -11,8 +11,6 @@
 		BB04337A28D31A350007577F /* StandaloneInjection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBCB5BE927E7D849005E8AF6 /* StandaloneInjection.swift */; };
 		BB16653A25E9A5F2001407AE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BB16653925E9A5F0001407AE /* main.m */; };
 		BB16653E25EC5FE0001407AE /* InjectionClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB16653D25EC5FDF001407AE /* InjectionClient.swift */; };
-		BB16653F25EC6158001407AE /* Xprobe+Service.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB56393F1FD5D535002FFCEF /* Xprobe+Service.mm */; };
-		BB16654025EC6163001407AE /* Xprobe.mm in Sources */ = {isa = PBXBuildFile; fileRef = BBB64FE91FD583B60020BE47 /* Xprobe.mm */; };
 		BB16654425ECD828001407AE /* ClientBoot.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB16654325ECD827001407AE /* ClientBoot.mm */; };
 		BB18D2E8274E1748004BB4A5 /* DynamicCast.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB18D2E7274E1746004BB4A5 /* DynamicCast.swift */; };
 		BB1A84072522703C003873C3 /* macOSInjection.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BBCA02451FB1065D00E45F0F /* macOSInjection.bundle */; };
@@ -22,18 +20,11 @@
 		BB1EBC4D258DE2A0001F2AA4 /* fishhook.c in Sources */ = {isa = PBXBuildFile; fileRef = BB1EBC4C258DE29D001F2AA4 /* fishhook.c */; };
 		BB1EBC4F258DE2AD001F2AA4 /* fishhook.h in Headers */ = {isa = PBXBuildFile; fileRef = BB1EBC4E258DE2AC001F2AA4 /* fishhook.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BB1EBC50258EA273001F2AA4 /* fishhook.h in Resources */ = {isa = PBXBuildFile; fileRef = BB1EBC4E258DE2AC001F2AA4 /* fishhook.h */; };
-		BB34C3FD244FAAB400D520A9 /* RMWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB34C3FC244FAAB400D520A9 /* RMWindowController.xib */; };
-		BB34C3FF244FAD3C00D520A9 /* log.html in Resources */ = {isa = PBXBuildFile; fileRef = BB34C3FE244FAD3C00D520A9 /* log.html */; };
-		BB34C401244FAE3000D520A9 /* iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = BB34C400244FAE2F00D520A9 /* iphone.png */; };
 		BB3756FF2BCC269400CE5D05 /* DLKitC.c in Sources */ = {isa = PBXBuildFile; fileRef = BBD0AB40262F2549003ED7B1 /* DLKitC.c */; };
 		BB3757042BCC26DD00CE5D05 /* trie_dlops.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB3757022BCC26DD00CE5D05 /* trie_dlops.mm */; };
 		BB3757052BCC26DD00CE5D05 /* trie_dladdr.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB3757032BCC26DD00CE5D05 /* trie_dladdr.mm */; };
 		BB3757072BCC385F00CE5D05 /* ProfileSwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3757002BCC26AE00CE5D05 /* ProfileSwiftUI.swift */; };
 		BB439B801FABA64300B4F50B /* SwiftEvalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB439B7F1FABA64300B4F50B /* SwiftEvalTests.swift */; };
-		BB4EC3FB244FA3C40079E244 /* RMMacroManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BB4EC3F7244FA3C30079E244 /* RMMacroManager.m */; };
-		BB4EC3FC244FA3C40079E244 /* RMDeviceController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB4EC3F8244FA3C30079E244 /* RMDeviceController.m */; };
-		BB4EC3FD244FA3C40079E244 /* RMImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = BB4EC3F9244FA3C40079E244 /* RMImageView.m */; };
-		BB4EC3FE244FA3C40079E244 /* RMWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB4EC3FA244FA3C40079E244 /* RMWindowController.m */; };
 		BB56393C1FD5C25A002FFCEF /* SignerService.m in Sources */ = {isa = PBXBuildFile; fileRef = BB67DBB61FB0D0F2000EAC8A /* SignerService.m */; };
 		BB6306FE1FCD1A410021D30C /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = BB6306FD1FCD1A410021D30C /* Credits.rtf */; };
 		BB6446202545831400A83098 /* StringIndex.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB64461F2545831200A83098 /* StringIndex.swift */; };
@@ -52,7 +43,6 @@
 		BB6C87FB2520D2C3005AFCFC /* xt_forwarding_trampoline_x64.s in Sources */ = {isa = PBXBuildFile; fileRef = BB6C87F82520D2C3005AFCFC /* xt_forwarding_trampoline_x64.s */; };
 		BB6C881F2520D799005AFCFC /* SwiftTrace.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BB6C87C42520D0D1005AFCFC /* SwiftTrace.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BB746D602BACB62D0001685F /* SwiftKeyPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB746D5F2BACB62B0001685F /* SwiftKeyPath.swift */; };
-		BB79FC79245CC02200A4B4CB /* TimeLapseBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB79FC78245CC02200A4B4CB /* TimeLapseBuilder.swift */; };
 		BB7D7CAC2512F8F00069FE2C /* UpdateCheck.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7D7CAB2512F8F00069FE2C /* UpdateCheck.swift */; };
 		BB80B3B526B573BE0055FAAE /* README_Chinese.md in Resources */ = {isa = PBXBuildFile; fileRef = BB80B3B426B573BE0055FAAE /* README_Chinese.md */; };
 		BB877CE42186EB6E0070EEC7 /* DDHotKeyCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = BB6306F51FCD16600021D30C /* DDHotKeyCenter.m */; };
@@ -64,26 +54,14 @@
 		BBB2C6FF26FC9C2900E91E67 /* TupleRegex.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB2C6FD26FC9C2900E91E67 /* TupleRegex.swift */; };
 		BBB64DC51FD450AF0020BE47 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = BB037DF31FAD808B004B267C /* README.md */; };
 		BBB64DC61FD450B40020BE47 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = BB037DF41FAD80D0004B267C /* LICENSE */; };
-		BBB64DD31FD56F570020BE47 /* XprobePluginMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = BBB64DD11FD56F570020BE47 /* XprobePluginMenuController.m */; };
-		BBB64DD41FD56F570020BE47 /* XprobeConsole.m in Sources */ = {isa = PBXBuildFile; fileRef = BBB64DD21FD56F570020BE47 /* XprobeConsole.m */; };
-		BBB64DDC1FD570220020BE47 /* graph-xdot.gv in Resources */ = {isa = PBXBuildFile; fileRef = BBB64DD61FD570210020BE47 /* graph-xdot.gv */; };
-		BBB64DDD1FD570220020BE47 /* CodeMirror in Resources */ = {isa = PBXBuildFile; fileRef = BBB64DD71FD570210020BE47 /* CodeMirror */; };
-		BBB64DDE1FD570220020BE47 /* xprobe.html in Resources */ = {isa = PBXBuildFile; fileRef = BBB64DD81FD570210020BE47 /* xprobe.html */; };
-		BBB64DDF1FD570220020BE47 /* canviz-0.1 in Resources */ = {isa = PBXBuildFile; fileRef = BBB64DD91FD570210020BE47 /* canviz-0.1 */; };
-		BBB64DE01FD570220020BE47 /* canviz.html in Resources */ = {isa = PBXBuildFile; fileRef = BBB64DDA1FD570220020BE47 /* canviz.html */; };
-		BBB64DE11FD570220020BE47 /* tiny_red.gif in Resources */ = {isa = PBXBuildFile; fileRef = BBB64DDB1FD570220020BE47 /* tiny_red.gif */; };
 		BBB64DE51FD571310020BE47 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB64DE41FD571300020BE47 /* libz.tbd */; };
 		BBB64DE61FD5717C0020BE47 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB64DE41FD571300020BE47 /* libz.tbd */; };
-		BBB64FDE1FD5744A0020BE47 /* XprobeConsole.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBB64FDC1FD5744A0020BE47 /* XprobeConsole.xib */; };
-		BBB64FDF1FD5744A0020BE47 /* XprobePluginMenuController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBB64FDD1FD5744A0020BE47 /* XprobePluginMenuController.xib */; };
-		BBB64FE11FD575260020BE47 /* XprobeSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB64FE01FD575260020BE47 /* XprobeSwift.swift */; };
 		BBB64FEC1FD585D50020BE47 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB64FEB1FD585D50020BE47 /* WebKit.framework */; };
 		BBB9E987279BEC190085E3B9 /* SwiftTrace-Swift.h in Headers */ = {isa = PBXBuildFile; fileRef = BBB9E983279BEC190085E3B9 /* SwiftTrace-Swift.h */; };
 		BBB9E988279BEC190085E3B9 /* ObjCBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = BBB9E984279BEC190085E3B9 /* ObjCBridge.mm */; };
 		BBB9E989279BEC190085E3B9 /* fast_dladdr.mm in Sources */ = {isa = PBXBuildFile; fileRef = BBB9E985279BEC190085E3B9 /* fast_dladdr.mm */; };
 		BBB9E98A279BEC190085E3B9 /* Trampolines.mm in Sources */ = {isa = PBXBuildFile; fileRef = BBB9E986279BEC190085E3B9 /* Trampolines.mm */; };
 		BBB9E98C279BEE3B0085E3B9 /* DeviceServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB9E98B279BEE3B0085E3B9 /* DeviceServer.swift */; };
-		BBBE71BB260652E000F45DE2 /* SweepSeeding.m in Sources */ = {isa = PBXBuildFile; fileRef = BBBE71BA260652E000F45DE2 /* SweepSeeding.m */; };
 		BBBFD2D01FCFEE300057D899 /* SwiftEval.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB439B8A1FABA65D00B4F50B /* SwiftEval.swift */; };
 		BBC03BBD2625F269005C1A06 /* Unhide.mm in Sources */ = {isa = PBXBuildFile; fileRef = BBC03BBC2625F268005C1A06 /* Unhide.mm */; };
 		BBC03BBE2625F269005C1A06 /* Unhide.mm in Sources */ = {isa = PBXBuildFile; fileRef = BBC03BBC2625F268005C1A06 /* Unhide.mm */; };
@@ -217,7 +195,6 @@
 		BB56393F1FD5D535002FFCEF /* Xprobe+Service.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "Xprobe+Service.mm"; path = "XprobePlugin/Sources/Xprobe/Xprobe+Service.mm"; sourceTree = "<group>"; };
 		BB5639401FD5D535002FFCEF /* Xtrace.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = Xtrace.mm; path = XprobePlugin/Classes/Xtrace.mm; sourceTree = "<group>"; };
 		BB596EE127AAC5A6009B6241 /* ROADMAP.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = ROADMAP.md; sourceTree = "<group>"; };
-		BB6125D224EA882000A7C230 /* Injection.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = Injection.jar; path = AppCodePlugin/Injection.jar; sourceTree = "<group>"; };
 		BB62244F1FC5B18700AD7A3A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BB6224531FC5B1CB00AD7A3A /* mach_inject_bundle_stub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mach_inject_bundle_stub.h; sourceTree = "<group>"; };
 		BB6224541FC5B1CB00AD7A3A /* mach_inject_bundle_stub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mach_inject_bundle_stub.c; sourceTree = "<group>"; };
@@ -404,7 +381,6 @@
 				BB80B3B426B573BE0055FAAE /* README_Chinese.md */,
 				BB596EE127AAC5A6009B6241 /* ROADMAP.md */,
 				BB9DE2302923C3B000926B1B /* BAZEL.md */,
-				BB6125D224EA882000A7C230 /* Injection.jar */,
 				BBCA01FF1FB0F10300E45F0F /* InjectionIII */,
 				BBCA02461FB1065D00E45F0F /* InjectionBundle */,
 				BB6C87C52520D0D2005AFCFC /* SwiftTrace */,
@@ -911,15 +887,7 @@
 				BBFE27EA2B148E7400E47E61 /* copy_bundle.sh in Resources */,
 				BB1A840A25227535003873C3 /* SwiftTrace.h in Resources */,
 				BB1A84072522703C003873C3 /* macOSInjection.bundle in Resources */,
-				BBB64FDE1FD5744A0020BE47 /* XprobeConsole.xib in Resources */,
-				BBB64FDF1FD5744A0020BE47 /* XprobePluginMenuController.xib in Resources */,
-				BBB64DDC1FD570220020BE47 /* graph-xdot.gv in Resources */,
-				BBB64DDD1FD570220020BE47 /* CodeMirror in Resources */,
-				BBB64DDE1FD570220020BE47 /* xprobe.html in Resources */,
 				BB80B3B526B573BE0055FAAE /* README_Chinese.md in Resources */,
-				BBB64DDF1FD570220020BE47 /* canviz-0.1 in Resources */,
-				BBB64DE01FD570220020BE47 /* canviz.html in Resources */,
-				BBB64DE11FD570220020BE47 /* tiny_red.gif in Resources */,
 				BBB64DC61FD450B40020BE47 /* LICENSE in Resources */,
 				BBB64DC51FD450AF0020BE47 /* README.md in Resources */,
 				BBE490DC1FB2C643003D41BB /* InjectionError.tif in Resources */,
@@ -928,10 +896,7 @@
 				BB6306FE1FCD1A410021D30C /* Credits.rtf in Resources */,
 				BBCA02611FB122C300E45F0F /* InjectionOK.tif in Resources */,
 				BBCA02041FB0F10300E45F0F /* Assets.xcassets in Resources */,
-				BB34C3FF244FAD3C00D520A9 /* log.html in Resources */,
 				BBCA02071FB0F10300E45F0F /* MainMenu.xib in Resources */,
-				BB34C3FD244FAAB400D520A9 /* RMWindowController.xib in Resources */,
-				BB34C401244FAE3000D520A9 /* iphone.png in Resources */,
 				BBE490DB1FB2C643003D41BB /* InjectionBusy.tif in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1055,11 +1020,7 @@
 				BBB2C6FE26FC9C2900E91E67 /* TupleRegex.swift in Sources */,
 				BB877CE42186EB6E0070EEC7 /* DDHotKeyCenter.m in Sources */,
 				BB877CE52186EB6E0070EEC7 /* DDHotKeyUtilities.m in Sources */,
-				BB4EC3FD244FA3C40079E244 /* RMImageView.m in Sources */,
-				BBB64DD31FD56F570020BE47 /* XprobePluginMenuController.m in Sources */,
-				BBB64DD41FD56F570020BE47 /* XprobeConsole.m in Sources */,
 				BBCA022A1FB0F64800E45F0F /* SimpleSocket.mm in Sources */,
-				BB79FC79245CC02200A4B4CB /* TimeLapseBuilder.swift in Sources */,
 				CEC1702A253ED117002E823F /* Experimental.swift in Sources */,
 				BB56393C1FD5C25A002FFCEF /* SignerService.m in Sources */,
 				BB16653A25E9A5F2001407AE /* main.m in Sources */,
@@ -1068,12 +1029,9 @@
 				BBB9E98C279BEE3B0085E3B9 /* DeviceServer.swift in Sources */,
 				BBCA02021FB0F10300E45F0F /* AppDelegate.swift in Sources */,
 				BB7D7CAC2512F8F00069FE2C /* UpdateCheck.swift in Sources */,
-				BB4EC3FE244FA3C40079E244 /* RMWindowController.m in Sources */,
 				BBE490D01FB2368A003D41BB /* FileWatcher.swift in Sources */,
-				BB4EC3FC244FA3C40079E244 /* RMDeviceController.m in Sources */,
 				BBCA02561FB1099500E45F0F /* InjectionServer.swift in Sources */,
 				BBC03BC02625F27C005C1A06 /* UnhidingEval.swift in Sources */,
-				BB4EC3FB244FA3C40079E244 /* RMMacroManager.m in Sources */,
 				BBBFD2D01FCFEE300057D899 /* SwiftEval.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1083,7 +1041,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				BBB2C6FF26FC9C2900E91E67 /* TupleRegex.swift in Sources */,
-				BB16654025EC6163001407AE /* Xprobe.mm in Sources */,
 				BB04337928D319F60007577F /* FileWatcher.swift in Sources */,
 				BBC03BC726282358005C1A06 /* SwiftSweeper.swift in Sources */,
 				BB3756FF2BCC269400CE5D05 /* DLKitC.c in Sources */,
@@ -1102,12 +1059,9 @@
 				BBCA02511FB107AF00E45F0F /* SwiftInjection.swift in Sources */,
 				BB746D602BACB62D0001685F /* SwiftKeyPath.swift in Sources */,
 				BB9642A627E339BE00C61CB7 /* ObjcInjection.swift in Sources */,
-				BBB64FE11FD575260020BE47 /* XprobeSwift.swift in Sources */,
 				BB04337A28D31A350007577F /* StandaloneInjection.swift in Sources */,
 				BB16654425ECD828001407AE /* ClientBoot.mm in Sources */,
-				BB16653F25EC6158001407AE /* Xprobe+Service.mm in Sources */,
 				BBCA02621FB1312A00E45F0F /* SimpleSocket.mm in Sources */,
-				BBBE71BB260652E000F45DE2 /* SweepSeeding.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1495,7 +1449,7 @@
 				INFOPLIST_FILE = InjectionIII/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 5.0.0;
+				MARKETING_VERSION = 5.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnholdsworth.InjectionIII;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1519,7 +1473,7 @@
 				INFOPLIST_FILE = InjectionIII/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 5.0.0;
+				MARKETING_VERSION = 5.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnholdsworth.InjectionIII;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

InjectionIII/Base.lproj/MainMenu.xib

@@ -734,7 +734,7 @@
                         <action selector="toggleTDD:" target="Voe-Tx-rLC" id="hjO-wo-Oy4"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Run Xprobe" toolTip="Inspect app object state" id="R6p-Yl-7qz">
+                <menuItem title="Run Xprobe" hidden="YES" toolTip="Inspect app object state" id="R6p-Yl-7qz">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <accessibility description="Open Xprobe"/>
                     <connections>
@@ -752,7 +752,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Method Tracing" autoenablesItems="NO" id="LL4-BA-XJf">
                         <items>
-                            <menuItem title="Profile SwiftUI" allowsKeyEquivalentWhenHidden="YES" toolTip="Log methods defined in app's main bundle." id="3ZO-RG-jcD">
+                            <menuItem title="Profile SwiftUI" allowsKeyEquivalentWhenHidden="YES" toolTip="Profile calls into SwiftUI and AttributeGraph." id="3ZO-RG-jcD">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <accessibility description="Trace App"/>
                                 <connections>
@@ -888,7 +888,7 @@
                         <accessibility description="Add method traces to App"/>
                     </menu>
                 </menuItem>
-                <menuItem title="Remote Control" id="of9-Ja-9Yf">
+                <menuItem title="Remote Control" hidden="YES" id="of9-Ja-9Yf">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Remote Control" id="eGx-OC-usD">
                         <items>

InjectionIII/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>8075</string>
+	<string>8115</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
@@ -32,28 +32,5 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>NSServices</key>
-	<array>
-		<dict>
-			<key>NSMenuItem</key>
-			<dict>
-				<key>default</key>
-				<string>Injection Goto</string>
-			</dict>
-			<key>NSMessage</key>
-			<string>injectionGoto</string>
-			<key>NSPortName</key>
-			<string>InjectionIII</string>
-			<key>NSSendTypes</key>
-			<array>
-				<string>NSStringPboardType</string>
-			</array>
-		</dict>
-	</array>
-	<key>SMPrivilegedExecutables</key>
-	<dict>
-		<key>com.johnholdsworth.InjectionIII.Helper</key>
-		<string>identifier com.johnholdsworth.InjectionIII.Helper</string>
-	</dict>
 </dict>
 </plist>

InjectionIII/InjectionIII-Bridging-Header.h

@@ -10,9 +10,10 @@
 #import "SimpleSocket.h"
 #import "SignerService.h"
 #import "InjectionClient.h"
+#if SWIFT_PACKAGE
 #import "RMWindowController.h"
+#import "../XprobePlugin/Sources/XprobeUI/include/XprobePluginMenuController.h"
+#endif
 
 #import "DDHotKeyCenter.h"
 #import <libproc.h>
-
-#import "../XprobePlugin/Sources/XprobeUI/include/XprobePluginMenuController.h"