From f4a398de1d9761ac171a5ffc888fd9d3a7f7838e Mon Sep 17 00:00:00 2001 From: buff Date: Thu, 3 Dec 2020 17:17:47 +0100 Subject: [PATCH] IOSAD-186 adds ObjCAdapter static lib target --- PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.h | 13 ++ PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.m | 13 ++ pEpObjCAdapter.xcodeproj/project.pbxproj | 144 +++++++++++++++++++++++ pEpObjCAdapter/PEPInternalSession.m | 2 +- 4 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.h create mode 100644 PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.m diff --git a/PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.h b/PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.h new file mode 100644 index 0000000..48a793b --- /dev/null +++ b/PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.h @@ -0,0 +1,13 @@ +// +// PEPObjCAdapter_iOS.h +// PEPObjCAdapter_iOS +// +// Created by Andreas Buff on 03.12.20. +// Copyright © 2020 p≡p. All rights reserved. +// + +#import + +@interface PEPObjCAdapter_iOS : NSObject + +@end diff --git a/PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.m b/PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.m new file mode 100644 index 0000000..f262d71 --- /dev/null +++ b/PEPObjCAdapter_iOS/PEPObjCAdapter_iOS.m @@ -0,0 +1,13 @@ +// +// PEPObjCAdapter_iOS.m +// PEPObjCAdapter_iOS +// +// Created by Andreas Buff on 03.12.20. +// Copyright © 2020 p≡p. All rights reserved. +// + +#import "PEPObjCAdapter_iOS.h" + +@implementation PEPObjCAdapter_iOS + +@end diff --git a/pEpObjCAdapter.xcodeproj/project.pbxproj b/pEpObjCAdapter.xcodeproj/project.pbxproj index 774ca70..9db2d1a 100644 --- a/pEpObjCAdapter.xcodeproj/project.pbxproj +++ b/pEpObjCAdapter.xcodeproj/project.pbxproj @@ -18,6 +18,21 @@ 152A9C472010F50400F962ED /* PEPInternalSessionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 152A9C462010F50400F962ED /* PEPInternalSessionTest.m */; }; 1543D9E02577EF260041EFB5 /* libpEpEngine_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1552DCBD2577E0B600A92F71 /* libpEpEngine_macOS.a */; }; 1543DA892577FE230041EFB5 /* libPEPObjCAdapterTypes_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 150E8FB225755B6900AE2198 /* libPEPObjCAdapterTypes_macOS.a */; }; + 1543DC6A257943CF0041EFB5 /* PEPObjCAdapter_iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 1543DC69257943CF0041EFB5 /* PEPObjCAdapter_iOS.m */; }; + 1543DC6B257943CF0041EFB5 /* PEPObjCAdapter_iOS.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1543DC68257943CE0041EFB5 /* PEPObjCAdapter_iOS.h */; }; + 1543DC89257944660041EFB5 /* PEPCSVScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 43209B291ECC2ACD007E7E2E /* PEPCSVScanner.m */; }; + 1543DC902579446F0041EFB5 /* PEPObjCAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 43209B301ECC2ACD007E7E2E /* PEPObjCAdapter.m */; }; + 1543DC97257944C00041EFB5 /* PEPQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 43209B321ECC2ACD007E7E2E /* PEPQueue.m */; }; + 1543DC9E257944C40041EFB5 /* PEPInternalSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 43209B351ECC2ACD007E7E2E /* PEPInternalSession.m */; }; + 1543DCA5257944C70041EFB5 /* PEPCopyableThread.m in Sources */ = {isa = PBXBuildFile; fileRef = 1508AEAE1F8792AC001D5230 /* PEPCopyableThread.m */; }; + 1543DCA6257944CB0041EFB5 /* PEPSessionProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 15206CA91F8BA183003FF880 /* PEPSessionProvider.m */; }; + 1543DCAD257944CE0041EFB5 /* PEPAutoPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = 434ED6D5207E27B8000A7590 /* PEPAutoPointer.m */; }; + 1543DCAE257944D20041EFB5 /* PEPSync.m in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BE92166248E00AB4524 /* PEPSync.m */; }; + 1543DCB5257944DC0041EFB5 /* PEPInternalConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 43AD0E2F22E99ECE00D46F56 /* PEPInternalConstants.m */; }; + 1543DCBC257944E80041EFB5 /* PEPPassphraseCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 43589EF624A4A3B70079BEA2 /* PEPPassphraseCache.m */; }; + 1543DCC3257944EB0041EFB5 /* PEPPassphraseCacheEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DFBAB24A5E04000AB373B /* PEPPassphraseCacheEntry.m */; }; + 1543DCCA257944EF0041EFB5 /* PEPSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 434707F524C210CA00E05485 /* PEPSession.m */; }; + 1543DCD1257944F10041EFB5 /* PEPPassphraseUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 436C9A3224DC48B600007A3D /* PEPPassphraseUtil.m */; }; 1552D92325765EC900A92F71 /* NSObject+Extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B109FA2575510300D06C34 /* NSObject+Extension.h */; }; 1552D92825765EDC00A92F71 /* PEPLanguage.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B107A7257520DE00D06C34 /* PEPLanguage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1552D92925765EDC00A92F71 /* PEPSessionProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B109E525754F8100D06C34 /* PEPSessionProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -229,6 +244,16 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 1543DC64257943CE0041EFB5 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + 1543DC6B257943CF0041EFB5 /* PEPObjCAdapter_iOS.h in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 15B10795257520B200D06C34 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -250,6 +275,9 @@ 15206CA81F8BA183003FF880 /* PEPSessionProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSessionProvider.h; sourceTree = ""; }; 15206CA91F8BA183003FF880 /* PEPSessionProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSessionProvider.m; sourceTree = ""; }; 152A9C462010F50400F962ED /* PEPInternalSessionTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPInternalSessionTest.m; sourceTree = ""; }; + 1543DC66257943CE0041EFB5 /* libPEPObjCAdapter_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCAdapter_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1543DC68257943CE0041EFB5 /* PEPObjCAdapter_iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapter_iOS.h; sourceTree = ""; }; + 1543DC69257943CF0041EFB5 /* PEPObjCAdapter_iOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapter_iOS.m; sourceTree = ""; }; 1552D93B2576602D00A92F71 /* libPEPObjCAdapter_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCAdapter_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; 1552D93D2576602D00A92F71 /* PEPObjCAdapter_macOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapter_macOS.h; sourceTree = ""; }; 1552D93F2576602D00A92F71 /* PEPObjCAdapter_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapter_macOS.m; sourceTree = ""; }; @@ -383,6 +411,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 1543DC63257943CE0041EFB5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 1552D9392576602D00A92F71 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -434,6 +469,15 @@ path = PEPObjCAdapterTypes_macOS; sourceTree = ""; }; + 1543DC67257943CE0041EFB5 /* PEPObjCAdapter_iOS */ = { + isa = PBXGroup; + children = ( + 1543DC68257943CE0041EFB5 /* PEPObjCAdapter_iOS.h */, + 1543DC69257943CF0041EFB5 /* PEPObjCAdapter_iOS.m */, + ); + path = PEPObjCAdapter_iOS; + sourceTree = ""; + }; 1552D93C2576602D00A92F71 /* PEPObjCAdapter_macOS */ = { isa = PBXGroup; children = ( @@ -557,6 +601,7 @@ 15B10798257520B200D06C34 /* PEPObjCAdapterTypes */, 150E8FB325755B6900AE2198 /* PEPObjCAdapterTypes_macOS */, 1552D93C2576602D00A92F71 /* PEPObjCAdapter_macOS */, + 1543DC67257943CE0041EFB5 /* PEPObjCAdapter_iOS */, 352988AB1AEF964100FA7E2E /* Products */, 43447C51221D448500B6323E /* Frameworks */, ); @@ -570,6 +615,7 @@ 15B10797257520B200D06C34 /* libPEPObjCAdapterTypes_iOS.a */, 150E8FB225755B6900AE2198 /* libPEPObjCAdapterTypes_macOS.a */, 1552D93B2576602D00A92F71 /* libPEPObjCAdapter_macOS.a */, + 1543DC66257943CE0041EFB5 /* libPEPObjCAdapter_iOS.a */, ); name = Products; sourceTree = ""; @@ -794,6 +840,23 @@ productReference = 150E8FB225755B6900AE2198 /* libPEPObjCAdapterTypes_macOS.a */; productType = "com.apple.product-type.library.static"; }; + 1543DC65257943CE0041EFB5 /* PEPObjCAdapter_iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1543DC6F257943CF0041EFB5 /* Build configuration list for PBXNativeTarget "PEPObjCAdapter_iOS" */; + buildPhases = ( + 1543DC62257943CE0041EFB5 /* Sources */, + 1543DC63257943CE0041EFB5 /* Frameworks */, + 1543DC64257943CE0041EFB5 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = PEPObjCAdapter_iOS; + productName = PEPObjCAdapter_iOS; + productReference = 1543DC66257943CE0041EFB5 /* libPEPObjCAdapter_iOS.a */; + productType = "com.apple.product-type.library.static"; + }; 1552D93A2576602D00A92F71 /* PEPObjCAdapter_macOS */ = { isa = PBXNativeTarget; buildConfigurationList = 1552D9412576602D00A92F71 /* Build configuration list for PBXNativeTarget "PEPObjCAdapter_macOS" */; @@ -881,6 +944,9 @@ 150E8FB125755B6900AE2198 = { CreatedOnToolsVersion = 12.2; }; + 1543DC65257943CE0041EFB5 = { + CreatedOnToolsVersion = 12.2; + }; 1552D93A2576602D00A92F71 = { CreatedOnToolsVersion = 12.2; }; @@ -918,6 +984,7 @@ projectRoot = ""; targets = ( 43E3985A221D7E56008E7983 /* PEPObjCAdapterFramework */, + 1543DC65257943CE0041EFB5 /* PEPObjCAdapter_iOS */, 1552D93A2576602D00A92F71 /* PEPObjCAdapter_macOS */, 64415E161BE94FCB00F6CBB2 /* pEpObjCAdapterTests */, 15B10796257520B200D06C34 /* PEPObjCAdapterTypes_iOS */, @@ -1042,6 +1109,27 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 1543DC62257943CE0041EFB5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 1543DCA5257944C70041EFB5 /* PEPCopyableThread.m in Sources */, + 1543DCD1257944F10041EFB5 /* PEPPassphraseUtil.m in Sources */, + 1543DCCA257944EF0041EFB5 /* PEPSession.m in Sources */, + 1543DCAE257944D20041EFB5 /* PEPSync.m in Sources */, + 1543DCBC257944E80041EFB5 /* PEPPassphraseCache.m in Sources */, + 1543DC902579446F0041EFB5 /* PEPObjCAdapter.m in Sources */, + 1543DCAD257944CE0041EFB5 /* PEPAutoPointer.m in Sources */, + 1543DC6A257943CF0041EFB5 /* PEPObjCAdapter_iOS.m in Sources */, + 1543DC89257944660041EFB5 /* PEPCSVScanner.m in Sources */, + 1543DCB5257944DC0041EFB5 /* PEPInternalConstants.m in Sources */, + 1543DC9E257944C40041EFB5 /* PEPInternalSession.m in Sources */, + 1543DCC3257944EB0041EFB5 /* PEPPassphraseCacheEntry.m in Sources */, + 1543DCA6257944CB0041EFB5 /* PEPSessionProvider.m in Sources */, + 1543DC97257944C00041EFB5 /* PEPQueue.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 1552D9382576602D00A92F71 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1206,6 +1294,53 @@ }; name = Release; }; + 1543DC6C257943CF0041EFB5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = NQLYU6MGPN; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + IPHONEOS_DEPLOYMENT_TARGET = 14.2; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 1543DC6D257943CF0041EFB5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = NQLYU6MGPN; + GCC_C_LANGUAGE_STANDARD = gnu11; + IPHONEOS_DEPLOYMENT_TARGET = 14.2; + MTL_FAST_MATH = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; 1552D9422576602D00A92F71 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1583,6 +1718,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 1543DC6F257943CF0041EFB5 /* Build configuration list for PBXNativeTarget "PEPObjCAdapter_iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1543DC6C257943CF0041EFB5 /* Debug */, + 1543DC6D257943CF0041EFB5 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 1552D9412576602D00A92F71 /* Build configuration list for PBXNativeTarget "PEPObjCAdapter_macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/pEpObjCAdapter/PEPInternalSession.m b/pEpObjCAdapter/PEPInternalSession.m index 2f5905e..319a066 100644 --- a/pEpObjCAdapter/PEPInternalSession.m +++ b/pEpObjCAdapter/PEPInternalSession.m @@ -20,7 +20,7 @@ #import "NSError+PEP+Internal.h" #import "PEPAutoPointer.h" #import "NSNumber+PEPRating.h" -#import +#import "PEPSync.h" #import "PEPSync_Internal.h" // for [PEPSync createSession:] #import "PEPInternalConstants.h" #import "PEPPassphraseCache.h"