diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PEPObjCAdapterTypes.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment+SecureCoding.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment+SecureCoding.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment+SecureCoding.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment+SecureCoding.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPAttachment.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPEngineTypes.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPEngineTypes.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPEngineTypes.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPEngineTypes.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity+SecureCoding.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity+SecureCoding.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity+SecureCoding.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity+SecureCoding.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPIdentity.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage+SecureCoding.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage+SecureCoding.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage+SecureCoding.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage+SecureCoding.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPLanguage.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage+SecureCoding.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage+SecureCoding.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage+SecureCoding.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage+SecureCoding.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPMessage.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPTypes.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPTypes.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/PublicHeaders/PEPTypes.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/PublicHeaders/PEPTypes.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/NSObject/NSObject+Extension.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPAttachment.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/PEPAttachment.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPAttachment.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/PEPAttachment.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPIdentity.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/PEPIdentity.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPIdentity.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/PEPIdentity.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPLanguage.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/PEPLanguage.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPLanguage.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/PEPLanguage.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPMessage.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/PEPMessage.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/PEPMessage.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/PEPMessage.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPAttachment+SecureCoding.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPAttachment+SecureCoding.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPAttachment+SecureCoding.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPAttachment+SecureCoding.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPIdentity+SecureCoding.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPIdentity+SecureCoding.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPIdentity+SecureCoding.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPIdentity+SecureCoding.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPLanguage+SecureCoding.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPLanguage+SecureCoding.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPLanguage+SecureCoding.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPLanguage+SecureCoding.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPMessage+SecureCoding.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPMessage+SecureCoding.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPMessage+SecureCoding.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes/src/SecureCoding/PEPMessage+SecureCoding.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/Info.plist b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/Info.plist similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/Info.plist rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/Info.plist diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPAttachment+SecureCodingTest.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/PEPAttachment+SecureCodingTest.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPAttachment+SecureCodingTest.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/PEPAttachment+SecureCodingTest.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPIdentity+SecureCodingTest.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/PEPIdentity+SecureCodingTest.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPIdentity+SecureCodingTest.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/PEPIdentity+SecureCodingTest.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPLanguage+SecureCodingTest.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/PEPLanguage+SecureCodingTest.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPLanguage+SecureCodingTest.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/PEPLanguage+SecureCodingTest.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPMessage+SecureCodingTest.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/PEPMessage+SecureCodingTest.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/PEPMessage+SecureCodingTest.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/PEPMessage+SecureCodingTest.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypesTests_iOS/TestUtils/PEPTypesTestUtil.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_iOS/PEPObjCAdapterTypes_iOS.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/module.modulemap b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_iOS/module.modulemap similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_iOS/module.modulemap rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_iOS/module.modulemap diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.h b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.h similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.h rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.h diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.m b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.m similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.m rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_macOS/PEPObjCAdapterTypes_macOS.m diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/module.modulemap b/Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_macOS/module.modulemap similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes_macOS/module.modulemap rename to Subprojects/PEPObjCTypes/PEPObjCAdapterTypes_macOS/module.modulemap diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.pbxproj similarity index 94% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj rename to Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.pbxproj index 5b409af6..edd34d92 100644 --- a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj +++ b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.pbxproj @@ -55,7 +55,7 @@ 4E5758B1268333230084F02D /* NSObject+Extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E57587726832F2F0084F02D /* NSObject+Extension.h */; platformFilter = ios; }; 4E5758B626833A4E0084F02D /* PEPObjCAdapterTypes_macOS.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4E57585A268329170084F02D /* PEPObjCAdapterTypes_macOS.h */; }; 4E5758B726833A560084F02D /* module.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4E5758B4268339450084F02D /* module.modulemap */; }; - 4E5758C426833D140084F02D /* libPEPObjCAdapterTypes_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E575865268329A20084F02D /* libPEPObjCAdapterTypes_iOS.a */; platformFilter = ios; }; + 4E5758C426833D140084F02D /* libPEPObjCTypes_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E575865268329A20084F02D /* libPEPObjCTypes_iOS.a */; platformFilter = ios; }; 4E5758D126833F920084F02D /* PEPAttachment+SecureCodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758CA26833F920084F02D /* PEPAttachment+SecureCodingTest.m */; }; 4E5758D226833F920084F02D /* PEPIdentity+SecureCodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758CB26833F920084F02D /* PEPIdentity+SecureCodingTest.m */; }; 4E5758D326833F920084F02D /* PEPLanguage+SecureCodingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5758CC26833F920084F02D /* PEPLanguage+SecureCodingTest.m */; }; @@ -102,10 +102,10 @@ 43D44C832685BE4300638D1C /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; 4E575841268328CD0084F02D /* PEPObjCAdapterTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapterTypes.h; sourceTree = ""; }; 4E575843268328CD0084F02D /* PEPObjCAdapterTypes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapterTypes.m; sourceTree = ""; }; - 4E575858268329170084F02D /* libPEPObjCAdapterTypes_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCAdapterTypes_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 4E575858268329170084F02D /* libPEPObjCTypes_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCTypes_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4E57585A268329170084F02D /* PEPObjCAdapterTypes_macOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapterTypes_macOS.h; sourceTree = ""; }; 4E57585C268329170084F02D /* PEPObjCAdapterTypes_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapterTypes_macOS.m; sourceTree = ""; }; - 4E575865268329A20084F02D /* libPEPObjCAdapterTypes_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCAdapterTypes_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 4E575865268329A20084F02D /* libPEPObjCTypes_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCTypes_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4E575867268329A20084F02D /* PEPObjCAdapterTypes_iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapterTypes_iOS.h; sourceTree = ""; }; 4E575868268329A20084F02D /* PEPObjCAdapterTypes_iOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapterTypes_iOS.m; sourceTree = ""; }; 4E57587426832F2F0084F02D /* PEPLanguage+SecureCoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PEPLanguage+SecureCoding.m"; sourceTree = ""; }; @@ -130,7 +130,7 @@ 4E57588826832F2F0084F02D /* PEPIdentity+SecureCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PEPIdentity+SecureCoding.h"; sourceTree = ""; }; 4E5758B4268339450084F02D /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; 4E5758B926833A700084F02D /* libpEpEngine_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libpEpEngine_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 4E5758BF26833D140084F02D /* PEPObjCAdapterTypesTests_iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PEPObjCAdapterTypesTests_iOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 4E5758BF26833D140084F02D /* PEPObjCTypesTests_iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PEPObjCTypesTests_iOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 4E5758C326833D140084F02D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4E5758CA26833F920084F02D /* PEPAttachment+SecureCodingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PEPAttachment+SecureCodingTest.m"; sourceTree = ""; }; 4E5758CB26833F920084F02D /* PEPIdentity+SecureCodingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PEPIdentity+SecureCodingTest.m"; sourceTree = ""; }; @@ -159,7 +159,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4E5758C426833D140084F02D /* libPEPObjCAdapterTypes_iOS.a in Frameworks */, + 4E5758C426833D140084F02D /* libPEPObjCTypes_iOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -181,9 +181,9 @@ 4E57583F268328CD0084F02D /* Products */ = { isa = PBXGroup; children = ( - 4E575858268329170084F02D /* libPEPObjCAdapterTypes_macOS.a */, - 4E575865268329A20084F02D /* libPEPObjCAdapterTypes_iOS.a */, - 4E5758BF26833D140084F02D /* PEPObjCAdapterTypesTests_iOS.xctest */, + 4E575858268329170084F02D /* libPEPObjCTypes_macOS.a */, + 4E575865268329A20084F02D /* libPEPObjCTypes_iOS.a */, + 4E5758BF26833D140084F02D /* PEPObjCTypesTests_iOS.xctest */, ); name = Products; sourceTree = ""; @@ -343,9 +343,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 4E575857268329170084F02D /* PEPObjCAdapterTypes_macOS */ = { + 4E575857268329170084F02D /* PEPObjCTypes_macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 4E57585E268329170084F02D /* Build configuration list for PBXNativeTarget "PEPObjCAdapterTypes_macOS" */; + buildConfigurationList = 4E57585E268329170084F02D /* Build configuration list for PBXNativeTarget "PEPObjCTypes_macOS" */; buildPhases = ( 4E575854268329170084F02D /* Headers */, 4E575855268329170084F02D /* Sources */, @@ -357,14 +357,14 @@ ); dependencies = ( ); - name = PEPObjCAdapterTypes_macOS; + name = PEPObjCTypes_macOS; productName = PEPObjCAdapterTypes_macOS; - productReference = 4E575858268329170084F02D /* libPEPObjCAdapterTypes_macOS.a */; + productReference = 4E575858268329170084F02D /* libPEPObjCTypes_macOS.a */; productType = "com.apple.product-type.library.static"; }; - 4E575864268329A20084F02D /* PEPObjCAdapterTypes_iOS */ = { + 4E575864268329A20084F02D /* PEPObjCTypes_iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 4E57586B268329A20084F02D /* Build configuration list for PBXNativeTarget "PEPObjCAdapterTypes_iOS" */; + buildConfigurationList = 4E57586B268329A20084F02D /* Build configuration list for PBXNativeTarget "PEPObjCTypes_iOS" */; buildPhases = ( 4E5758A6268333140084F02D /* Headers */, 4E575861268329A20084F02D /* Sources */, @@ -376,14 +376,14 @@ ); dependencies = ( ); - name = PEPObjCAdapterTypes_iOS; + name = PEPObjCTypes_iOS; productName = PEPObjCAdapterTypes_iOS; - productReference = 4E575865268329A20084F02D /* libPEPObjCAdapterTypes_iOS.a */; + productReference = 4E575865268329A20084F02D /* libPEPObjCTypes_iOS.a */; productType = "com.apple.product-type.library.static"; }; - 4E5758BE26833D140084F02D /* PEPObjCAdapterTypesTests_iOS */ = { + 4E5758BE26833D140084F02D /* PEPObjCTypesTests_iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 4E5758C726833D140084F02D /* Build configuration list for PBXNativeTarget "PEPObjCAdapterTypesTests_iOS" */; + buildConfigurationList = 4E5758C726833D140084F02D /* Build configuration list for PBXNativeTarget "PEPObjCTypesTests_iOS" */; buildPhases = ( 4E5758BB26833D140084F02D /* Sources */, 4E5758BC26833D140084F02D /* Frameworks */, @@ -394,9 +394,9 @@ dependencies = ( 4E5758D826836A0C0084F02D /* PBXTargetDependency */, ); - name = PEPObjCAdapterTypesTests_iOS; + name = PEPObjCTypesTests_iOS; productName = PEPObjCAdapterTypesTests_iOS; - productReference = 4E5758BF26833D140084F02D /* PEPObjCAdapterTypesTests_iOS.xctest */; + productReference = 4E5758BF26833D140084F02D /* PEPObjCTypesTests_iOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -418,7 +418,7 @@ }; }; }; - buildConfigurationList = 4E575839268328CD0084F02D /* Build configuration list for PBXProject "PEPObjCAdapterTypes" */; + buildConfigurationList = 4E575839268328CD0084F02D /* Build configuration list for PBXProject "PEPObjCTypes" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -431,9 +431,9 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 4E575857268329170084F02D /* PEPObjCAdapterTypes_macOS */, - 4E575864268329A20084F02D /* PEPObjCAdapterTypes_iOS */, - 4E5758BE26833D140084F02D /* PEPObjCAdapterTypesTests_iOS */, + 4E575857268329170084F02D /* PEPObjCTypes_macOS */, + 4E575864268329A20084F02D /* PEPObjCTypes_iOS */, + 4E5758BE26833D140084F02D /* PEPObjCTypesTests_iOS */, ); }; /* End PBXProject section */ @@ -540,7 +540,7 @@ 4E5758D826836A0C0084F02D /* PBXTargetDependency */ = { isa = PBXTargetDependency; platformFilter = ios; - target = 4E575864268329A20084F02D /* PEPObjCAdapterTypes_iOS */; + target = 4E575864268329A20084F02D /* PEPObjCTypes_iOS */; targetProxy = 4E5758D726836A0C0084F02D /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -762,7 +762,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 4E575839268328CD0084F02D /* Build configuration list for PBXProject "PEPObjCAdapterTypes" */ = { + 4E575839268328CD0084F02D /* Build configuration list for PBXProject "PEPObjCTypes" */ = { isa = XCConfigurationList; buildConfigurations = ( 4E575845268328CD0084F02D /* Debug */, @@ -771,7 +771,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4E57585E268329170084F02D /* Build configuration list for PBXNativeTarget "PEPObjCAdapterTypes_macOS" */ = { + 4E57585E268329170084F02D /* Build configuration list for PBXNativeTarget "PEPObjCTypes_macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 4E57585F268329170084F02D /* Debug */, @@ -780,7 +780,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4E57586B268329A20084F02D /* Build configuration list for PBXNativeTarget "PEPObjCAdapterTypes_iOS" */ = { + 4E57586B268329A20084F02D /* Build configuration list for PBXNativeTarget "PEPObjCTypes_iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 4E57586C268329A20084F02D /* Debug */, @@ -789,7 +789,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4E5758C726833D140084F02D /* Build configuration list for PBXNativeTarget "PEPObjCAdapterTypesTests_iOS" */ = { + 4E5758C726833D140084F02D /* Build configuration list for PBXNativeTarget "PEPObjCTypesTests_iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 4E5758C826833D140084F02D /* Debug */, diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypesTests_iOS.xcscheme b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypesTests_iOS.xcscheme similarity index 88% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypesTests_iOS.xcscheme rename to Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypesTests_iOS.xcscheme index 9dcdf797..516b726c 100644 --- a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypesTests_iOS.xcscheme +++ b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypesTests_iOS.xcscheme @@ -17,9 +17,9 @@ + BuildableName = "PEPObjCTypesTests_iOS.xctest" + BlueprintName = "PEPObjCTypesTests_iOS" + ReferencedContainer = "container:PEPObjCTypes.xcodeproj"> diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_iOS.xcscheme b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_iOS.xcscheme similarity index 84% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_iOS.xcscheme rename to Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_iOS.xcscheme index 9f451f32..174f6a38 100644 --- a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_iOS.xcscheme +++ b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_iOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "libPEPObjCTypes_iOS.a" + BlueprintName = "PEPObjCTypes_iOS" + ReferencedContainer = "container:PEPObjCTypes.xcodeproj"> @@ -51,9 +51,9 @@ + BuildableName = "libPEPObjCTypes_iOS.a" + BlueprintName = "PEPObjCTypes_iOS" + ReferencedContainer = "container:PEPObjCTypes.xcodeproj"> diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_macOS.xcscheme b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_macOS.xcscheme similarity index 83% rename from Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_macOS.xcscheme rename to Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_macOS.xcscheme index c5967a02..ff4fac77 100644 --- a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_macOS.xcscheme +++ b/Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterTypes_macOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "libPEPObjCTypes_macOS.a" + BlueprintName = "PEPObjCTypes_macOS" + ReferencedContainer = "container:PEPObjCTypes.xcodeproj"> @@ -51,9 +51,9 @@ + BuildableName = "libPEPObjCTypes_macOS.a" + BlueprintName = "PEPObjCTypes_macOS" + ReferencedContainer = "container:PEPObjCTypes.xcodeproj"> diff --git a/pEpObjCAdapter.xcodeproj/project.pbxproj b/pEpObjCAdapter.xcodeproj/project.pbxproj index 8f7d3110..fbaf8cb1 100644 --- a/pEpObjCAdapter.xcodeproj/project.pbxproj +++ b/pEpObjCAdapter.xcodeproj/project.pbxproj @@ -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 */; }; @@ -211,20 +210,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 +224,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 +373,6 @@ 4360A9FE2227EBB200E62E5A /* NSNumber+PEPRating+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSNumber+PEPRating+Internal.h"; sourceTree = ""; }; 43676B631C57EA1A00233933 /* 0xB623F674.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 0xB623F674.asc; sourceTree = ""; }; 43676B641C57EA1A00233933 /* B623F674_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = B623F674_sec.asc; sourceTree = ""; }; - 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCAdapterTypes.xcodeproj; path = Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj; sourceTree = ""; }; 436C9A3124DC48B600007A3D /* PEPPassphraseUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPPassphraseUtil.h; sourceTree = ""; }; 436C9A3224DC48B600007A3D /* PEPPassphraseUtil.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPPassphraseUtil.m; sourceTree = ""; }; 436E916D24B65805000296FF /* PEPPassphraseProviderProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPPassphraseProviderProtocol.h; sourceTree = ""; }; @@ -409,6 +393,7 @@ 43E02A1D1C71F65B008F05E9 /* A3FC7F0A.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = A3FC7F0A.asc; sourceTree = ""; }; 43E1A7AB252B421D00307A7D /* Logger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = ""; }; 43F73BE92166248E00AB4524 /* PEPSync.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSync.m; sourceTree = ""; }; + 4E51BF3826CA5E5C007A2164 /* PEPObjCTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCTypes.xcodeproj; path = Subprojects/PEPObjCTypes/PEPObjCTypes.xcodeproj; sourceTree = ""; }; 4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCAdapterProtocols.xcodeproj; path = Subprojects/PEPObjCAdapterProtocols/PEPObjCAdapterProtocols.xcodeproj; sourceTree = ""; }; 640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5CB2C182_sec.asc; sourceTree = ""; }; 640F79221C9B517C00DBEC4E /* 5CB2C182.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5CB2C182.asc; sourceTree = ""; }; @@ -429,7 +414,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 */, ); @@ -567,7 +551,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 */, @@ -633,16 +617,6 @@ name = Frameworks; sourceTree = ""; }; - 436B444226837F78002624AB /* Products */ = { - isa = PBXGroup; - children = ( - 436B444926837F78002624AB /* libPEPObjCAdapterTypes_macOS.a */, - 436B444B26837F78002624AB /* libPEPObjCAdapterTypes_iOS.a */, - 436B444D26837F78002624AB /* PEPObjCAdapterTypesTests_iOS.xctest */, - ); - name = Products; - sourceTree = ""; - }; 438C0EE1254026E200337922 /* Extensions */ = { isa = PBXGroup; children = ( @@ -663,6 +637,16 @@ path = Extensions; sourceTree = ""; }; + 4E51BF3926CA5E5C007A2164 /* Products */ = { + isa = PBXGroup; + children = ( + 4E51BF3F26CA5E5C007A2164 /* libPEPObjCTypes_macOS.a */, + 4E51BF4126CA5E5C007A2164 /* libPEPObjCTypes_iOS.a */, + 4E51BF4326CA5E5C007A2164 /* PEPObjCTypesTests_iOS.xctest */, + ); + name = Products; + sourceTree = ""; + }; 4EEB4CCA2680E56A00161040 /* Products */ = { isa = PBXGroup; children = ( @@ -792,7 +776,6 @@ buildRules = ( ); dependencies = ( - 1585ED8A269C77E500B822E1 /* PBXTargetDependency */, 1585ECE4269C5FC900B822E1 /* PBXTargetDependency */, 1585EC7B269C458700B822E1 /* PBXTargetDependency */, 430D78E22681E1CF00B12650 /* PBXTargetDependency */, @@ -814,7 +797,6 @@ buildRules = ( ); dependencies = ( - 1585ED8C269C77F000B822E1 /* PBXTargetDependency */, 1585ED83269C77BE00B822E1 /* PBXTargetDependency */, 1585EC7D269C459300B822E1 /* PBXTargetDependency */, 4E57580F26821A660084F02D /* PBXTargetDependency */, @@ -890,8 +872,8 @@ ProjectRef = 4EEB4CC92680E56A00161040 /* PEPObjCAdapterProtocols.xcodeproj */; }, { - ProductGroup = 436B444226837F78002624AB /* Products */; - ProjectRef = 436B444126837F78002624AB /* PEPObjCAdapterTypes.xcodeproj */; + ProductGroup = 4E51BF3926CA5E5C007A2164 /* Products */; + ProjectRef = 4E51BF3826CA5E5C007A2164 /* PEPObjCTypes.xcodeproj */; }, { ProductGroup = 1585EC4B269C38FB00B822E1 /* Products */; @@ -936,32 +918,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 */ = { @@ -1153,16 +1135,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; diff --git a/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme b/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme index 5fd85659..a69ceb47 100644 --- a/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme +++ b/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme @@ -99,9 +99,9 @@ + BuildableName = "libPEPObjCTypes_iOS.a" + BlueprintName = "PEPObjCTypes_iOS" + ReferencedContainer = "container:Subprojects/PEPObjCAdapterTypes/PEPObjCTypes.xcodeproj"> + BuildableName = "PEPObjCTypesTests_iOS.xctest" + BlueprintName = "PEPObjCTypesTests_iOS" + ReferencedContainer = "container:Subprojects/PEPObjCAdapterTypes/PEPObjCTypes.xcodeproj">