Update to work on device

InjectionIII.xcodeproj/project.pbxproj

@@ -15,8 +15,6 @@
 		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 */; };
-		BB19058C26D0C59200D57FB7 /* DLKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD0AB3D262F24E4003ED7B1 /* DLKit.swift */; };
-		BB19058D26D0C62F00D57FB7 /* DLKitC.c in Sources */ = {isa = PBXBuildFile; fileRef = BBD0AB40262F2549003ED7B1 /* DLKitC.c */; };
 		BB1A84072522703C003873C3 /* macOSInjection.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BBCA02451FB1065D00E45F0F /* macOSInjection.bundle */; };
 		BB1A840A25227535003873C3 /* SwiftTrace.h in Resources */ = {isa = PBXBuildFile; fileRef = BB6C87C62520D0D2005AFCFC /* SwiftTrace.h */; };
 		BB1BA90B251DC54100044608 /* SwiftUISupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1BA90A251DC54100044608 /* SwiftUISupport.swift */; };
@@ -32,8 +30,6 @@
 		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 */; };
-		BB53B642244FC08F00F006E3 /* RemoteCapture.h in Resources */ = {isa = PBXBuildFile; fileRef = BB4EC3FF244FA42A0079E244 /* RemoteCapture.h */; };
-		BB53B648244FC32C00F006E3 /* RemoteHeaders.h in Resources */ = {isa = PBXBuildFile; fileRef = BB53B647244FC2F800F006E3 /* RemoteHeaders.h */; };
 		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 */; };
@@ -102,6 +98,7 @@
 		BBCA02621FB1312A00E45F0F /* SimpleSocket.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB67DBB31FB0CDA8000EAC8A /* SimpleSocket.mm */; };
 		BBCB31C9281677C900081CB6 /* SwiftInterpose.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBCB31C8281677C700081CB6 /* SwiftInterpose.swift */; };
 		BBD0AB52263298D9003ED7B1 /* SwiftLifetime.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD0AB51263298D7003ED7B1 /* SwiftLifetime.swift */; };
+		BBD3B4FA2936552E006E7DB4 /* TupleRegex.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB2C6FD26FC9C2900E91E67 /* TupleRegex.swift */; };
 		BBE3B2E72524915A00300BF8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE3B2E62524915A00300BF8 /* AppDelegate.swift */; };
 		BBE3B2E92524916000300BF8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BBE3B2E82524916000300BF8 /* Assets.xcassets */; };
 		BBE3B2EC2524916000300BF8 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBE3B2EA2524916000300BF8 /* MainMenu.xib */; };
@@ -113,6 +110,7 @@
 		BBE64E5D2524D1B50049B6D4 /* SwiftEval.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB439B8A1FABA65D00B4F50B /* SwiftEval.swift */; };
 		BBEB704C1FD28C6F00127711 /* XcodeHash.m in Sources */ = {isa = PBXBuildFile; fileRef = BBEB704B1FD28C6F00127711 /* XcodeHash.m */; };
 		BBF3D62B2851E6DF0070356F /* ReducerInjection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBF3D62A2851E6DC0070356F /* ReducerInjection.swift */; };
+		BBFE27EA2B148E7400E47E61 /* copy_bundle.sh in Resources */ = {isa = PBXBuildFile; fileRef = BBFE27E92B148E7400E47E61 /* copy_bundle.sh */; };
 		BD35949E21A6C5DE0020EB94 /* Vaccine.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD35949D21A6C5DE0020EB94 /* Vaccine.swift */; };
 		CEC1702A253ED117002E823F /* Experimental.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEC17029253ED117002E823F /* Experimental.swift */; };
 /* End PBXBuildFile section */
@@ -306,7 +304,7 @@
 		BBCB31C8281677C700081CB6 /* SwiftInterpose.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftInterpose.swift; path = HotReloading/Sources/HotReloading/SwiftInterpose.swift; sourceTree = SOURCE_ROOT; };
 		BBCB5BE927E7D849005E8AF6 /* StandaloneInjection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = StandaloneInjection.swift; path = HotReloading/Sources/HotReloading/StandaloneInjection.swift; sourceTree = SOURCE_ROOT; };
 		BBD0AB3D262F24E4003ED7B1 /* DLKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DLKit.swift; path = DLKit/Sources/DLKit/DLKit.swift; sourceTree = SOURCE_ROOT; };
-		BBD0AB3F262F2549003ED7B1 /* fishhook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fishhook.c; path = DLKit/Sources/DLKitC/fishhook.c; sourceTree = SOURCE_ROOT; };
+		BBD0AB3F262F2549003ED7B1 /* fishhook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fishhook.c; path = SwiftTrace/SwiftTraceGuts/fishhook.c; sourceTree = SOURCE_ROOT; };
 		BBD0AB40262F2549003ED7B1 /* DLKitC.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = DLKitC.c; path = DLKit/Sources/DLKitC/DLKitC.c; sourceTree = SOURCE_ROOT; };
 		BBD0AB43262F256B003ED7B1 /* DLKitC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DLKitC.h; path = DLKit/Sources/DLKitC/include/DLKitC.h; sourceTree = SOURCE_ROOT; };
 		BBD0AB51263298D7003ED7B1 /* SwiftLifetime.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftLifetime.swift; path = SwiftTrace/SwiftLifetime.swift; sourceTree = "<group>"; };
@@ -323,6 +321,7 @@
 		BBEB704A1FD28C6F00127711 /* XcodeHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XcodeHash.h; sourceTree = "<group>"; };
 		BBEB704B1FD28C6F00127711 /* XcodeHash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XcodeHash.m; sourceTree = "<group>"; };
 		BBF3D62A2851E6DC0070356F /* ReducerInjection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ReducerInjection.swift; path = HotReloading/Sources/HotReloading/ReducerInjection.swift; sourceTree = SOURCE_ROOT; };
+		BBFE27E92B148E7400E47E61 /* copy_bundle.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = copy_bundle.sh; sourceTree = "<group>"; };
 		BD35949D21A6C5DE0020EB94 /* Vaccine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Vaccine.swift; path = ../HotReloading/Sources/HotReloading/Vaccine.swift; sourceTree = "<group>"; };
 		BDB6A7CE21824C800001CF95 /* UserDefaults.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = UserDefaults.h; path = ../HotReloading/Sources/HotReloadingGuts/include/UserDefaults.h; sourceTree = "<group>"; };
 		CEC17029253ED117002E823F /* Experimental.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Experimental.swift; path = ../HotReloading/Sources/injectiond/Experimental.swift; sourceTree = "<group>"; };
@@ -581,6 +580,7 @@
 				BBCA02581FB112F500E45F0F /* App.icns */,
 				BBCA020B1FB0F10400E45F0F /* InjectionIII.entitlements */,
 				BBA7BE0223473D660067124D /* build_bundles.sh */,
+				BBFE27E92B148E7400E47E61 /* copy_bundle.sh */,
 				BBDF943C2349277A00334E08 /* InjectionIII-Bridging-Header.h */,
 				BB4EC3FF244FA42A0079E244 /* RemoteCapture.h */,
 				BB53B647244FC2F800F006E3 /* RemoteHeaders.h */,
@@ -895,10 +895,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				BB1EBC50258EA273001F2AA4 /* fishhook.h in Resources */,
+				BBFE27EA2B148E7400E47E61 /* copy_bundle.sh in Resources */,
 				BB1A840A25227535003873C3 /* SwiftTrace.h in Resources */,
 				BB1A84072522703C003873C3 /* macOSInjection.bundle in Resources */,
-				BB53B648244FC32C00F006E3 /* RemoteHeaders.h in Resources */,
-				BB53B642244FC08F00F006E3 /* RemoteCapture.h in Resources */,
 				BBB64FDE1FD5744A0020BE47 /* XprobeConsole.xib in Resources */,
 				BBB64FDF1FD5744A0020BE47 /* XprobePluginMenuController.xib in Resources */,
 				BBB64DDC1FD570220020BE47 /* graph-xdot.gv in Resources */,
@@ -1082,7 +1081,6 @@
 				BB16653E25EC5FE0001407AE /* InjectionClient.swift in Sources */,
 				BBC03BC12625F27C005C1A06 /* UnhidingEval.swift in Sources */,
 				BBCA02501FB107AF00E45F0F /* SwiftEval.swift in Sources */,
-				BB19058C26D0C59200D57FB7 /* DLKit.swift in Sources */,
 				BD35949E21A6C5DE0020EB94 /* Vaccine.swift in Sources */,
 				BBCA02511FB107AF00E45F0F /* SwiftInjection.swift in Sources */,
 				BB9642A627E339BE00C61CB7 /* ObjcInjection.swift in Sources */,
@@ -1091,7 +1089,6 @@
 				BB16654425ECD828001407AE /* ClientBoot.mm in Sources */,
 				BB16653F25EC6158001407AE /* Xprobe+Service.mm in Sources */,
 				BBCA02621FB1312A00E45F0F /* SimpleSocket.mm in Sources */,
-				BB19058D26D0C62F00D57FB7 /* DLKitC.c in Sources */,
 				BBBE71BB260652E000F45DE2 /* SweepSeeding.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1102,6 +1099,7 @@
 			files = (
 				BBE3B2F2252491BC00300BF8 /* SwiftEval.swift in Sources */,
 				BBE3B2E72524915A00300BF8 /* AppDelegate.swift in Sources */,
+				BBD3B4FA2936552E006E7DB4 /* TupleRegex.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1479,7 +1477,7 @@
 				INFOPLIST_FILE = InjectionIII/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 4.5.3;
+				MARKETING_VERSION = 4.8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnholdsworth.InjectionIII;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1503,7 +1501,7 @@
 				INFOPLIST_FILE = InjectionIII/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 4.5.3;
+				MARKETING_VERSION = 4.8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnholdsworth.InjectionIII;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

InjectionIII.xcodeproj/xcshareddata/xcschemes/InjectionIII.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1150"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BBCA01FD1FB0F10300E45F0F"
+               BuildableName = "InjectionIII.app"
+               BlueprintName = "InjectionIII"
+               ReferencedContainer = "container:InjectionIII.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BBCA01FD1FB0F10300E45F0F"
+            BuildableName = "InjectionIII.app"
+            BlueprintName = "InjectionIII"
+            ReferencedContainer = "container:InjectionIII.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BBCA01FD1FB0F10300E45F0F"
+            BuildableName = "InjectionIII.app"
+            BlueprintName = "InjectionIII"
+            ReferencedContainer = "container:InjectionIII.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

InjectionIII/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>7584</string>
+	<string>7918</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

InjectionIII/copy_bundle.sh

@@ -0,0 +1,22 @@
+#!/bin/bash -x
+#
+#  copy_bundle.sh
+#  InjectionIII
+#
+#  Copies injection bundle for on-device injection.
+#  Thanks @oryonatan
+#
+if [ "$CONFIGURATION" == "Debug" ]; then
+    RESOURCES="$(dirname "$0")"
+    if [ "$PLATFORM_NAME" == "iphonesimulator" ]; then
+     BUNDLE=${1:-iOSInjection}
+    else
+     BUNDLE=${1:-maciOSInjection}
+    fi
+    COPY="$CODESIGNING_FOLDER_PATH/iOSInjection.bundle"
+    rsync -a "$RESOURCES/$BUNDLE.bundle"/* "$COPY/" &&
+    /usr/libexec/PlistBuddy -c "Add :UserHome string $HOME"  "$COPY/Info.plist" &&
+    codesign -f --sign "$EXPANDED_CODE_SIGN_IDENTITY" --timestamp\=none --preserve-metadata\=identifier,entitlements,flags --generate-entitlement-der "$COPY/Frameworks/SwiftTrace.framework/SwiftTrace" &&
+    codesign -f --sign "$EXPANDED_CODE_SIGN_IDENTITY" --timestamp\=none --preserve-metadata\=identifier,entitlements,flags --generate-entitlement-der "$COPY" &&
+    defaults write com.johnholdsworth.InjectionIII "$PROJECT_FILE_PATH" $EXPANDED_CODE_SIGN_IDENTITY
+fi