Browse Source

Merge branch 'IOSAD-214'

* IOSAD-214:
  IOSAD-214 Link objctypes to objcutils.
  IOSAD-214 Update schemes and update pEpObjCAdapterTests.
  IOSAD-214 Change from iOS+MacOS to iOS the dependencies of PEPObjCUtils.
  IOSAD-214 Renaming comments to objctypes. Update pEpObjCTests.
  IOSAD-214 Link toolbox to PEPObjcAdapter_macOS.
  IOSAD-214 Link PEPObjCTypes:macOS to PEPObjCAdapterUtils_maCOS.
  IOSAD-214 Update PEPObjCAdapter.
  IOSAD-214 Update PEPObjCTypeUtils.
  IOSAD-214 Rename PEPObjCAdapterTypesTests_iOS to PEPObjCTypesTests_iOS.
  IOSAD-214 Rename PEPObjCAdapterTypes_iOS to PEPObjCTypes_iOS.
  IOSAD-214 Rename PEPObjCAdapterTypes_macOS to PEPObjCTypes_macOS.
  IOSAD-214 Rename PEPObjCAdapterTypes to PEPObjCTypes.
  IOSAD-214 Rename schemes. Fix scripts.
  IOSAD-214 Rename targets. Rename folder.
  Fixes: scheme builds toolbox, but toolbox for extensions is what we need.
  rm the complete list of needless linker flags
  IOS-2882 rm needless and orphaned frameworks and references
master
David Alarcon 2 months ago
parent
commit
030a2b19cc
56 changed files with 263 additions and 336 deletions
  1. +0
    -12
      Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.m
  2. +0
    -12
      Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.m
  3. +0
    -4
      Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/module.modulemap
  4. +0
    -12
      Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.m
  5. +0
    -4
      Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/module.modulemap
  6. +10
    -87
      Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj/project.pbxproj
  7. +71
    -71
      Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.pbxproj
  8. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  9. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
  10. +3
    -3
      Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCTypesTests_iOS.xcscheme
  11. +6
    -6
      Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCTypes_iOS.xcscheme
  12. +6
    -6
      Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCTypes_macOS.xcscheme
  13. +3
    -3
      Subprojects/PEPObjCTypes/PEPObjCTypes/PEPObjCTypes.h
  14. +12
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/PEPObjCTypes.m
  15. +1
    -1
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPAttachment+SecureCoding.h
  16. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPAttachment.h
  17. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPEngineTypes.h
  18. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPIdentity+SecureCoding.h
  19. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPIdentity.h
  20. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPLanguage+SecureCoding.h
  21. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPLanguage.h
  22. +1
    -1
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPMessage+SecureCoding.h
  23. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPMessage.h
  24. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPTypes.h
  25. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/NSObject/NSObject+Extension.h
  26. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/NSObject/NSObject+Extension.m
  27. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPAttachment.m
  28. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPIdentity.m
  29. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPLanguage.m
  30. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPMessage.m
  31. +1
    -1
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/SecureCoding/PEPAttachment+SecureCoding.m
  32. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/SecureCoding/PEPIdentity+SecureCoding.m
  33. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/SecureCoding/PEPLanguage+SecureCoding.m
  34. +1
    -1
      Subprojects/PEPObjCTypes/PEPObjCTypes/src/SecureCoding/PEPMessage+SecureCoding.m
  35. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/Info.plist
  36. +1
    -1
      Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/PEPAttachment+SecureCodingTest.m
  37. +0
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/PEPIdentity+SecureCodingTest.m
  38. +1
    -1
      Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/PEPLanguage+SecureCodingTest.m
  39. +1
    -1
      Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/PEPMessage+SecureCodingTest.m
  40. +1
    -1
      Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/TestUtils/PEPTypesTestUtil.h
  41. +1
    -1
      Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/TestUtils/PEPTypesTestUtil.m
  42. +3
    -3
      Subprojects/PEPObjCTypes/PEPObjCTypes_iOS/PEPObjCTypes_iOS.h
  43. +12
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes_iOS/PEPObjCTypes_iOS.m
  44. +4
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes_iOS/module.modulemap
  45. +3
    -3
      Subprojects/PEPObjCTypes/PEPObjCTypes_macOS/PEPObjCTypes_macOS.h
  46. +12
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes_macOS/PEPObjCTypes_macOS.m
  47. +4
    -0
      Subprojects/PEPObjCTypes/PEPObjCTypes_macOS/module.modulemap
  48. +54
    -78
      pEpObjCAdapter.xcodeproj/project.pbxproj
  49. +13
    -13
      pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme
  50. +32
    -4
      pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/pEpObjCAdapterTests.xcscheme
  51. +1
    -1
      pEpObjCTests/PEPInternalSessionTest.m
  52. +1
    -1
      pEpObjCTests/PEPSessionTest.m
  53. +1
    -1
      pEpObjCTests/PEPSizeTest.m
  54. +1
    -1
      pEpObjCTests/TestUtils/PEPIdentity+isPEPUser.h
  55. +1
    -1
      pEpObjCTests/TestUtils/PEPTestUtils.m
  56. +1
    -1
      pEpObjCTests/TestUtils/XCTestCase+PEPSession.h

+ 0
- 12
Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.m View File

@ -1,12 +0,0 @@
//
// PEPObjCAdapterTypes.m
// PEPObjCAdapterTypes
//
// Created by David Alarcon on 23/6/21.
//
#import "PEPObjCAdapterTypes.h"
@implementation PEPObjCAdapterTypes
@end

+ 0
- 12
Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.m View File

@ -1,12 +0,0 @@
//
// PEPObjCAdapterTypes_iOS.m
// PEPObjCAdapterTypes_iOS
//
// Created by David Alarcon on 23/6/21.
//
#import "PEPObjCAdapterTypes_iOS.h"
@implementation PEPObjCAdapterTypes_iOS
@end

+ 0
- 4
Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/module.modulemap View File

@ -1,4 +0,0 @@
module PEPObjCAdapterTypes_iOS {
umbrella header "PEPObjCAdapterTypes_iOS.h"
export *
}

+ 0
- 12
Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.m View File

@ -1,12 +0,0 @@
//
// PEPObjCAdapterTypes_macOS.m
// PEPObjCAdapterTypes_macOS
//
// Created by David Alarcon on 23/6/21.
//
#import "PEPObjCAdapterTypes_macOS.h"
@implementation PEPObjCAdapterTypes_macOS
@end

+ 0
- 4
Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/module.modulemap View File

@ -1,4 +0,0 @@
module PEPObjCAdapterTypes_macOS {
umbrella header "PEPObjCAdapterTypes_macOS.h"
export *
}

+ 10
- 87
Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj/project.pbxproj View File

@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 52;
objects = {
/* Begin PBXBuildFile section */
@ -22,6 +22,7 @@
1585EBC32698A8FC00B822E1 /* PEPObjCTypeUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1585EBC12698A8FC00B822E1 /* PEPObjCTypeUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
1585EBC42698A8FC00B822E1 /* PEPObjCTypeUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 1585EBC22698A8FC00B822E1 /* PEPObjCTypeUtils.m */; };
1585EC79269C3E1700B822E1 /* PEPObjCTypeUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1585EBC12698A8FC00B822E1 /* PEPObjCTypeUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
4E51C1FA26CD12EE007A2164 /* libPEPObjCTypes_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E51C1F926CD12EE007A2164 /* libPEPObjCTypes_macOS.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -46,27 +47,6 @@
remoteGlobalIDString = 644297BF1BE11C65002BC73B;
remoteInfo = pEpTrustWords;
};
1585EC9E269C51EC00B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EADF2698524500B822E1 /* PEPObjCAdapterTypes.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4E575858268329170084F02D;
remoteInfo = PEPObjCAdapterTypes_macOS;
};
1585ECA0269C51EC00B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EADF2698524500B822E1 /* PEPObjCAdapterTypes.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4E575865268329A20084F02D;
remoteInfo = PEPObjCAdapterTypes_iOS;
};
1585ECA2269C51EC00B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EADF2698524500B822E1 /* PEPObjCAdapterTypes.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4E5758BF26833D140084F02D;
remoteInfo = PEPObjCAdapterTypesTests_iOS;
};
1585ECC3269C5A0800B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EACB269850B400B822E1 /* pEpEngine.xcodeproj */;
@ -81,20 +61,6 @@
remoteGlobalIDString = 64796A3E1B455AA5004B1C24;
remoteInfo = pEpEngine;
};
1585ED61269C6BA800B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EADF2698524500B822E1 /* PEPObjCAdapterTypes.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4E575864268329A20084F02D;
remoteInfo = PEPObjCAdapterTypes_iOS;
};
1585ED63269C6BB000B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1585EADF2698524500B822E1 /* PEPObjCAdapterTypes.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4E575857268329170084F02D;
remoteInfo = PEPObjCAdapterTypes_macOS;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@ -118,10 +84,11 @@
1585EA8D26984D6B00B822E1 /* NSArray+Engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Engine.h"; sourceTree = "<group>"; };
1585EA8E26984D6B00B822E1 /* PEPMessage+Engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PEPMessage+Engine.h"; sourceTree = "<group>"; };
1585EACB269850B400B822E1 /* pEpEngine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pEpEngine.xcodeproj; path = "../../../pEpEngine/build-mac/pEpEngine.xcodeproj"; sourceTree = "<group>"; };
1585EADF2698524500B822E1 /* PEPObjCAdapterTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCAdapterTypes.xcodeproj; path = ../PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj; sourceTree = "<group>"; };
1585EADF2698524500B822E1 /* PEPObjCTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCTypes.xcodeproj; path = /Users/davidalarcon/Development/pEpSecurity/src_pEpMime4macOS/pEpObjCAdapter/Subprojects/PEPObjCTypeUtils/../PEPObjCTypes/PEPObjCTypes.xcodeproj; sourceTree = "<absolute>"; };
1585EB3D2698636C00B822E1 /* libPEPObjCTypeUtils_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCTypeUtils_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
1585EBC12698A8FC00B822E1 /* PEPObjCTypeUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPObjCTypeUtils.h; sourceTree = "<group>"; };
1585EBC22698A8FC00B822E1 /* PEPObjCTypeUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPObjCTypeUtils.m; sourceTree = "<group>"; };
4E51C1F926CD12EE007A2164 /* libPEPObjCTypes_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPObjCTypes_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -129,6 +96,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4E51C1FA26CD12EE007A2164 /* libPEPObjCTypes_macOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -145,7 +113,7 @@
1585EA7326984C4300B822E1 = {
isa = PBXGroup;
children = (
1585EADF2698524500B822E1 /* PEPObjCAdapterTypes.xcodeproj */,
1585EADF2698524500B822E1 /* PEPObjCTypes.xcodeproj */,
1585EACB269850B400B822E1 /* pEpEngine.xcodeproj */,
1585EA7E26984C4300B822E1 /* PEPObjCTypeUtils */,
1585EA7D26984C4300B822E1 /* Products */,
@ -196,6 +164,7 @@
1585EADB269850C700B822E1 /* Frameworks */ = {
isa = PBXGroup;
children = (
4E51C1F926CD12EE007A2164 /* libPEPObjCTypes_macOS.a */,
);
name = Frameworks;
sourceTree = "<group>";
@ -210,16 +179,6 @@
name = Products;
sourceTree = "<group>";
};
1585EC99269C51EC00B822E1 /* Products */ = {
isa = PBXGroup;
children = (
1585EC9F269C51EC00B822E1 /* libPEPObjCAdapterTypes_macOS.a */,
1585ECA1269C51EC00B822E1 /* libPEPObjCAdapterTypes_iOS.a */,
1585ECA3269C51EC00B822E1 /* PEPObjCAdapterTypesTests_iOS.xctest */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@ -260,7 +219,6 @@
buildRules = (
);
dependencies = (
1585ED64269C6BB000B822E1 /* PBXTargetDependency */,
1585ECC4269C5A0800B822E1 /* PBXTargetDependency */,
);
name = PEPObjCTypeUtils_macOS;
@ -281,7 +239,6 @@
buildRules = (
);
dependencies = (
1585ED62269C6BA800B822E1 /* PBXTargetDependency */,
1585ED5A269C6B9F00B822E1 /* PBXTargetDependency */,
);
name = PEPObjCTypeUtils_iOS;
@ -321,10 +278,6 @@
ProductGroup = 1585EC8A269C51EC00B822E1 /* Products */;
ProjectRef = 1585EACB269850B400B822E1 /* pEpEngine.xcodeproj */;
},
{
ProductGroup = 1585EC99269C51EC00B822E1 /* Products */;
ProjectRef = 1585EADF2698524500B822E1 /* PEPObjCAdapterTypes.xcodeproj */;
},
);
projectRoot = "";
targets = (
@ -356,27 +309,6 @@
remoteRef = 1585EC94269C51EC00B822E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1585EC9F269C51EC00B822E1 /* libPEPObjCAdapterTypes_macOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libPEPObjCAdapterTypes_macOS.a;
remoteRef = 1585EC9E269C51EC00B822E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1585ECA1269C51EC00B822E1 /* libPEPObjCAdapterTypes_iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libPEPObjCAdapterTypes_iOS.a;
remoteRef = 1585ECA0269C51EC00B822E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1585ECA3269C51EC00B822E1 /* PEPObjCAdapterTypesTests_iOS.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = PEPObjCAdapterTypesTests_iOS.xctest;
remoteRef = 1585ECA2269C51EC00B822E1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXShellScriptBuildPhase section */
@ -452,18 +384,9 @@
1585ED5A269C6B9F00B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = pEpEngine;
platformFilter = ios;
targetProxy = 1585ED59269C6B9F00B822E1 /* PBXContainerItemProxy */;
};
1585ED62269C6BA800B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterTypes_iOS;
targetProxy = 1585ED61269C6BA800B822E1 /* PBXContainerItemProxy */;
};
1585ED64269C6BB000B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterTypes_macOS;
targetProxy = 1585ED63269C6BB000B822E1 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
@ -520,7 +443,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/../../../pEpEngine/build-mac/build/include/pEp",
"${PROJECT_DIR}/../PEPObjCAdapterTypes/build/include",
"${PROJECT_DIR}/../PEPObjCTypes/build/include",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@ -577,7 +500,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/../../../pEpEngine/build-mac/build/include/pEp",
"${PROJECT_DIR}/../PEPObjCAdapterTypes/build/include",
"${PROJECT_DIR}/../PEPObjCTypes/build/include",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj → Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.pbxproj View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.xcworkspace/contents.xcworkspacedata → Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.xcworkspace/contents.xcworkspacedata View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist → Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypesTests_iOS.xcscheme → Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCTypesTests_iOS.xcscheme View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_iOS.xcscheme → Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCTypes_iOS.xcscheme View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_macOS.xcscheme → Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCTypes_macOS.xcscheme View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PEPObjCTypes.h View File


+ 12
- 0
Subprojects/PEPObjCTypes/PEPObjCTypes/PEPObjCTypes.m View File

@ -0,0 +1,12 @@
//
// PEPObjCTypes.m
// PEPObjCTypes
//
// Created by David Alarcon on 23/6/21.
//
#import "PEPObjCATypes.h"
@implementation PEPObjCTypes
@end

Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment+SecureCoding.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPAttachment+SecureCoding.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPAttachment.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPEngineTypes.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPEngineTypes.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity+SecureCoding.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPIdentity+SecureCoding.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPIdentity.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage+SecureCoding.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPLanguage+SecureCoding.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPLanguage.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage+SecureCoding.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPMessage+SecureCoding.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPMessage.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPTypes.h → Subprojects/PEPObjCTypes/PEPObjCTypes/PublicHeaders/PEPTypes.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.h → Subprojects/PEPObjCTypes/PEPObjCTypes/src/NSObject/NSObject+Extension.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.m → Subprojects/PEPObjCTypes/PEPObjCTypes/src/NSObject/NSObject+Extension.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPAttachment.m → Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPAttachment.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPIdentity.m → Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPIdentity.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPLanguage.m → Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPLanguage.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPMessage.m → Subprojects/PEPObjCTypes/PEPObjCTypes/src/PEPMessage.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPAttachment+SecureCoding.m → Subprojects/PEPObjCTypes/PEPObjCTypes/src/SecureCoding/PEPAttachment+SecureCoding.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPIdentity+SecureCoding.m → Subprojects/PEPObjCTypes/PEPObjCTypes/src/SecureCoding/PEPIdentity+SecureCoding.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPLanguage+SecureCoding.m → Subprojects/PEPObjCTypes/PEPObjCTypes/src/SecureCoding/PEPLanguage+SecureCoding.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPMessage+SecureCoding.m → Subprojects/PEPObjCTypes/PEPObjCTypes/src/SecureCoding/PEPMessage+SecureCoding.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/Info.plist → Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/Info.plist View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPAttachment+SecureCodingTest.m → Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/PEPAttachment+SecureCodingTest.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPIdentity+SecureCodingTest.m → Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/PEPIdentity+SecureCodingTest.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPLanguage+SecureCodingTest.m → Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/PEPLanguage+SecureCodingTest.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPMessage+SecureCodingTest.m → Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/PEPMessage+SecureCodingTest.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.h → Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/TestUtils/PEPTypesTestUtil.h View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.m → Subprojects/PEPObjCTypes/PEPObjCTypesTests_iOS/TestUtils/PEPTypesTestUtil.m View File


Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.h → Subprojects/PEPObjCTypes/PEPObjCTypes_iOS/PEPObjCTypes_iOS.h View File


+ 12
- 0
Subprojects/PEPObjCTypes/PEPObjCTypes_iOS/PEPObjCTypes_iOS.m View File

@ -0,0 +1,12 @@
//
// PEPObjCTypes_iOS.m
// PEPObjCTypes_iOS
//
// Created by David Alarcon on 23/6/21.
//
#import "PEPObjCTypes_iOS.h"
@implementation PEPObjCTypes_iOS
@end

+ 4
- 0
Subprojects/PEPObjCTypes/PEPObjCTypes_iOS/module.modulemap View File

@ -0,0 +1,4 @@
module PEPObjCTypes_iOS {
umbrella header "PEPObjCTypes_iOS.h"
export *
}

Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.h → Subprojects/PEPObjCTypes/PEPObjCTypes_macOS/PEPObjCTypes_macOS.h View File


+ 12
- 0
Subprojects/PEPObjCTypes/PEPObjCTypes_macOS/PEPObjCTypes_macOS.m View File

@ -0,0 +1,12 @@
//
// PEPObjCTypes_macOS.m
// PEPObjCTypes_macOS
//
// Created by David Alarcon on 23/6/21.
//
#import "PEPObjCTypes_macOS.h"
@implementation PEPObjCTypes_macOS
@end

+ 4
- 0
Subprojects/PEPObjCTypes/PEPObjCTypes_macOS/module.modulemap View File

@ -0,0 +1,4 @@
module PEPObjCTypes_macOS {
umbrella header "PEPObjCTypes_macOS.h"
export *
}

+ 54
- 78
pEpObjCAdapter.xcodeproj/project.pbxproj View File

@ -139,7 +139,6 @@
4349CD7924ADDB8800A22A13 /* PEPPassphraseCache+Reset.m in Sources */ = {isa = PBXBuildFile; fileRef = 4349CD7824ADDB8800A22A13 /* PEPPassphraseCache+Reset.m */; };
43589EFB24A4ACFC0079BEA2 /* PEPPassphraseCacheTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 43589EFA24A4ACFC0079BEA2 /* PEPPassphraseCacheTest.m */; };
43676B661C57EA1A00233933 /* B623F674_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 43676B641C57EA1A00233933 /* B623F674_sec.asc */; };
436B444E26838437002624AB /* libPEPObjCAdapterTypes_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 436B444B26837F78002624AB /* libPEPObjCAdapterTypes_iOS.a */; platformFilter = ios; };
436E917224B714A2000296FF /* Rick Deckard (43F270EC) – Secret.asc in Resources */ = {isa = PBXBuildFile; fileRef = 436E917124B714A1000296FF /* Rick Deckard (43F270EC) – Secret.asc */; };
436E917724B71E12000296FF /* PEPPassphraseProviderMock.m in Sources */ = {isa = PBXBuildFile; fileRef = 436E917624B71E12000296FF /* PEPPassphraseProviderMock.m */; };
4396CEB82187196600FDD398 /* PEPInternalSessionTestNotifyHandshakeDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4396CEB62187190F00FDD398 /* PEPInternalSessionTestNotifyHandshakeDelegate.m */; };
@ -147,6 +146,7 @@
43D2D5F12632B0FA00088BDC /* XCTestCase+PEPSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 43D2D5F02632B0FA00088BDC /* XCTestCase+PEPSession.m */; };
43E02A201C71F65B008F05E9 /* A3FC7F0A_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 43E02A1C1C71F65B008F05E9 /* A3FC7F0A_sec.asc */; };
43E02A211C71F65B008F05E9 /* A3FC7F0A.asc in Resources */ = {isa = PBXBuildFile; fileRef = 43E02A1D1C71F65B008F05E9 /* A3FC7F0A.asc */; };
4E51BFA726CBC685007A2164 /* libPEPToolbox_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E51BFA626CBC685007A2164 /* libPEPToolbox_macOS.a */; };
4E57581226821A760084F02D /* libPEPObjCAdapterProtocols_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E23E6F62681C8AF00B8F4C2 /* libPEPObjCAdapterProtocols_macOS.a */; };
640F79231C9B517C00DBEC4E /* 5CB2C182_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */; };
640F79241C9B517C00DBEC4E /* 5CB2C182.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79221C9B517C00DBEC4E /* 5CB2C182.asc */; };
@ -211,20 +211,6 @@
remoteGlobalIDString = 1552DB102577D4F100A92F71;
remoteInfo = pEpEngine_macOS;
};
1585ED89269C77E500B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4E575864268329A20084F02D;
remoteInfo = PEPObjCAdapterTypes_iOS;
};
1585ED8B269C77F000B822E1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4E575857268329170084F02D;
remoteInfo = PEPObjCAdapterTypes_macOS;
};
430D78DE2681E13300B12650 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */;
@ -239,33 +225,33 @@
remoteGlobalIDString = 4E23E7032681D5F300B8F4C2;
remoteInfo = PEPObjCAdapterProtocols_iOS;
};
436B444826837F78002624AB /* PBXContainerItemProxy */ = {
4E23E6F52681C8AF00B8F4C2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */;
containerPortal = 4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4E575858268329170084F02D;
remoteInfo = PEPObjCAdapterTypes_macOS;
remoteGlobalIDString = 4E23E6E62681C7CD00B8F4C2;
remoteInfo = PEPObjCAdapterProtocols_macOS;
};
436B444A26837F78002624AB /* PBXContainerItemProxy */ = {
4E51BF3E26CA5E5C007A2164 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */;
containerPortal = 4E51BF3826CA5E5C007A2164 /* PEPObjCTypes.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4E575865268329A20084F02D;
remoteInfo = PEPObjCAdapterTypes_iOS;
remoteGlobalIDString = 4E575858268329170084F02D;
remoteInfo = PEPObjCTypes_macOS;
};
436B444C26837F78002624AB /* PBXContainerItemProxy */ = {
4E51BF4026CA5E5C007A2164 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */;
containerPortal = 4E51BF3826CA5E5C007A2164 /* PEPObjCTypes.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4E5758BF26833D140084F02D;
remoteInfo = PEPObjCAdapterTypesTests_iOS;
remoteGlobalIDString = 4E575865268329A20084F02D;
remoteInfo = PEPObjCTypes_iOS;
};
4E23E6F52681C8AF00B8F4C2 /* PBXContainerItemProxy */ = {
4E51BF4226CA5E5C007A2164 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */;
containerPortal = 4E51BF3826CA5E5C007A2164 /* PEPObjCTypes.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4E23E6E62681C7CD00B8F4C2;
remoteInfo = PEPObjCAdapterProtocols_macOS;
remoteGlobalIDString = 4E5758BF26833D140084F02D;
remoteInfo = PEPObjCTypesTests_iOS;
};
4E57580E26821A660084F02D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
@ -388,7 +374,6 @@
4360A9FE2227EBB200E62E5A /* NSNumber+PEPRating+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSNumber+PEPRating+Internal.h"; sourceTree = "<group>"; };
43676B631C57EA1A00233933 /* 0xB623F674.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 0xB623F674.asc; sourceTree = "<group>"; };
43676B641C57EA1A00233933 /* B623F674_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = B623F674_sec.asc; sourceTree = "<group>"; };
436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCAdapterTypes.xcodeproj; path = Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj; sourceTree = "<group>"; };
436C9A3124DC48B600007A3D /* PEPPassphraseUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPPassphraseUtil.h; sourceTree = "<group>"; };
436C9A3224DC48B600007A3D /* PEPPassphraseUtil.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPPassphraseUtil.m; sourceTree = "<group>"; };
436E916D24B65805000296FF /* PEPPassphraseProviderProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPPassphraseProviderProtocol.h; sourceTree = "<group>"; };
@ -409,6 +394,8 @@
43E02A1D1C71F65B008F05E9 /* A3FC7F0A.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = A3FC7F0A.asc; sourceTree = "<group>"; };
43E1A7AB252B421D00307A7D /* Logger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = "<group>"; };
43F73BE92166248E00AB4524 /* PEPSync.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSync.m; sourceTree = "<group>"; };
4E51BF3826CA5E5C007A2164 /* PEPObjCTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCTypes.xcodeproj; path = Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj; sourceTree = "<group>"; };
4E51BFA626CBC685007A2164 /* libPEPToolbox_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPToolbox_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCAdapterProtocols.xcodeproj; path = Subprojects/PEPObjCAdapterProtocols/PEPObjCAdapterProtocols.xcodeproj; sourceTree = "<group>"; };
640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5CB2C182_sec.asc; sourceTree = "<group>"; };
640F79221C9B517C00DBEC4E /* 5CB2C182.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5CB2C182.asc; sourceTree = "<group>"; };
@ -429,7 +416,6 @@
buildActionMask = 2147483647;
files = (
1585EC7E269C45A100B822E1 /* libPEPObjCTypeUtils_iOS.a in Frameworks */,
436B444E26838437002624AB /* libPEPObjCAdapterTypes_iOS.a in Frameworks */,
430D78E02681E19000B12650 /* libPEPObjCAdapterProtocols_iOS.a in Frameworks */,
15160AF1257A58A000DD42E0 /* libpEpEngine.a in Frameworks */,
);
@ -439,6 +425,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4E51BFA726CBC685007A2164 /* libPEPToolbox_macOS.a in Frameworks */,
1585EC7F269C45AC00B822E1 /* libPEPObjCTypeUtils_macOS.a in Frameworks */,
152E48FE26A86327009BD3CE /* libpEpEngine_macOS.a in Frameworks */,
4E57581226821A760084F02D /* libPEPObjCAdapterProtocols_macOS.a in Frameworks */,
@ -567,7 +554,7 @@
152E488726A85A15009BD3CE /* CommonPEPDependencies.xcodeproj */,
1585EB15269861D700B822E1 /* PEPObjCTypeUtils.xcodeproj */,
4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */,
436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */,
4E51BF3826CA5E5C007A2164 /* PEPObjCTypes.xcodeproj */,
64DA243B1B833248000BEE80 /* pEpEngine.xcodeproj */,
35FB0ABD1B57F99D00377032 /* Security.framework */,
35FB0ABB1B57F97E00377032 /* CFNetwork.framework */,
@ -629,20 +616,11 @@
43447C51221D448500B6323E /* Frameworks */ = {
isa = PBXGroup;
children = (
4E51BFA626CBC685007A2164 /* libPEPToolbox_macOS.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
436B444226837F78002624AB /* Products */ = {
isa = PBXGroup;
children = (
436B444926837F78002624AB /* libPEPObjCAdapterTypes_macOS.a */,
436B444B26837F78002624AB /* libPEPObjCAdapterTypes_iOS.a */,
436B444D26837F78002624AB /* PEPObjCAdapterTypesTests_iOS.xctest */,
);
name = Products;
sourceTree = "<group>";
};
438C0EE1254026E200337922 /* Extensions */ = {
isa = PBXGroup;
children = (
@ -663,6 +641,16 @@
path = Extensions;
sourceTree = "<group>";
};
4E51BF3926CA5E5C007A2164 /* Products */ = {
isa = PBXGroup;
children = (
4E51BF3F26CA5E5C007A2164 /* libPEPObjCTypes_macOS.a */,
4E51BF4126CA5E5C007A2164 /* libPEPObjCTypes_iOS.a */,
4E51BF4326CA5E5C007A2164 /* PEPObjCTypesTests_iOS.xctest */,
);
name = Products;
sourceTree = "<group>";
};
4EEB4CCA2680E56A00161040 /* Products */ = {
isa = PBXGroup;
children = (
@ -792,7 +780,6 @@
buildRules = (
);
dependencies = (
1585ED8A269C77E500B822E1 /* PBXTargetDependency */,
1585ECE4269C5FC900B822E1 /* PBXTargetDependency */,
1585EC7B269C458700B822E1 /* PBXTargetDependency */,
430D78E22681E1CF00B12650 /* PBXTargetDependency */,
@ -814,7 +801,6 @@
buildRules = (
);
dependencies = (
1585ED8C269C77F000B822E1 /* PBXTargetDependency */,
1585ED83269C77BE00B822E1 /* PBXTargetDependency */,
1585EC7D269C459300B822E1 /* PBXTargetDependency */,
4E57580F26821A660084F02D /* PBXTargetDependency */,
@ -890,8 +876,8 @@
ProjectRef = 4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */;
},
{
ProductGroup = 436B444226837F78002624AB /* Products */;
ProjectRef = 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */;
ProductGroup = 4E51BF3926CA5E5C007A2164 /* Products */;
ProjectRef = 4E51BF3826CA5E5C007A2164 /* PEPObjCTypes.xcodeproj */;
},
{
ProductGroup = 1585EC4B269C38FB00B822E1 /* Products */;
@ -936,32 +922,32 @@
remoteRef = 430D78DE2681E13300B12650 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
436B444926837F78002624AB /* libPEPObjCAdapterTypes_macOS.a */ = {
4E23E6F62681C8AF00B8F4C2 /* libPEPObjCAdapterProtocols_macOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libPEPObjCAdapterTypes_macOS.a;
remoteRef = 436B444826837F78002624AB /* PBXContainerItemProxy */;
path = libPEPObjCAdapterProtocols_macOS.a;
remoteRef = 4E23E6F52681C8AF00B8F4C2 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
436B444B26837F78002624AB /* libPEPObjCAdapterTypes_iOS.a */ = {
4E51BF3F26CA5E5C007A2164 /* libPEPObjCTypes_macOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libPEPObjCAdapterTypes_iOS.a;
remoteRef = 436B444A26837F78002624AB /* PBXContainerItemProxy */;
path = libPEPObjCTypes_macOS.a;
remoteRef = 4E51BF3E26CA5E5C007A2164 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
436B444D26837F78002624AB /* PEPObjCAdapterTypesTests_iOS.xctest */ = {
4E51BF4126CA5E5C007A2164 /* libPEPObjCTypes_iOS.a */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = PEPObjCAdapterTypesTests_iOS.xctest;
remoteRef = 436B444C26837F78002624AB /* PBXContainerItemProxy */;
fileType = archive.ar;
path = libPEPObjCTypes_iOS.a;
remoteRef = 4E51BF4026CA5E5C007A2164 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
4E23E6F62681C8AF00B8F4C2 /* libPEPObjCAdapterProtocols_macOS.a */ = {
4E51BF4326CA5E5C007A2164 /* PEPObjCTypesTests_iOS.xctest */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libPEPObjCAdapterProtocols_macOS.a;
remoteRef = 4E23E6F52681C8AF00B8F4C2 /* PBXContainerItemProxy */;
fileType = wrapper.cfbundle;
path = PEPObjCTypesTests_iOS.xctest;
remoteRef = 4E51BF4226CA5E5C007A2164 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
64289E561B8B70E800FC617B /* libpEpEngine.a */ = {
@ -1028,7 +1014,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\n\ncp -R \"${BUILT_PRODUCTS_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapter_iOS.a\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapterTypes_iOS.a\" ${CUSTOM_BUILD_DIR}\n";
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\n\ncp -R \"${BUILT_PRODUCTS_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapter_iOS.a\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCTypes_iOS.a\" ${CUSTOM_BUILD_DIR}\n";
};
1543D9262577E3920041EFB5 /* Copy artefacts to custom build dir */ = {
isa = PBXShellScriptBuildPhase;
@ -1046,7 +1032,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\n\ncp -R \"${BUILT_PRODUCTS_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapter_macOS.a\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapterTypes_macOS.a\" ${CUSTOM_BUILD_DIR}\n";
shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\n\ncp -R \"${BUILT_PRODUCTS_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapter_macOS.a\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCTypes_macOS.a\" ${CUSTOM_BUILD_DIR}\n";
};
/* End PBXShellScriptBuildPhase section */
@ -1153,16 +1139,6 @@
name = pEpEngine_macOS;
targetProxy = 1585ED82269C77BE00B822E1 /* PBXContainerItemProxy */;
};
1585ED8A269C77E500B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterTypes_iOS;
targetProxy = 1585ED89269C77E500B822E1 /* PBXContainerItemProxy */;
};
1585ED8C269C77F000B822E1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterTypes_macOS;
targetProxy = 1585ED8B269C77F000B822E1 /* PBXContainerItemProxy */;
};
430D78E22681E1CF00B12650 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PEPObjCAdapterProtocols_iOS;
@ -1202,7 +1178,7 @@
);
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/../pEpEngine/src",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterProtocols/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypeUtils/build/include",
);
@ -1231,7 +1207,7 @@
GCC_PREPROCESSOR_DEFINITIONS = "IS_IOS_BUILD=1";
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/../pEpEngine/src",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterProtocols/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypeUtils/build/include",
);
@ -1263,7 +1239,7 @@
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/../local/include",
"$(PROJECT_DIR)/../pep-toolbox/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypeUtils/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterProtocols/build/include",
"$(PROJECT_DIR)/../pEpEngine/build-mac/build/include/pEp",
@ -1304,7 +1280,7 @@
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/../local/include",
"$(PROJECT_DIR)/../pep-toolbox/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypes/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCTypeUtils/build/include",
"$(PROJECT_DIR)/Subprojects/PEPObjCAdapterProtocols/build/include",
"$(PROJECT_DIR)/../pEpEngine/build-mac/build/include/pEp",


+ 13
- 13
pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme View File

@ -56,9 +56,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B7911EB321F7358500D7F66F"
BuildableName = "pEpIOSToolbox.framework"
BlueprintName = "pEpIOSToolbox"
BlueprintIdentifier = "43D3EF23260A0D7E00110971"
BuildableName = "pEpIOSToolboxForExtensions.framework"
BlueprintName = "pEpIOSToolboxForExtensions"
ReferencedContainer = "container:../pep-toolbox/pEpIOSToolbox.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -99,9 +99,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4E575864268329A20084F02D"
BuildableName = "libPEPObjCAdapterTypes_iOS.a"
BlueprintName = "PEPObjCAdapterTypes_iOS"
ReferencedContainer = "container:Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj">
BuildableName = "libPEPObjCTypes_iOS.a"
BlueprintName = "PEPObjCTypes_iOS"
ReferencedContainer = "container:../../src_pEp4AppleMail/pEpObjCAdapter/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
@ -120,16 +120,16 @@
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4E5758BE26833D140084F02D"
BuildableName = "PEPObjCAdapterTypesTests_iOS.xctest"
BlueprintName = "PEPObjCAdapterTypesTests_iOS"
ReferencedContainer = "container:Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj">
BuildableName = "PEPObjCTypesTests_iOS.xctest"
BlueprintName = "PEPObjCTypesTests_iOS"
ReferencedContainer = "container:../../src_pEp4AppleMail/pEpObjCAdapter/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>


+ 32
- 4
pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/pEpObjCAdapterTests.xcscheme View File

@ -56,10 +56,38 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "151606FC257A401000DD42E0"
BuildableName = "libPEPObjCAdapterTypes_iOS.a"
BlueprintName = "PEPObjCAdapterTypes_iOS"
ReferencedContainer = "container:pEpObjCAdapter.xcodeproj">
BlueprintIdentifier = "43D3EF23260A0D7E00110971"
BuildableName = "pEpIOSToolboxForExtensions.framework"
BlueprintName = "pEpIOSToolboxForExtensions"
ReferencedContainer = "container:../pep-toolbox/pEpIOSToolbox.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3AE6870024FFA5ED00B416ED"
BuildableName = "pEp4iosIntern.framework"
BlueprintName = "pEp4iosIntern"
ReferencedContainer = "container:../pep_for_ios_intern/pEp4iosIntern/pEp4iosIntern.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4E575864268329A20084F02D"
BuildableName = "libPEPObjCTypes_iOS.a"
BlueprintName = "PEPObjCTypes_iOS"
ReferencedContainer = "container:../../src_pEp4AppleMail/pEpObjCAdapter/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry


+ 1
- 1
pEpObjCTests/PEPInternalSessionTest.m View File

@ -8,7 +8,7 @@
#import <XCTest/XCTest.h>
#import "PEPObjCAdapterTypes_iOS.h"
#import "PEPObjCTypes_iOS.h"
#import "PEPObjCAdapter_iOS.h"
#import "NSNumber+PEPRating.h"


+ 1
- 1
pEpObjCTests/PEPSessionTest.m View File

@ -8,7 +8,7 @@
#import <XCTest/XCTest.h>
#import "PEPObjCAdapterTypes_iOS.h"
#import "PEPObjCTypes_iOS.h"
#import "PEPObjCAdapter_iOS.h"
#import "NSNumber+PEPRating.h"


+ 1
- 1
pEpObjCTests/PEPSizeTest.m View File

@ -8,7 +8,7 @@
#import <XCTest/XCTest.h>
#import "PEPObjCAdapterTypes_iOS.h"
#import "PEPObjCTypes_iOS.h"
#import "PEPObjCAdapter_iOS.h"
#import "pEpEngine.h"


+ 1
- 1
pEpObjCTests/TestUtils/PEPIdentity+isPEPUser.h View File

@ -7,7 +7,7 @@
//
#import "PEPObjCAdapter.h"
#import "PEPObjCAdapterTypes_iOS.h"
#import "PEPObjCTypes_iOS.h"
NS_ASSUME_NONNULL_BEGIN


+ 1
- 1
pEpObjCTests/TestUtils/PEPTestUtils.m View File

@ -10,7 +10,7 @@
#import "PEPTestUtils.h"
#import "PEPObjCAdapterTypes_iOS.h"
#import "PEPObjCTypes_iOS.h"
#import "PEPObjCAdapter_iOS.h"
#import "PEPInternalSession.h"


+ 1
- 1
pEpObjCTests/TestUtils/XCTestCase+PEPSession.h View File

@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import <XCTest/XCTest.h>
#import "PEPObjCAdapterTypes_iOS.h"
#import "PEPObjCTypes_iOS.h"
NS_ASSUME_NONNULL_BEGIN


Loading…
Cancel
Save