Browse Source

APPLEMAIL-33 Change some build config entries to PEPUpdatesApp. Add modulename to PEPUpdatesXPCService.

APPLEMAIL-33
David Alarcon 2 years ago
parent
commit
2c5b42cb0b
5 changed files with 54 additions and 34 deletions
  1. +23
    -10
      Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService.xcodeproj/project.pbxproj
  2. +11
    -4
      Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPUpdatesXPCService.h
  3. +0
    -12
      Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPUpdatesXPCService.m
  4. +20
    -8
      Submodules/pEpNotifications/PEPUpdatesApp.xcodeproj/project.pbxproj
  5. +0
    -0
      Submodules/pEpNotifications/PEPUpdatesApp/PEPUpdatesApp.entitlements

+ 23
- 10
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService.xcodeproj/project.pbxproj View File

@ -12,12 +12,10 @@
4E61823A25D59701007E040F /* PEPNotificationApiClientService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E61823825D59701007E040F /* PEPNotificationApiClientService.h */; settings = {ATTRIBUTES = (Public, ); }; };
4E61823B25D59701007E040F /* PEPNotificationApiClientService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E61823925D59701007E040F /* PEPNotificationApiClientService.m */; };
4E61824D25D5A4C5007E040F /* PEPNotificationXPCServiceDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E61824C25D5A4C5007E040F /* PEPNotificationXPCServiceDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
4E797B9725D523FD0090F900 /* PEPUpdatesXPCService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E797B9625D523FD0090F900 /* PEPUpdatesXPCService.h */; };
4E797B9925D523FD0090F900 /* PEPUpdatesXPCService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E797B9825D523FD0090F900 /* PEPUpdatesXPCService.m */; };
4E797BB825D5255F0090F900 /* PEPNotificationXPCApiProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E797BAA25D5255F0090F900 /* PEPNotificationXPCApiProtocol.h */; };
4E797BB825D5255F0090F900 /* PEPNotificationXPCApiProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E797BAA25D5255F0090F900 /* PEPNotificationXPCApiProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
4E797BB925D5255F0090F900 /* PEPNotificationXPCService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E797BAC25D5255F0090F900 /* PEPNotificationXPCService.m */; };
4E797BBA25D5255F0090F900 /* PEPNotificationXPCService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E797BAD25D5255F0090F900 /* PEPNotificationXPCService.h */; settings = {ATTRIBUTES = (Public, ); }; };
4E797BBB25D5255F0090F900 /* PEPUpdateDownloadXPCApiProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E797BB025D5255F0090F900 /* PEPUpdateDownloadXPCApiProtocol.h */; };
4E797BBB25D5255F0090F900 /* PEPUpdateDownloadXPCApiProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E797BB025D5255F0090F900 /* PEPUpdateDownloadXPCApiProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
4E797BBC25D5255F0090F900 /* PEPUpdateDownloader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E797BB125D5255F0090F900 /* PEPUpdateDownloader.mm */; };
4E797BBD25D5255F0090F900 /* PEPUpdateDownloadXPCApi.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E797BB325D5255F0090F900 /* PEPUpdateDownloadXPCApi.h */; };
4E797BBE25D5255F0090F900 /* PEPUpdateDownloadXPCService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E797BB425D5255F0090F900 /* PEPUpdateDownloadXPCService.m */; };
@ -27,8 +25,24 @@
4E797D8C25D543520090F900 /* libdownloadclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E797D2225D53CCC0090F900 /* libdownloadclient.a */; };
4EA193EA25D6829B00F5D802 /* PEPNotificationXPCApi.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EA193E825D6829B00F5D802 /* PEPNotificationXPCApi.h */; };
4EA193EB25D6829B00F5D802 /* PEPNotificationXPCApi.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EA193E925D6829B00F5D802 /* PEPNotificationXPCApi.m */; };
4EFEDAD425D6C54F00EF9E09 /* PEPUpdatesXPCService.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4EFEDAD125D6C4A300EF9E09 /* PEPUpdatesXPCService.h */; };
4EFEDAD625D6C55100EF9E09 /* module.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4EFEDAB425D6C2C000EF9E09 /* module.modulemap */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
4EFEDAD325D6C53D00EF9E09 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "include/$(PRODUCT_NAME)";
dstSubfolderSpec = 16;
files = (
4EFEDAD425D6C54F00EF9E09 /* PEPUpdatesXPCService.h in CopyFiles */,
4EFEDAD625D6C55100EF9E09 /* module.modulemap in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
4E61821325D58162007E040F /* PEPUpdateDownloadApiClientService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPUpdateDownloadApiClientService.h; sourceTree = "<group>"; };
4E61821425D58162007E040F /* PEPUpdateDownloadApiClientService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPUpdateDownloadApiClientService.m; sourceTree = "<group>"; };
@ -36,8 +50,6 @@
4E61823925D59701007E040F /* PEPNotificationApiClientService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPNotificationApiClientService.m; sourceTree = "<group>"; };
4E61824C25D5A4C5007E040F /* PEPNotificationXPCServiceDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPNotificationXPCServiceDelegate.h; sourceTree = "<group>"; };
4E797B9325D523FD0090F900 /* libPEPUpdatesXPCService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPUpdatesXPCService.a; sourceTree = BUILT_PRODUCTS_DIR; };
4E797B9625D523FD0090F900 /* PEPUpdatesXPCService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPUpdatesXPCService.h; sourceTree = "<group>"; };
4E797B9825D523FD0090F900 /* PEPUpdatesXPCService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPUpdatesXPCService.m; sourceTree = "<group>"; };
4E797BAA25D5255F0090F900 /* PEPNotificationXPCApiProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPNotificationXPCApiProtocol.h; sourceTree = "<group>"; };
4E797BAC25D5255F0090F900 /* PEPNotificationXPCService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPNotificationXPCService.m; sourceTree = "<group>"; };
4E797BAD25D5255F0090F900 /* PEPNotificationXPCService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPNotificationXPCService.h; sourceTree = "<group>"; };
@ -52,6 +64,8 @@
4E797D2225D53CCC0090F900 /* libdownloadclient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdownloadclient.a; sourceTree = BUILT_PRODUCTS_DIR; };
4EA193E825D6829B00F5D802 /* PEPNotificationXPCApi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPNotificationXPCApi.h; sourceTree = "<group>"; };
4EA193E925D6829B00F5D802 /* PEPNotificationXPCApi.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPNotificationXPCApi.m; sourceTree = "<group>"; };
4EFEDAB425D6C2C000EF9E09 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
4EFEDAD125D6C4A300EF9E09 /* PEPUpdatesXPCService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPUpdatesXPCService.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -193,8 +207,8 @@
4E61824525D59EC9007E040F /* Shared */,
4E797BAE25D5255F0090F900 /* PEPUpdateDownloadXPCService */,
4E797BA825D5255F0090F900 /* PEPNotificationXPCService */,
4E797B9625D523FD0090F900 /* PEPUpdatesXPCService.h */,
4E797B9825D523FD0090F900 /* PEPUpdatesXPCService.m */,
4EFEDAD125D6C4A300EF9E09 /* PEPUpdatesXPCService.h */,
4EFEDAB425D6C2C000EF9E09 /* module.modulemap */,
);
path = PEPUpdatesXPCService;
sourceTree = "<group>";
@ -278,7 +292,6 @@
4E61824D25D5A4C5007E040F /* PEPNotificationXPCServiceDelegate.h in Headers */,
4EA193EA25D6829B00F5D802 /* PEPNotificationXPCApi.h in Headers */,
4E797BBB25D5255F0090F900 /* PEPUpdateDownloadXPCApiProtocol.h in Headers */,
4E797B9725D523FD0090F900 /* PEPUpdatesXPCService.h in Headers */,
4E61823A25D59701007E040F /* PEPNotificationApiClientService.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -293,6 +306,7 @@
4E797B8F25D523FD0090F900 /* Headers */,
4E797B9025D523FD0090F900 /* Sources */,
4E797B9125D523FD0090F900 /* Frameworks */,
4EFEDAD325D6C53D00EF9E09 /* CopyFiles */,
);
buildRules = (
);
@ -346,7 +360,6 @@
4EA193EB25D6829B00F5D802 /* PEPNotificationXPCApi.m in Sources */,
4E61821625D58162007E040F /* PEPUpdateDownloadApiClientService.m in Sources */,
4E797BBF25D5255F0090F900 /* PEPUpdateDownloadXPCApi.m in Sources */,
4E797B9925D523FD0090F900 /* PEPUpdatesXPCService.m in Sources */,
4E797BBC25D5255F0090F900 /* PEPUpdateDownloader.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;


+ 11
- 4
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPUpdatesXPCService.h View File

@ -2,11 +2,18 @@
// PEPUpdatesXPCService.h
// PEPUpdatesXPCService
//
// Created by David Alarcon on 11/2/21.
// Created by David Alarcon on 12/2/21.
//
#import <Foundation/Foundation.h>
#ifndef PEPUpdatesXPCService_h
#define PEPUpdatesXPCService_h
@interface PEPUpdatesXPCService : NSObject
#import "PEPUpdateDownloadXPCApiProtocol.h"
#import "PEPUpdateDownloadApiClientService.h"
#import "PEPUpdateDownloadXPCService.h"
#import "PEPNotificationXPCApiProtocol.h"
#import "PEPNotificationApiClientService.h"
#import "PEPNotificationXPCServiceDelegate.h"
#import "PEPNotificationXPCService.h"
@end
#endif /* PEPUpdatesXPCService_h */

+ 0
- 12
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPUpdatesXPCService.m View File

@ -1,12 +0,0 @@
//
// PEPUpdatesXPCService.m
// PEPUpdatesXPCService
//
// Created by David Alarcon on 11/2/21.
//
#import "PEPUpdatesXPCService.h"
@implementation PEPUpdatesXPCService
@end

+ 20
- 8
Submodules/pEpNotifications/PEPUpdatesApp.xcodeproj/project.pbxproj View File

@ -15,6 +15,7 @@
4E0FD9EB25715E1500A9DD77 /* DownloadNotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E0FD9EA25715E1500A9DD77 /* DownloadNotificationManager.swift */; };
4E1107AF256FE89900EB1711 /* DownloadStateNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E1107AD256FCF2900EB1711 /* DownloadStateNotifier.swift */; };
4E1107B5256FFEC000EB1711 /* PEPNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E1107B4256FFEC000EB1711 /* PEPNotification.swift */; };
4EFEDAAD25D6BEFB00EF9E09 /* libPEPUpdatesXPCService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EFEDAAC25D6BEFB00EF9E09 /* libPEPUpdatesXPCService.a */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@ -23,7 +24,7 @@
3527B2B524802F87007A6276 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
3527B2B824802F87007A6276 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
3527B2BD24802F87007A6276 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3527B2BE24802F87007A6276 /* pEpNotifications.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = pEpNotifications.entitlements; sourceTree = "<group>"; };
3527B2BE24802F87007A6276 /* PEPUpdatesApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PEPUpdatesApp.entitlements; sourceTree = "<group>"; };
3527B2C724802F87007A6276 /* pEpNotificationsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = pEpNotificationsTests.swift; sourceTree = "<group>"; };
3527B2C924802F87007A6276 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3594303E2483011000DCBD65 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@ -34,6 +35,7 @@
4E1107AD256FCF2900EB1711 /* DownloadStateNotifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadStateNotifier.swift; sourceTree = "<group>"; };
4E1107B4256FFEC000EB1711 /* PEPNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PEPNotification.swift; sourceTree = "<group>"; };
4E4A391A2575452700BF0A15 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
4EFEDAAC25D6BEFB00EF9E09 /* libPEPUpdatesXPCService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPUpdatesXPCService.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -41,6 +43,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4EFEDAAD25D6BEFB00EF9E09 /* libPEPUpdatesXPCService.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -53,6 +56,7 @@
3527B2B024802F84007A6276 /* PEPUpdatesApp */,
3527B2C624802F87007A6276 /* PEPUpdatesAppTests */,
3527B2AF24802F84007A6276 /* Products */,
4EFEDAAB25D6BEFB00EF9E09 /* Frameworks */,
);
sourceTree = "<group>";
};
@ -75,7 +79,7 @@
4E0FD9EA25715E1500A9DD77 /* DownloadNotificationManager.swift */,
3527B2B524802F87007A6276 /* Assets.xcassets */,
3527B2BD24802F87007A6276 /* Info.plist */,
3527B2BE24802F87007A6276 /* pEpNotifications.entitlements */,
3527B2BE24802F87007A6276 /* PEPUpdatesApp.entitlements */,
3527B2B724802F87007A6276 /* Preview Content */,
);
path = PEPUpdatesApp;
@ -98,6 +102,14 @@
path = PEPUpdatesAppTests;
sourceTree = "<group>";
};
4EFEDAAB25D6BEFB00EF9E09 /* Frameworks */ = {
isa = PBXGroup;
children = (
4EFEDAAC25D6BEFB00EF9E09 /* libPEPUpdatesXPCService.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -353,14 +365,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = pEpNotifications/pEpNotifications.entitlements;
CODE_SIGN_ENTITLEMENTS = PEPUpdatesApp/PEPUpdatesApp.entitlements;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_ASSET_PATHS = "\"pEpNotifications/Preview Content\"";
DEVELOPMENT_ASSET_PATHS = "\"PEPUpdatesApp/Preview Content\"";
DEVELOPMENT_TEAM = NQLYU6MGPN;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = pEpNotifications/Info.plist;
INFOPLIST_FILE = PEPUpdatesApp/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
@ -377,14 +389,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = pEpNotifications/pEpNotifications.entitlements;
CODE_SIGN_ENTITLEMENTS = PEPUpdatesApp/PEPUpdatesApp.entitlements;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_ASSET_PATHS = "\"pEpNotifications/Preview Content\"";
DEVELOPMENT_ASSET_PATHS = "\"PEPUpdatesApp/Preview Content\"";
DEVELOPMENT_TEAM = NQLYU6MGPN;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = pEpNotifications/Info.plist;
INFOPLIST_FILE = PEPUpdatesApp/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",


Submodules/pEpNotifications/PEPUpdatesApp/pEpNotifications.entitlements → Submodules/pEpNotifications/PEPUpdatesApp/PEPUpdatesApp.entitlements View File


Loading…
Cancel
Save