Decorate arguments of type "Any" in traces.

Author: johnno1962

InjectionBundle/SwiftEval.swift

@@ -5,7 +5,7 @@
 //  Created by John Holdsworth on 02/11/2017.
 //  Copyright © 2017 John Holdsworth. All rights reserved.
 //
-//  $Id: //depot/ResidentEval/InjectionBundle/SwiftEval.swift#160 $
+//  $Id: //depot/ResidentEval/InjectionBundle/SwiftEval.swift#162 $
 //
 //  Basic implementation of a Swift "eval()" including the
 //  mechanics of recompiling a class and loading the new
@@ -545,7 +545,7 @@ public class SwiftEval: NSObject {
 //        print(regexp)
 
         // messy but fast
-        guard shell(command: """
+        let logScanCommand = """
             # search through build logs, most recent first
             cd "\(logsDir.path.escaping("$"))"
             for log in `ls -t *.xcactivitylog`; do
@@ -609,11 +609,18 @@ public class SwiftEval: NSObject {
                 ) "$log" >"\(tmpfile).sh" && exit 0
             done
             exit 1;
-            """) else {
+            """
+
+        guard shell(command: logScanCommand) else {
             return nil
         }
 
-        var compileCommand = try! String(contentsOfFile: "\(tmpfile).sh")
+        var compileCommand: String
+        do {
+            compileCommand = try String(contentsOfFile: "\(tmpfile).sh")
+        } catch {
+            throw evalError("Error reading \(tmpfile).sh, scanCommand: \(logScanCommand)")
+        }
         compileCommand = compileCommand.components(separatedBy: " -o ")[0] + " "
 
         // remove excess escaping in new build system
@@ -779,7 +786,7 @@ public class SwiftEval: NSObject {
     }
 
     #if !os(macOS)
-    let runner = ScriptRunner()
+    lazy var runner = ScriptRunner()
 
     class ScriptRunner {
         let commandsOut: UnsafeMutablePointer<FILE>

InjectionIII.xcodeproj/project.pbxproj

@@ -1407,7 +1407,7 @@
 				INFOPLIST_FILE = InjectionIII/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnholdsworth.InjectionIII;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1430,7 +1430,7 @@
 				INFOPLIST_FILE = InjectionIII/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnholdsworth.InjectionIII;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

InjectionIII/Info.plist

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

InjectionIII/build_bundles.sh

@@ -6,7 +6,7 @@
 #  Created by John Holdsworth on 04/10/2019.
 #  Copyright © 2019 John Holdsworth. All rights reserved.
 #
-#  $Id: //depot/ResidentEval/InjectionIII/build_bundles.sh#62 $
+#  $Id: //depot/ResidentEval/InjectionIII/build_bundles.sh#63 $
 #
 
 # Injection has to assume a fixed path for Xcode.app as it uses
@@ -40,7 +40,8 @@ function build_bundle () {
 #build_bundle macOS MacOSX macosx &&
 build_bundle iOS iPhoneSimulator iphonesimulator &&
 build_bundle tvOS AppleTVSimulator appletvsimulator &&
-# iphoneos on M1 mac
+
+# iphoneos on M1 mac (requires Sanbox switched off)
 #build_bundle maciOS iPhoneOS iphoneos &&
 
 # macOSSwiftUISupport needs to be built separately from the main app

SwiftTrace

@@ -5,7 +5,7 @@
 //  Created by John Holdsworth on 25/09/2020.
 //  Copyright © 2020 John Holdsworth. All rights reserved.
 //
-//  $Id: //depot/ResidentEval/SwiftUISupport/SwiftUISupport.swift#24 $
+//  $Id: //depot/ResidentEval/SwiftUISupport/SwiftUISupport.swift#25 $
 //
 
 import SwiftUI
@@ -41,6 +41,7 @@ class SwiftUISupport: NSObject {
             SwiftMeta.bindGeneric(name: "getBindingType", owner: Self.self)
         SwiftMeta.wrapperHandlers["SwiftUI.State<"] =
             SwiftMeta.bindGeneric(name: "getStateType", owner: Self.self)
+        SwiftTrace.makeTraceable(types: [SwiftUI.Text.self])
         print("💉 Installed SwiftUI type handlers")
     }
 }