diff --git a/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCApiClient/Interface/PEPMacOSAdapterProtocol.h b/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCApiClient/Interface/PEPMacOSAdapterProtocol.h new file mode 100644 index 0000000..2795dbf --- /dev/null +++ b/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCApiClient/Interface/PEPMacOSAdapterProtocol.h @@ -0,0 +1,20 @@ +// +// PEPMacOSAdapterProtocol.h +// PEPObjCAdapterXPCService +// +// Created by David Alarcon on 16/6/21. +// + +#import + +#import "PEPSessionProtocol.h" +#import "PEPObjCAdapterConfigurationProtocol.h" + +NS_ASSUME_NONNULL_BEGIN + +/// Interface that contains both the session protocol and the configuration protocol from PEPObjCAdapter. +@protocol PEPMacOSAdapterProtocol + +@end + +NS_ASSUME_NONNULL_END diff --git a/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCApiClient/Interface/PEPObjCAdapterXPCApiClientService.h b/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCApiClient/Interface/PEPObjCAdapterXPCApiClientService.h index 825ad5d..c5cdd85 100644 --- a/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCApiClient/Interface/PEPObjCAdapterXPCApiClientService.h +++ b/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCApiClient/Interface/PEPObjCAdapterXPCApiClientService.h @@ -7,13 +7,13 @@ #import -#import "PEPSessionProtocol.h" +#import "PEPMacOSAdapterProtocol.h" @class PEPIdentity; NS_ASSUME_NONNULL_BEGIN -@interface PEPObjCAdapterXPCApiClientService : NSObject +@interface PEPObjCAdapterXPCApiClientService : NSObject + (instancetype)shared; - (void)start; diff --git a/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCService.xcodeproj/project.pbxproj b/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCService.xcodeproj/project.pbxproj index 6c6fda4..21dfc9a 100644 --- a/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCService.xcodeproj/project.pbxproj +++ b/Subprojects/PEPObjCAdapterXPCService/PEPObjCAdapterXPCService.xcodeproj/project.pbxproj @@ -7,12 +7,14 @@ objects = { /* Begin PBXBuildFile section */ + 4E57581326821B0A0084F02D /* libPEPObjCAdapterProtocols_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E23E6FC2681D15800B8F4C2 /* libPEPObjCAdapterProtocols_macOS.a */; }; + 4E5758E326836BFE0084F02D /* libPEPObjCAdapterTypes_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E9F570D25D3FCB2005BD46F /* libPEPObjCAdapterTypes_macOS.a */; }; + 4E9096DE267A4300002AA98A /* PEPMacOSAdapterProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E9096DC267A4300002AA98A /* PEPMacOSAdapterProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4E9F566E25D3F67C005BD46F /* PEPObjCAdapterXpcApiProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ED6F62225D2D5B1008BCE79 /* PEPObjCAdapterXpcApiProtocol.h */; }; 4E9F567625D3F688005BD46F /* PEPObjCAdapterXpcApiResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ED6F62125D2D5B1008BCE79 /* PEPObjCAdapterXpcApiResult.h */; }; 4E9F567E25D3F68D005BD46F /* PEPObjCAdapterXpcApiResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED6F60325D2D4A9008BCE79 /* PEPObjCAdapterXpcApiResult.m */; }; 4E9F569925D3F746005BD46F /* PEPObjCAdapterXPCApiClientService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EC2A68925AF4378000ACF79 /* PEPObjCAdapterXPCApiClientService.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4E9F56DE25D3F899005BD46F /* PEPObjCAdapterXPCApiClientService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EC2A68A25AF4378000ACF79 /* PEPObjCAdapterXPCApiClientService.m */; }; - 4E9F570E25D3FCB2005BD46F /* libPEPObjCAdapterTypes_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E9F570D25D3FCB2005BD46F /* libPEPObjCAdapterTypes_macOS.a */; }; 4E9F571025D3FCCA005BD46F /* libPEPObjCAdapter_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E9F570F25D3FCCA005BD46F /* libPEPObjCAdapter_macOS.a */; }; 4EC2A5EB25AEFCC9000ACF79 /* PEPObjCAdapterXpcApiClientTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EC2A5EA25AEFCC9000ACF79 /* PEPObjCAdapterXpcApiClientTests.m */; }; 4ED6F5DC25D2D39C008BCE79 /* PEPObjCAdapterXPCServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED6F5DB25D2D39C008BCE79 /* PEPObjCAdapterXPCServiceTests.m */; }; @@ -28,6 +30,10 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 4E23E6F82681CF9A00B8F4C2 /* libPEPObjCAdapterProtocols.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPObjCAdapterProtocols.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 4E23E6FA2681CFA500B8F4C2 /* libPEPObjCAdapterProtocols_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPObjCAdapterProtocols_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 4E23E6FC2681D15800B8F4C2 /* libPEPObjCAdapterProtocols_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPObjCAdapterProtocols_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 4E9096DC267A4300002AA98A /* PEPMacOSAdapterProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPMacOSAdapterProtocol.h; sourceTree = ""; }; 4E9F565725D3F54B005BD46F /* libPEPObjCAdapterXPCApiClient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCAdapterXPCApiClient.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4E9F570D25D3FCB2005BD46F /* libPEPObjCAdapterTypes_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPObjCAdapterTypes_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4E9F570F25D3FCCA005BD46F /* libPEPObjCAdapter_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPObjCAdapter_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -36,6 +42,7 @@ 4EC2A5EC25AEFCC9000ACF79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4EC2A68925AF4378000ACF79 /* PEPObjCAdapterXPCApiClientService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapterXPCApiClientService.h; sourceTree = ""; }; 4EC2A68A25AF4378000ACF79 /* PEPObjCAdapterXPCApiClientService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapterXPCApiClientService.m; sourceTree = ""; }; + 4ED4FA46267B609D002F759C /* libPEPObjCAdapterProtocols.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPObjCAdapterProtocols.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4ED6F5D625D2D39C008BCE79 /* PEPObjCAdapterXPCServiceTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PEPObjCAdapterXPCServiceTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 4ED6F5DB25D2D39C008BCE79 /* PEPObjCAdapterXPCServiceTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapterXPCServiceTests.m; sourceTree = ""; }; 4ED6F5DD25D2D39C008BCE79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -49,6 +56,7 @@ 4ED6F72525D2ECE5008BCE79 /* libPEPObjCAdapterXPCService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCAdapterXPCService.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4ED6F72725D2ECE5008BCE79 /* PEPObjCAdapterXPCService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapterXPCService.h; sourceTree = ""; }; 4ED6F72925D2ECE5008BCE79 /* PEPObjCAdapterXPCService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapterXPCService.m; sourceTree = ""; }; + 4EEB4CCF2680E5C900161040 /* libPEPObjCAdapterProtocols.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPObjCAdapterProtocols.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -56,7 +64,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4E9F570E25D3FCB2005BD46F /* libPEPObjCAdapterTypes_macOS.a in Frameworks */, + 4E57581326821B0A0084F02D /* libPEPObjCAdapterProtocols_macOS.a in Frameworks */, + 4E5758E326836BFE0084F02D /* libPEPObjCAdapterTypes_macOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -90,6 +99,7 @@ 4E2F30A825D2887C002AFD0C /* Interface */ = { isa = PBXGroup; children = ( + 4E9096DC267A4300002AA98A /* PEPMacOSAdapterProtocol.h */, 4EC2A68925AF4378000ACF79 /* PEPObjCAdapterXPCApiClientService.h */, ); path = Interface; @@ -115,6 +125,11 @@ 4EA9B4B525BF005A0048427E /* Frameworks */ = { isa = PBXGroup; children = ( + 4E23E6FA2681CFA500B8F4C2 /* libPEPObjCAdapterProtocols_macOS.a */, + 4E23E6FC2681D15800B8F4C2 /* libPEPObjCAdapterProtocols_macOS.a */, + 4E23E6F82681CF9A00B8F4C2 /* libPEPObjCAdapterProtocols.a */, + 4ED4FA46267B609D002F759C /* libPEPObjCAdapterProtocols.a */, + 4EEB4CCF2680E5C900161040 /* libPEPObjCAdapterProtocols.a */, 4E9F570D25D3FCB2005BD46F /* libPEPObjCAdapterTypes_macOS.a */, 4ED6F69525D2DE13008BCE79 /* libz.tbd */, 4E9F570F25D3FCCA005BD46F /* libPEPObjCAdapter_macOS.a */, @@ -209,6 +224,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 4E9096DE267A4300002AA98A /* PEPMacOSAdapterProtocol.h in Headers */, 4E9F569925D3F746005BD46F /* PEPObjCAdapterXPCApiClientService.h in Headers */, 4E9F566E25D3F67C005BD46F /* PEPObjCAdapterXpcApiProtocol.h in Headers */, 4E9F567625D3F688005BD46F /* PEPObjCAdapterXpcApiResult.h in Headers */, @@ -473,8 +489,9 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../../pEpObjCAdapter/PEPObjCAdapterTypes/PublicHeaders", + "$(PROJECT_DIR)/../../../pEpObjCAdapter/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders", "$(PROJECT_DIR)/../../../pEpObjCAdapter/pEpObjCAdapter/PublicHeaders", + "$(PROJECT_DIR)/../../../pEpObjCAdapter/Subprojects/PEPObjCAdapterProtocols/PEPObjCAdapterProtocols/PublicHeaders", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; @@ -538,8 +555,9 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../../../pEpObjCAdapter/PEPObjCAdapterTypes/PublicHeaders", + "$(PROJECT_DIR)/../../../pEpObjCAdapter/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders", "$(PROJECT_DIR)/../../../pEpObjCAdapter/pEpObjCAdapter/PublicHeaders", + "$(PROJECT_DIR)/../../../pEpObjCAdapter/Subprojects/PEPObjCAdapterProtocols/PEPObjCAdapterProtocols/PublicHeaders", ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO;