Update eXtenderZ

Author: Frizlab

Package.resolved

@@ -44,7 +44,7 @@ let package = Package(
 		res.append(.package(url: "https://github.com/apple/swift-system.git",                  from: "1.0.0"))
 #endif
 		if useXtenderZ {
-			res.append(.package(url: "https://github.com/xcode-actions/eXtenderZ.git",          from: "1.0.7"))
+			res.append(.package(url: "https://github.com/Frizlab/eXtenderZ.git",                from: "2.0.0"))
 		}
 		return res
 	}(),

Package.swift

@@ -10,14 +10,14 @@ NS_ASSUME_NONNULL_BEGIN
  *    <https://news.ycombinator.com/item?id=13437182>. */
 typedef void SPITaskTerminationSignature(NSTask * _Nonnull);
 
-@protocol SPITaskExtender <HPNExtender>
+@protocol SPITaskExtender <XTZExtender>
 
 @property(readonly) SPITaskTerminationSignature ^additionalCompletionHandler;
 
 @end
 
 
-@interface SPITaskHelptender : NSTask <HPNHelptender>
+@interface SPITaskHelptender : NSTask <XTZHelptender>
 
 @end
 

Sources/CNSTaskHelptender/NSTaskHelptender.h

@@ -10,18 +10,18 @@ @implementation SPITaskHelptender
 
 + (void)load
 {
-#ifdef HPN_eXtenderZ_STATIC
-	[HPNCategoriesLoader loadCategories];
+#ifdef eXtenderZ_STATIC
+	[XTZCategoriesLoader loadCategories];
 #endif
-	[self hpn_registerClass:self asHelptenderForProtocol:@protocol(SPITaskExtender)];
+	[self xtz_registerClass:self asHelptenderForProtocol:@protocol(SPITaskExtender)];
 }
 
-+ (void)hpn_helptenderHasBeenAdded:(SPITaskHelptender *)helptender
++ (void)xtz_helptenderHasBeenAdded:(SPITaskHelptender *)helptender
 {
 	[helptender overrideTerminationHandler];
 }
 
-+ (void)hpn_helptenderWillBeRemoved:(SPITaskHelptender *)helptender
++ (void)xtz_helptenderWillBeRemoved:(SPITaskHelptender *)helptender
 {
 	[helptender resetTerminationHandler];
 }
@@ -45,27 +45,27 @@ - (void)overrideTerminationHandler
 {
 	/* For the fun, below is the declaration without the
 	 * SPITaskTerminationSignature typealias:
-	 *    void (^currentTerminationHandler)(NSTask *) = ((void (^(*)(id, SEL))(NSTask *))HPN_HELPTENDER_CALL_SUPER_NO_ARGS_WITH_SEL_NAME(SPITaskHelptender, terminationHandler));
+	 *    void (^currentTerminationHandler)(NSTask *) = ((void (^(*)(id, SEL))(NSTask *))XTZ_HELPTENDER_CALL_SUPER_NO_ARGS_WITH_SEL_NAME(SPITaskHelptender, terminationHandler));
 	 */
-	SPITaskTerminationSignature ^currentTerminationHandler = ((SPITaskTerminationSignature ^(*)(id, SEL))HPN_HELPTENDER_CALL_SUPER_NO_ARGS_WITH_SEL_NAME(SPITaskHelptender, terminationHandler));
+	SPITaskTerminationSignature ^currentTerminationHandler = ((SPITaskTerminationSignature ^(*)(id, SEL))XTZ_HELPTENDER_CALL_SUPER_NO_ARGS_WITH_SEL_NAME(SPITaskHelptender, terminationHandler));
 	[self setPublicTerminationHandler:currentTerminationHandler];
 
 	SPITaskTerminationSignature ^newTerminationHandler = ^(NSTask *task) {
 		/* The assert below is valid, but it retains self, which we do not want. */
 //		NSCAssert(task == self, @"Weird, got a task in handler which is not self.");
-		for (id<SPITaskExtender> extender in [task hpn_extendersConformingToProtocol:@protocol(SPITaskExtender)]) {
+		for (id<SPITaskExtender> extender in [task xtz_extendersConformingToProtocol:@protocol(SPITaskExtender)]) {
 			SPITaskTerminationSignature ^additionalTerminationHandler = [extender additionalCompletionHandler];
 			if (additionalTerminationHandler != NULL) additionalTerminationHandler(task);
 		}
 		SPITaskTerminationSignature ^terminationHandler = [(SPITaskHelptender *)task publicTerminationHandler];
 		if (terminationHandler != NULL) terminationHandler(task);
 	};
-	((void (*)(id, SEL, SPITaskTerminationSignature ^))HPN_HELPTENDER_CALL_SUPER_WITH_SEL_NAME(SPITaskHelptender, setTerminationHandler:, newTerminationHandler));
+	((void (*)(id, SEL, SPITaskTerminationSignature ^))XTZ_HELPTENDER_CALL_SUPER_WITH_SEL_NAME(SPITaskHelptender, setTerminationHandler:, newTerminationHandler));
 }
 
 - (void)resetTerminationHandler
 {
-	((void (*)(id, SEL, SPITaskTerminationSignature ^))HPN_HELPTENDER_CALL_SUPER_WITH_SEL_NAME(SPITaskHelptender, setTerminationHandler:, self.publicTerminationHandler));
+	((void (*)(id, SEL, SPITaskTerminationSignature ^))XTZ_HELPTENDER_CALL_SUPER_WITH_SEL_NAME(SPITaskHelptender, setTerminationHandler:, self.publicTerminationHandler));
 	[self setPublicTerminationHandler:nil];
 }
 

Sources/CNSTaskHelptender/NSTaskHelptender.m

@@ -674,7 +674,7 @@ public struct ProcessInvocation : AsyncSequence {
 			g.leave()
 		}
 #if canImport(eXtenderZ)
-		HPNCheckedAddExtender(p, XcodeToolsProcessExtender(additionalTerminationHandler))
+		XTZCheckedAddExtender(p, XcodeToolsProcessExtender(additionalTerminationHandler))
 #else
 		p.privateTerminationHandler = additionalTerminationHandler
 #endif