Hook individual objects

.github/workflows/swiftlint_analyze.yml

@@ -8,15 +8,15 @@ on:
       - 'InterposeKit.xcodeproj/**'
       - 'Sources/**/*.[ch]'
       - 'Sources/**/*.swift'
-      - 'Tests/**/*.swift'
+      - '!Tests/**/*.swift'
       - '!Tests/LinuxMain.swift'
   pull_request:
     paths:
       - '.github/workflows/swiftlint_analyze.yml'
       - 'InterposeKit.xcodeproj/**'
       - 'Sources/**/*.[ch]'
       - 'Sources/**/*.swift'
-      - 'Tests/**/*.swift'
+      - '!Tests/**/*.swift'
       - '!Tests/LinuxMain.swift'
 
 jobs:

.swiftlint.yml

@@ -2,8 +2,6 @@ included:
   - Sources
   - Tests
 analyzer_rules:
-  - unused_import
-  - unused_declaration
 line_length: 120
 identifier_name:
   excluded:

Example/InterposeExample.xcodeproj/project.pbxproj

@@ -7,17 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		781095BF248D8AD7008A943C /* InterposeExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 781095BD248D8AD7008A943C /* InterposeExampleTests.swift */; };
 		7880B124248280B300AD2251 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7880B123248280B300AD2251 /* AppDelegate.swift */; };
 		7880B126248280B300AD2251 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7880B125248280B300AD2251 /* SceneDelegate.swift */; };
 		7880B128248280B300AD2251 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7880B127248280B300AD2251 /* ViewController.swift */; };
 		7880B12B248280B300AD2251 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7880B129248280B300AD2251 /* Main.storyboard */; };
 		7880B12D248280B500AD2251 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7880B12C248280B500AD2251 /* Assets.xcassets */; };
 		7880B130248280B500AD2251 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7880B12E248280B500AD2251 /* LaunchScreen.storyboard */; };
 		78C39DDC2483363300B46395 /* InterposeKit in Frameworks */ = {isa = PBXBuildFile; productRef = 78C39DDB2483363300B46395 /* InterposeKit */; };
-		78C39DE22483366B00B46395 /* Defaults-Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 78C39DDE2483366B00B46395 /* Defaults-Release.xcconfig */; };
-		78C39DE32483366B00B46395 /* Defaults-Testing.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 78C39DDF2483366B00B46395 /* Defaults-Testing.xcconfig */; };
-		78C39DE42483366B00B46395 /* Defaults.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 78C39DE02483366B00B46395 /* Defaults.xcconfig */; };
-		78C39DE52483366B00B46395 /* Defaults-Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 78C39DE12483366B00B46395 /* Defaults-Debug.xcconfig */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -31,6 +28,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		781095BD248D8AD7008A943C /* InterposeExampleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InterposeExampleTests.swift; sourceTree = "<group>"; };
+		781095BE248D8AD7008A943C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7880B120248280B300AD2251 /* InterposeExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = InterposeExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7880B123248280B300AD2251 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7880B125248280B300AD2251 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -67,11 +66,21 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		781095BC248D8AD7008A943C /* InterposeExampleTests */ = {
+			isa = PBXGroup;
+			children = (
+				781095BD248D8AD7008A943C /* InterposeExampleTests.swift */,
+				781095BE248D8AD7008A943C /* Info.plist */,
+			);
+			path = InterposeExampleTests;
+			sourceTree = "<group>";
+		};
 		7880B117248280B300AD2251 = {
 			isa = PBXGroup;
 			children = (
 				78C39DD8248335B100B46395 /* Interpose */,
 				7880B122248280B300AD2251 /* InterposeExample */,
+				781095BC248D8AD7008A943C /* InterposeExampleTests */,
 				7880B121248280B300AD2251 /* Products */,
 				7880B14E248281D000AD2251 /* Frameworks */,
 			);
@@ -170,7 +179,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1150;
-				LastUpgradeCheck = 1150;
+				LastUpgradeCheck = 1160;
 				ORGANIZATIONNAME = "PSPDFKit GmbH";
 				TargetAttributes = {
 					7880B11F248280B300AD2251 = {
@@ -210,10 +219,6 @@
 			files = (
 				7880B130248280B500AD2251 /* LaunchScreen.storyboard in Resources */,
 				7880B12D248280B500AD2251 /* Assets.xcassets in Resources */,
-				78C39DE22483366B00B46395 /* Defaults-Release.xcconfig in Resources */,
-				78C39DE52483366B00B46395 /* Defaults-Debug.xcconfig in Resources */,
-				78C39DE32483366B00B46395 /* Defaults-Testing.xcconfig in Resources */,
-				78C39DE42483366B00B46395 /* Defaults.xcconfig in Resources */,
 				7880B12B248280B300AD2251 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -242,6 +247,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				781095BF248D8AD7008A943C /* InterposeExampleTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -404,6 +410,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = InterposeExample/InterposeExample.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = Y5PE65HELJ;
 				INFOPLIST_FILE = InterposeExample/Info.plist;
@@ -423,6 +430,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = InterposeExample/InterposeExample.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = Y5PE65HELJ;
 				INFOPLIST_FILE = InterposeExample/Info.plist;
@@ -442,6 +450,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = Y5PE65HELJ;
 				INFOPLIST_FILE = InterposeExampleTests/Info.plist;
@@ -464,6 +473,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = Y5PE65HELJ;
 				INFOPLIST_FILE = InterposeExampleTests/Info.plist;

Example/InterposeExample.xcodeproj/xcshareddata/xcschemes/InterposeExample.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1160"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -39,6 +39,16 @@
                ReferencedContainer = "container:..">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7880B135248280B500AD2251"
+               BuildableName = "InterposeExampleTests.xctest"
+               BlueprintName = "InterposeExampleTests"
+               ReferencedContainer = "container:InterposeExample.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Example/InterposeExample/AppDelegate.swift

@@ -31,16 +31,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 private func fixMacCatalystInputSystemSessionRace() {
     do {
         try Interpose.whenAvailable(["RTIInput", "SystemSession"]) {
+
             let lock = DispatchQueue(label: "com.steipete.document-state-hack")
-            try $0.hook("documentState", { store in { `self` in
-                lock.sync {
-                    store((@convention(c) (AnyObject, Selector) -> AnyObject).self)(`self`, store.selector)
-                }} as @convention(block) (AnyObject) -> AnyObject})
-
-            try $0.hook("setDocumentState:", { store in { `self`, newValue in
-                lock.sync {
-                    store((@convention(c) (AnyObject, Selector, AnyObject) -> Void).self)(`self`, store.selector, newValue)
-                }} as @convention(block) (AnyObject, AnyObject) -> Void})
+
+            try $0.hook("documentState") { (store: TypedHook<@convention(c) (AnyObject, Selector) -> AnyObject, @convention(block) (AnyObject) -> AnyObject>) in { `self` in
+                lock.sync { store.original(`self`, store.selector) }
+                }
+            }
+
+            try $0.hook("setDocumentState:") { (store: TypedHook<@convention(c) (AnyObject, Selector, AnyObject) -> Void, @convention(block) (AnyObject, AnyObject) -> Void>) in { `self`, newValue in
+                lock.sync { store.original(`self`, store.selector, newValue) }
+                }
+            }
         }
     } catch {
         print("Failed to fix input system: \(error).")

Example/InterposeExampleTests/Info.plist

@@ -0,0 +1,22 @@
+<?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>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

Example/InterposeExampleTests/InterposeExampleTests.swift

@@ -0,0 +1,33 @@
+//
+//  InterposeExampleTests.swift
+//  InterposeExampleTests
+//
+//  Created by Peter Steinberger on 30.05.20.
+//
+
+import XCTest
+@testable import InterposeExample
+
+class InterposeExampleTests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+
+    func testPerformanceExample() throws {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}