prepare for fixing WireTesting

wireapp · Nov 20, 2024 · 039d8f0 · 039d8f0
1 parent d4711e2
commit 039d8f0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/wire-ios-testing/Source/Public/WireLegacyBridging.swift b/wire-ios-testing/Source/Public/WireLegacyBridging.swift
@@ -16,14 +16,14 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-import Foundation
+//import Foundation
 import WireSystem
 
 //@objc(ZMLogger)
 //final class WireLoggerObjC: WireSystem.WireLoggerObjC {}
 
-@objc(ZMSGroupQueue)
-protocol GroupQueue: WireSystem.GroupQueue {}
-
-@objc(ZMSDispatchGroup)
-final class ZMSDispatchGroup: WireSystem.ZMSDispatchGroup, @unchecked Sendable {}
+//@objc(ZMSGroupQueue)
+//protocol GroupQueue: WireSystem.GroupQueue {}
+//
+//@objc(ZMSDispatchGroup)
+//final class ZMSDispatchGroup: WireSystem.ZMSDispatchGroup, @unchecked Sendable {}
diff --git a/wire-ios-testing/Source/Public/ZMTBaseTest.h b/wire-ios-testing/Source/Public/ZMTBaseTest.h
@@ -16,10 +16,12 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-#import <WireLegacy/ZMSDefines.h>
 #import <WireTesting/ZMTFailureRecorder.h>
 #import <XCTest/XCTest.h>
 
+@import WireSystem;
+@import WireLegacy;
+
 extern void PrintTimeoutWarning(XCTestCase *_Nonnull test, NSTimeInterval const maxTimeout, NSTimeInterval const actualTimeout);
 
 typedef BOOL(^VerificationBlock)(void);

diff --git a/wire-ios-testing/WireTesting.xcodeproj/project.pbxproj b/wire-ios-testing/WireTesting.xcodeproj/project.pbxproj
@@ -45,8 +45,8 @@
 		595D4B1B2C09FA5800AF6269 /* XCTestCase+waitForPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 595D4B1A2C09FA5800AF6269 /* XCTestCase+waitForPredicate.swift */; };
 		595D4B202C0A1A0500AF6269 /* XCTestExpectation+inverted.swift in Sources */ = {isa = PBXBuildFile; fileRef = 595D4B1F2C0A1A0500AF6269 /* XCTestExpectation+inverted.swift */; };
 		59883D002CEE2C6A00E79137 /* WireLegacyBridging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59883CFF2CEE2C6A00E79137 /* WireLegacyBridging.swift */; };
-		59883D022CEE2CAC00E79137 /* WireSystem in Frameworks */ = {isa = PBXBuildFile; productRef = 59883D012CEE2CAC00E79137 /* WireSystem */; };
 		5994B7EA2CEE4D37000F3378 /* WireLegacy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5994B7E92CEE4D37000F3378 /* WireLegacy.framework */; };
+		5994B8342CEE525C000F3378 /* WireSystem in Frameworks */ = {isa = PBXBuildFile; productRef = 5994B8332CEE525C000F3378 /* WireSystem */; };
 		634CCB112BAC54FF00A11AB3 /* GenericArrayActor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 634CCB102BAC54FF00A11AB3 /* GenericArrayActor.swift */; };
 		87B0EF5C2139687500CE1931 /* ManagedObjectContextChangesMerger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B0EF5B2139687500CE1931 /* ManagedObjectContextChangesMerger.swift */; };
 		CE6B7B301C11ED5F00FC4C2E /* ZMMockEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6B7B2C1C11ED5F00FC4C2E /* ZMMockEntity.m */; };
@@ -138,7 +138,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				59883D022CEE2CAC00E79137 /* WireSystem in Frameworks */,
+				5994B8342CEE525C000F3378 /* WireSystem in Frameworks */,
 				591B6E842C8B0A2B009F8A7B /* OCMock.xcframework in Frameworks */,
 				5994B7EA2CEE4D37000F3378 /* WireLegacy.framework in Frameworks */,
 			);
@@ -598,7 +598,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		59883D012CEE2CAC00E79137 /* WireSystem */ = {
+		5994B8332CEE525C000F3378 /* WireSystem */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = WireSystem;
 		};