Xcode 12 gm (johnno1962#265)

* Changes relative to master to build for Big Sur and Apple Silicon

* Update checking off GitHub

* A pinch of salt

* Use tagName comparison against version.

* Apple Silicon fix

* Re-sync perforce.

* Move compilation back into App where it belongs.

* Last minute project changes

* Get storyboard injection working again

* New form of tracing for SwiftUI

* Unending tweaks to SwiftTrace after introducing interposing

* SwiftUI type handlers + Trace output filtering

* Fix AppCode compatibility (johnno1962#267)

Cheers!

* Safer version of legacy injection (which we don't use anymore anyway)

* Build bundles in Release mode at last + Dark mode

* Separate out SwiftTrace into framework

* tvOS deployment target to avoid "small" Objective-C meta data

* Extra hints and clean up of bundle build script.

* Custom type handlers for tracing & removing a few warnings.

* Build time RPATH check & Reinstate EvalApp eexample

* Full circle.

* macOS .swiftinterface files

* Injection Goto service.

* Update to use swift_getTypeName for fully qualified type name

* Service Meta-data error

* Late binding XCTest framework

* Many more tracing options.

* Per-framework tracing

* Dumping of invocation stats.

* Objc injection goto.

* Trace system frameworks

* Break out some code.

* Support for method call order profiling

* Source file re-ordering after trace for paging performance

* Afterthoughts.

* Sync https://github.com/johnno1962/StringIndex, rename Objc header

* Sync StringIndex, SwiftTrace including "EasyPointer"

* Support un-tracing (revert interposes)

* 2.4.1 Release for Big Sur

* -fprofile-instr-generate on dylib

* Pre-merge to master

Co-authored-by: yeswolf <[email protected]>

Author: johnno1962

AppCodePlugin/Injection.jar

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <id>com.injectionforxcode.injection.plugin.id</id>
   <name>InjectionIII for AppCode</name>
-  <version>4.0</version>
+  <version>4.1</version>
   <vendor email="[email protected]" url="https://github.com/johnno1962/InjectionIII">Injection for Xcode</vendor>
 
   <description><![CDATA[

AppCodePlugin/META-INF/plugin.xml

@@ -15,7 +15,7 @@
 /**
  * Copyright (c) 2013 John Holdsworth. All rights reserved.
  *
- * $Id: //depot/ResidentEval/InjectionPluginAppCode/src/com/injectionforxcode/InjectionAction.java#1 $
+ * $Id: //depot/ResidentEval/AppCodePlugin/src/com/injectionforxcode/InjectionAction.java#3 $
  *
  * Created with IntelliJ IDEA.
  * Date: 24/02/2013
@@ -110,7 +110,8 @@ void serviceClientApp(final Socket socket) throws Throwable {
         sentProjectPath = false;
 
         // Temporary dorectory to use
-        writeString(clientOutput, "/tmp");
+        final String tmpDir = "/tmp", prefix = tmpDir+"/eval";
+        writeString(clientOutput, tmpDir);
 
         // Sanity check
         if (!"bvijkijyhbtrbrebzjbbzcfbbvvq".equals(readString(clientInput)))
@@ -131,6 +132,10 @@ public void run() {
                             switch (InjectionResponse.values()[resp]) {
                                 case Sign:
                                     String dylib = readString(clientInput);
+                                    if (!new File(dylib).exists())
+                                        dylib = prefix+dylib;
+                                    else if (!dylib.startsWith(prefix))
+                                        error("Signing exception", new IOException("Invalid path"));
                                     try {
                                         Process process = Runtime.getRuntime().exec(new String[] {"/bin/bash", "-c",
                                                 "(export CODESIGN_ALLOCATE=/Applications/Xcode.app" +
@@ -213,6 +218,8 @@ static int readInt(InputStream s) throws IOException {
 
     static String readString(InputStream s) throws IOException {
         int pathLength = readInt(s);
+        if (pathLength > 1000000)
+            pathLength = readInt(s);
         byte buffer[] = new byte[pathLength];
         if (s.read(buffer) != pathLength)
             alert("Bad path read, pathLength :"+pathLength);

AppCodePlugin/src/com/injectionforxcode/InjectionAction.java

@@ -17,13 +17,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     @IBOutlet weak var closureText: NSTextField!
 
     @IBAction func performEval(_: Any) {
-        textView.string = eval(textField.stringValue)
+        textView.string = swiftEvalString(contents: textField.stringValue)
     }
 
     @IBAction func closureEval(_: Any) {
-        if let block = eval(closureText.stringValue, (() -> ())?.self) {
-            block()
-        }
+        _ = swiftEval(code: closureText.stringValue+"()")
     }
 
     @objc func injected() {
@@ -34,7 +32,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // Insert code here to initialize your application
         SwiftEval.instance.evalError = {
             let err = $0
-            if !err.hasPrefix("Compiling ") {
+            if !err.hasPrefix("💉 Compiling ") {
                 DispatchQueue.main.async {
                     self.textView.string = err
                 }

EvalApp/AppDelegate.swift

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

EvalApp/Assets.xcassets/Contents.json

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
+</dict>
 </plist>

EvalApp/EvalApp.entitlements

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIconFile</key>
-	<string></string>
+	<string>App.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>

EvalApp/Info.plist

@@ -7,9 +7,12 @@
 //
 
 #import "SimpleSocket.h"
+#import "/tmp/InjectionSalt.h"
 
 #define INJECTION_ADDRESS @":8898"
 #define INJECTION_KEY @"bvijkijyhbtrbrebzjbbzcfbbvvq"
+#define FRAMEWORK_DELIMITER @","
+#define CALLORDER_DELIMITER @"---"
 
 @interface InjectionClient : SimpleSocket
 
@@ -30,6 +33,20 @@ typedef NS_ENUM(int, InjectionCommand) {
 
     InjectionTrace,
     InjectionUntrace,
+    InjectionTraceUI,
+    InjectionTraceUIKit,
+    InjectionTraceSwiftUI,
+    InjectionTraceFramework,
+    InjectionQuietInclude,
+    InjectionInclude,
+    InjectionExclude,
+    InjectionStats,
+    InjectionCallOrder,
+    InjectionFileOrder,
+    InjectionFileReorder,
+    InjectionUninterpose,
+
+    InjectionInvalid = 1000,
 
     InjectionEOF = ~0
 };
@@ -40,6 +57,8 @@ typedef NS_ENUM(int, InjectionResponse) {
     InjectionPause,
     InjectionSign,
     InjectionError,
+    InjectionFrameworkList,
+    InjectionCallOrderList,
 
     InjectionExit = ~0
 };