kif-framework · amorde · Jul 2, 2026 · Jul 2, 2026 · Jul 2, 2026
diff --git a/KIF.xcodeproj/project.pbxproj b/KIF.xcodeproj/project.pbxproj
diff --git a/KIF.xcodeproj/xcshareddata/xcschemes/KIF.xcscheme b/KIF.xcodeproj/xcshareddata/xcschemes/KIF.xcscheme
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
-   version = "1.3">
+   LastUpgradeVersion = "2650"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -14,10 +15,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EABD46791857A0C700A5F081"
-               BuildableName = "libKIF.a"
+               BlueprintIdentifier = "KIF"
+               BuildableName = "KIF"
                BlueprintName = "KIF"
-               ReferencedContainer = "container:KIF.xcodeproj">
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -27,24 +28,21 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EABD46791857A0C700A5F081"
-            BuildableName = "libKIF.a"
-            BlueprintName = "KIF"
-            ReferencedContainer = "container:KIF.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:KIF.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EABD46AD1857A0F300A5F081"
-               BuildableName = "KIFTests - XCTest.xctest"
+               BlueprintIdentifier = "KIFTests"
+               BuildableName = "KIFTests"
                BlueprintName = "KIFTests"
-               ReferencedContainer = "container:KIF.xcodeproj">
+               ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -59,27 +57,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EABD46791857A0C700A5F081"
-            BuildableName = "libKIF.a"
-            BlueprintName = "KIF"
-            ReferencedContainer = "container:KIF.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "KIF_PRINTVIEWTREEONFAILURE"
-            value = "YES"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "VISUALIZE_TOUCHES"
-            value = "YES"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -90,10 +67,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EABD46791857A0C700A5F081"
-            BuildableName = "libKIF.a"
+            BlueprintIdentifier = "KIF"
+            BuildableName = "KIF"
             BlueprintName = "KIF"
-            ReferencedContainer = "container:KIF.xcodeproj">
+            ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...data/xcschemes/KIF Documentation.xcscheme → .../xcshareddata/xcschemes/KIFTests.xcscheme b/...data/xcschemes/KIF Documentation.xcscheme → .../xcshareddata/xcschemes/KIFTests.xcscheme
@@ -1,33 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
-   version = "1.3">
+   LastUpgradeVersion = "2650"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A88930091685088F00FC7C63"
-               BuildableName = "KIF Documentation"
-               BlueprintName = "KIF Documentation"
-               ReferencedContainer = "container:KIF.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EABD46AD1857A0F300A5F081"
+               BuildableName = "KIFTests - XCTest.xctest"
+               BlueprintName = "KIFTests"
+               ReferencedContainer = "container:KIF.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -39,23 +35,34 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
+      allowLocationSimulation = "YES"
+      queueDebuggingEnableBacktraceRecording = "Yes">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A88930091685088F00FC7C63"
-            BuildableName = "KIF Documentation"
-            BlueprintName = "KIF Documentation"
+            BlueprintIdentifier = "EB60ECC0177F8C83005A041A"
+            BuildableName = "TestHost.app"
+            BlueprintName = "TestHost"
             ReferencedContainer = "container:KIF.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EB60ECC0177F8C83005A041A"
+            BuildableName = "TestHost.app"
+            BlueprintName = "TestHost"
+            ReferencedContainer = "container:KIF.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/KIF.xctestplan b/KIF.xctestplan
@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "28683086-9317-4D0B-9456-520884DD03F4",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "performanceAntipatternCheckerEnabled" : true
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:KIF.xcodeproj",
+        "identifier" : "EABD46AD1857A0F300A5F081",
+        "name" : "KIFTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
     targets: [
         .target(
             name: "KIF",
-            dependencies: [],
+            dependencies: ["KIFSwift"],
             publicHeadersPath: "include",
             cSettings: [
                 .headerSearchPath("ApplePrivateAPIs/"),
@@ -28,6 +28,10 @@ let package = Package(
             ],
             linkerSettings: [.linkedFramework("IOKit"), .linkedFramework("XCTest")]
         ),
+        .target(
+            name: "KIFSwift",
+            dependencies: [],
+        ),
         .testTarget(
             name: "KIFTests",
             dependencies: ["KIF"],

diff --git a/Sources/KIF/Additions/UIView-Debugging.m b/Sources/KIF/Additions/UIView-Debugging.m
@@ -9,6 +9,7 @@
 #import "KIFEventVisualizer.h"
 #import "KIFTouchVisualizerView.h"
 #import <Foundation/Foundation.h>
+@import KIFSwift;
 
 @implementation UIView (Debugging)
 
@@ -94,7 +95,7 @@ - (void)_KIF_appendIndentation:(int)indent result:(NSMutableString *)result{
 }
 
 - (void)_KIF_appendClassName:(NSMutableString *)result {
-    [result appendString:NSStringFromClass([self class])];
+    [result appendString:[NSObject _kif_typeNameOfObject:self qualified:YES]];
 }
 
 - (void)_KIF_appendAccessibilityInfo:(NSMutableString *)result {

diff --git a/Sources/KIFSwift/NSObject+KIF.swift b/Sources/KIFSwift/NSObject+KIF.swift
@@ -0,0 +1,15 @@
+import Foundation
+
+extension NSObject {
+    /// Return a demangled type name for a given object.
+    /// If `qualified` is `true`, Swift types will produce a qualified type name
+    @objc(_kif_typeNameOfObject:qualified:)
+    public static func _kif_typeName(object: Any, qualified: Bool) -> String {
+        let meta = type(of: object)
+        if qualified {
+            return String(reflecting: meta)    
+        } else {
+            return String(describing: meta)
+        }
+    }
+}
diff --git a/Tests/KIFTests/AccessibilityIdentifierPullToRefreshTests.m b/Tests/KIFTests/AccessibilityIdentifierPullToRefreshTests.m
@@ -6,11 +6,7 @@
 //
 //
 
-#import <KIF/KIFTestCase.h>
-#import <KIF/KIFUITestActor-IdentifierTests.h>
-#import <KIF/KIFUIViewTestActor.h>
-
-#import <KIF/KIFTestStepValidation.h>
+@import KIF;
 
 @interface AccessibilityIdentifierPullToRefreshTests : KIFTestCase
 @end

diff --git a/Tests/KIFTests/AccessibilityIdentifierTests.m b/Tests/KIFTests/AccessibilityIdentifierTests.m
@@ -6,9 +6,7 @@
 //
 //
 
-#import <KIF/KIFTestCase.h>
-#import <KIF/KIFUITestActor-IdentifierTests.h>
-#import <KIF/KIFTestStepValidation.h>
+@import KIF;
 
 @interface AccessibilityIdentifierTests : KIFTestCase
 @end

diff --git a/Tests/KIFTests/Additions/UIScreen+KIFAdditionsTests.m b/Tests/KIFTests/Additions/UIScreen+KIFAdditionsTests.m
@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import "UIScreen+KIFAdditions.h"
+@import KIF;
 
 @interface CustomBoundsUIScreen : UIScreen
 

diff --git a/Tests/KIFTests/AutocorrectTests.m b/Tests/KIFTests/AutocorrectTests.m
@@ -5,9 +5,8 @@
 //  Created by Harley Cooper on 2/7/18.
 //
 
-#import <KIF/KIF.h>
+@import KIF;
 
-#import "KIFTextInputTraitsOverrides.h"
 
 @interface AutocorrectTests : KIFTestCase
 @end

diff --git a/Tests/KIFTests/BackgroundTests.m b/Tests/KIFTests/BackgroundTests.m
@@ -6,7 +6,7 @@
 //
 //
 
-#import <KIF/KIF.h>
+@import KIF;
 
 @interface BackgroundTests : KIFTestCase
 

diff --git a/Tests/KIFTests/CascadingFailureTests.m b/Tests/KIFTests/CascadingFailureTests.m
@@ -6,8 +6,7 @@
 //  Copyright (c) 2013 Brian Nickel. All rights reserved.
 //
 
-#import <KIF/KIF.h>
-#import "KIFTestStepValidation.h"
+@import KIF;
 
 @interface KIFSystemTestActor (CascadingFailureTests)
 - (void)failA;

diff --git a/Tests/KIFTests/CollectionViewTests.m b/Tests/KIFTests/CollectionViewTests.m
@@ -6,8 +6,7 @@
 //  Copyright (c) 2013 Brian Nickel. All rights reserved.
 //
 
-#import <KIF/KIF.h>
-#import "KIFTestStepValidation.h"
+@import KIF;
 
 @interface CollectionViewTests : KIFTestCase
 @end

diff --git a/Tests/KIFTests/CompositionTests.m b/Tests/KIFTests/CompositionTests.m
@@ -6,9 +6,7 @@
 //  Copyright (c) 2013 Brian Nickel. All rights reserved.
 //
 
-#import <KIF/KIF.h>
-#import "UIApplication-KIFAdditions.h"
-#import "UIAccessibilityElement-KIFAdditions.h"
+@import KIF;
 
 @interface KIFUITestActor (Composition)
 

diff --git a/Tests/KIFTests/CustomPickerTests.m b/Tests/KIFTests/CustomPickerTests.m
@@ -6,7 +6,7 @@
 //
 //
 
-#import <KIF/KIF.h>
+@import KIF;
 
 @interface CustomPickerTests : KIFTestCase
 @end

diff --git a/Tests/KIFTests/ExistTests.m b/Tests/KIFTests/ExistTests.m
@@ -6,7 +6,7 @@
 //
 //
 
-#import <KIF/KIF.h>
+@import KIF;
 
 @interface ExistTests : KIFTestCase
 @end

diff --git a/Tests/KIFTests/GestureTests.m b/Tests/KIFTests/GestureTests.m
@@ -6,10 +6,7 @@
 //  Copyright (c) 2013 Brian Nickel. All rights reserved.
 //
 
-#import <KIF/KIF.h>
-#import <KIF/KIFTestStepValidation.h>
-#import <KIF/KIFUITestActor-IdentifierTests.h>
-#import <KIF/UIView-KIFAdditions.h>
+@import KIF;
 
 #define kPanMeAccessibilityString               @"Pan Me"
 #define kVelocityValueLabelAccessibilityString  @"velocityValueLabel"

diff --git a/Tests/KIFTests/KIFUIViewTestActor/AccessibilityActivationTests_ViewTestActor.m b/Tests/KIFTests/KIFUIViewTestActor/AccessibilityActivationTests_ViewTestActor.m
@@ -5,7 +5,7 @@
 //  Created by Alex Odawa on 09/07/2024.
 //
 
-#import <KIF/KIF.h>
+@import KIF;
 #import <UIKit/UIAccessibility.h>
 
 @interface AccessibilityActivateTests_ViewTestActor : KIFTestCase
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     //
     //
-    #import <KIF/KIF.h>
+    @import KIF;
     @interface BackgroundTests : KIFTestCase
@@ Expand Down @@