Backed out changeset a6cff3b2cc82 IOS-1483
authorbuff <andreas@pep-project.org>
Tue, 18 Jun 2019 15:52:46 +0200
branchIOS-1483
changeset 1033c59ec180fd5e
parent 1032 2615ae761b34
child 1034 28384959ce22
Backed out changeset a6cff3b2cc82
pEpObjCAdapter.xcodeproj/project.pbxproj
     1.1 --- a/pEpObjCAdapter.xcodeproj/project.pbxproj	Tue Jun 18 14:12:27 2019 +0200
     1.2 +++ b/pEpObjCAdapter.xcodeproj/project.pbxproj	Tue Jun 18 15:52:46 2019 +0200
     1.3 @@ -9,9 +9,14 @@
     1.4  /* Begin PBXBuildFile section */
     1.5  		152A9C472010F50400F962ED /* PEPSessionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 152A9C462010F50400F962ED /* PEPSessionTest.m */; };
     1.6  		152D58EF201B6DB200036219 /* PEPMessageUtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 152D58EE201B6DB200036219 /* PEPMessageUtilTest.m */; };
     1.7 -		1549179322B8EAF20091B6D6 /* libiconv.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1549179222B8EAF20091B6D6 /* libiconv.2.tbd */; };
     1.8 -		1549179A22B8ECC10091B6D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1549179922B8ECA20091B6D6 /* libz.dylib */; };
     1.9 -		1549179B22B8ED850091B6D6 /* libiconv.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1549179222B8EAF20091B6D6 /* libiconv.2.tbd */; };
    1.10 +		155674D722B7F9C70097930C /* libsequoia_openpgp_ffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 155674D522B7F9A80097930C /* libsequoia_openpgp_ffi.a */; };
    1.11 +		155674E122B828A70097930C /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 155674DE22B828A60097930C /* libgmp.a */; };
    1.12 +		155674E222B828A70097930C /* libhogweed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 155674DF22B828A60097930C /* libhogweed.a */; };
    1.13 +		155674E322B828A70097930C /* libnettle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 155674E022B828A60097930C /* libnettle.a */; };
    1.14 +		155674E422B829250097930C /* libnettle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 155674E022B828A60097930C /* libnettle.a */; };
    1.15 +		155674E522B8294A0097930C /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 155674DE22B828A60097930C /* libgmp.a */; };
    1.16 +		155674E622B8294A0097930C /* libhogweed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 155674DF22B828A60097930C /* libhogweed.a */; };
    1.17 +		155674ED22B82D710097930C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 155674EC22B82D710097930C /* libz.dylib */; };
    1.18  		15D3D761200F61BB00A0DA20 /* PEPSessionProviderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 15D3D760200F61BB00A0DA20 /* PEPSessionProviderTest.m */; };
    1.19  		430CD9B12292AC4900AAC37F /* PEPSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 430CD9B02292AC4900AAC37F /* PEPSync.h */; settings = {ATTRIBUTES = (Public, ); }; };
    1.20  		430CD9B62292ADAC00AAC37F /* PEPSendMessageDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 430CD9B52292ADAC00AAC37F /* PEPSendMessageDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
    1.21 @@ -70,9 +75,13 @@
    1.22  		43E02A231C71F65B008F05E9 /* msg_to_A3FC7F0A_from_mutt.ser in Resources */ = {isa = PBXBuildFile; fileRef = 43E02A1F1C71F65B008F05E9 /* msg_to_A3FC7F0A_from_mutt.ser */; };
    1.23  		43E3985F221D7E56008E7983 /* PEPObjCAdapterFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = 43E3985D221D7E56008E7983 /* PEPObjCAdapterFramework.h */; settings = {ATTRIBUTES = (Public, ); }; };
    1.24  		43E39867221D7EB1008E7983 /* libpEpEngine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64289E561B8B70E800FC617B /* libpEpEngine.a */; };
    1.25 +		43E39869221D7EC2008E7983 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 43E39868221D7EC2008E7983 /* libbz2.tbd */; };
    1.26 +		43E3986B221D7EDD008E7983 /* libiconv.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 43E3986A221D7EDD008E7983 /* libiconv.2.tbd */; };
    1.27  		43FF2ED12226AFE9000D9567 /* PEPEngineTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 43FF2ECC2226AE7E000D9567 /* PEPEngineTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
    1.28  		640F79231C9B517C00DBEC4E /* 5CB2C182_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */; };
    1.29  		640F79241C9B517C00DBEC4E /* 5CB2C182.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79221C9B517C00DBEC4E /* 5CB2C182.asc */; };
    1.30 +		64415E2F1BE9511C00F6CBB2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35FB0ABD1B57F99D00377032 /* Security.framework */; };
    1.31 +		64415E301BE9513300F6CBB2 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35FB0ABB1B57F97E00377032 /* CFNetwork.framework */; };
    1.32  		64415E411BE95C2800F6CBB2 /* pEpTrustWords.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 64AE6B211BE15E3A000867E4 /* pEpTrustWords.bundle */; };
    1.33  		64415E481BEA523300F6CBB2 /* 6FF00E97.asc in Resources */ = {isa = PBXBuildFile; fileRef = 64415E421BEA523300F6CBB2 /* 6FF00E97.asc */; };
    1.34  		64415E491BEA523300F6CBB2 /* 6FF00E97_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 64415E431BEA523300F6CBB2 /* 6FF00E97_sec.asc */; };
    1.35 @@ -129,13 +138,18 @@
    1.36  		15206CC61F8E078B003FF880 /* PEPSession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSession.m; sourceTree = "<group>"; };
    1.37  		152A9C462010F50400F962ED /* PEPSessionTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSessionTest.m; sourceTree = "<group>"; };
    1.38  		152D58EE201B6DB200036219 /* PEPMessageUtilTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPMessageUtilTest.m; sourceTree = "<group>"; };
    1.39 -		1549177B22B8DF500091B6D6 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
    1.40 -		1549177C22B8DF550091B6D6 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
    1.41 -		1549179222B8EAF20091B6D6 /* libiconv.2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.2.tbd; path = usr/lib/libiconv.2.tbd; sourceTree = SDKROOT; };
    1.42 -		1549179922B8ECA20091B6D6 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
    1.43 +		155674D322B7F9670097930C /* libsequoia_openpgp_ffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsequoia_openpgp_ffi.a; path = ../Sequoia4iOS/build/lib/libsequoia_openpgp_ffi.a; sourceTree = "<group>"; };
    1.44 +		155674D522B7F9A80097930C /* libsequoia_openpgp_ffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsequoia_openpgp_ffi.a; path = ../Sequoia4iOS/build/lib/libsequoia_openpgp_ffi.a; sourceTree = "<group>"; };
    1.45 +		155674DE22B828A60097930C /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgmp.a; path = ../Sequoia4iOS/build/lib/libgmp.a; sourceTree = "<group>"; };
    1.46 +		155674DF22B828A60097930C /* libhogweed.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhogweed.a; path = ../Sequoia4iOS/build/lib/libhogweed.a; sourceTree = "<group>"; };
    1.47 +		155674E022B828A60097930C /* libnettle.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libnettle.a; path = ../Sequoia4iOS/build/lib/libnettle.a; sourceTree = "<group>"; };
    1.48 +		155674EA22B82BDA0097930C /* libetpan-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libetpan-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; };
    1.49 +		155674EC22B82D710097930C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
    1.50  		15D3D760200F61BB00A0DA20 /* PEPSessionProviderTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSessionProviderTest.m; sourceTree = "<group>"; };
    1.51  		15D3D77B2010DDC500A0DA20 /* PEPTestUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPTestUtils.h; sourceTree = "<group>"; };
    1.52  		15D3D77C2010DDC500A0DA20 /* PEPTestUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPTestUtils.m; sourceTree = "<group>"; };
    1.53 +		35FB0ABB1B57F97E00377032 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
    1.54 +		35FB0ABD1B57F99D00377032 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
    1.55  		430CD9B02292AC4900AAC37F /* PEPSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PEPSync.h; path = pEpObjCAdapterFramework/PEPSync.h; sourceTree = SOURCE_ROOT; };
    1.56  		430CD9B52292ADAC00AAC37F /* PEPSendMessageDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PEPSendMessageDelegate.h; path = pEpObjCAdapterFramework/PEPSendMessageDelegate.h; sourceTree = SOURCE_ROOT; };
    1.57  		430CD9BA2292AEDD00AAC37F /* PEPNotifyHandshakeDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PEPNotifyHandshakeDelegate.h; path = pEpObjCAdapterFramework/PEPNotifyHandshakeDelegate.h; sourceTree = SOURCE_ROOT; };
    1.58 @@ -204,6 +218,8 @@
    1.59  		43E3985B221D7E56008E7983 /* PEPObjCAdapterFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PEPObjCAdapterFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    1.60  		43E3985D221D7E56008E7983 /* PEPObjCAdapterFramework.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapterFramework.h; sourceTree = "<group>"; };
    1.61  		43E3985E221D7E56008E7983 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
    1.62 +		43E39868221D7EC2008E7983 /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
    1.63 +		43E3986A221D7EDD008E7983 /* libiconv.2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.2.tbd; path = usr/lib/libiconv.2.tbd; sourceTree = SDKROOT; };
    1.64  		43F73BD22165F6EC00AB4524 /* PEPLock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPLock.h; sourceTree = "<group>"; };
    1.65  		43F73BD32165F6EC00AB4524 /* PEPLock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPLock.m; sourceTree = "<group>"; };
    1.66  		43F73BE92166248E00AB4524 /* PEPSync.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSync.m; sourceTree = "<group>"; };
    1.67 @@ -226,9 +242,14 @@
    1.68  			isa = PBXFrameworksBuildPhase;
    1.69  			buildActionMask = 2147483647;
    1.70  			files = (
    1.71 +				155674E522B8294A0097930C /* libgmp.a in Frameworks */,
    1.72 +				155674E622B8294A0097930C /* libhogweed.a in Frameworks */,
    1.73 +				155674E422B829250097930C /* libnettle.a in Frameworks */,
    1.74 +				155674D722B7F9C70097930C /* libsequoia_openpgp_ffi.a in Frameworks */,
    1.75 +				43E3986B221D7EDD008E7983 /* libiconv.2.tbd in Frameworks */,
    1.76 +				43E39869221D7EC2008E7983 /* libbz2.tbd in Frameworks */,
    1.77 +				155674ED22B82D710097930C /* libz.dylib in Frameworks */,
    1.78  				43E39867221D7EB1008E7983 /* libpEpEngine.a in Frameworks */,
    1.79 -				1549179A22B8ECC10091B6D6 /* libz.dylib in Frameworks */,
    1.80 -				1549179B22B8ED850091B6D6 /* libiconv.2.tbd in Frameworks */,
    1.81  			);
    1.82  			runOnlyForDeploymentPostprocessing = 0;
    1.83  		};
    1.84 @@ -236,7 +257,11 @@
    1.85  			isa = PBXFrameworksBuildPhase;
    1.86  			buildActionMask = 2147483647;
    1.87  			files = (
    1.88 -				1549179322B8EAF20091B6D6 /* libiconv.2.tbd in Frameworks */,
    1.89 +				155674E322B828A70097930C /* libnettle.a in Frameworks */,
    1.90 +				64415E2F1BE9511C00F6CBB2 /* Security.framework in Frameworks */,
    1.91 +				155674E122B828A70097930C /* libgmp.a in Frameworks */,
    1.92 +				64415E301BE9513300F6CBB2 /* CFNetwork.framework in Frameworks */,
    1.93 +				155674E222B828A70097930C /* libhogweed.a in Frameworks */,
    1.94  			);
    1.95  			runOnlyForDeploymentPostprocessing = 0;
    1.96  		};
    1.97 @@ -288,7 +313,13 @@
    1.98  		352988A11AEF964100FA7E2E = {
    1.99  			isa = PBXGroup;
   1.100  			children = (
   1.101 +				155674DE22B828A60097930C /* libgmp.a */,
   1.102 +				155674DF22B828A60097930C /* libhogweed.a */,
   1.103 +				155674E022B828A60097930C /* libnettle.a */,
   1.104 +				155674D522B7F9A80097930C /* libsequoia_openpgp_ffi.a */,
   1.105  				64DA243B1B833248000BEE80 /* pEpEngine.xcodeproj */,
   1.106 +				35FB0ABD1B57F99D00377032 /* Security.framework */,
   1.107 +				35FB0ABB1B57F97E00377032 /* CFNetwork.framework */,
   1.108  				43209B251ECC2ACD007E7E2E /* pEpObjCAdapter */,
   1.109  				64415E181BE94FCB00F6CBB2 /* pEpObjCTests */,
   1.110  				43E3985C221D7E56008E7983 /* PEPObjCAdapterFramework */,
   1.111 @@ -355,10 +386,11 @@
   1.112  		43447C51221D448500B6323E /* Frameworks */ = {
   1.113  			isa = PBXGroup;
   1.114  			children = (
   1.115 -				1549179922B8ECA20091B6D6 /* libz.dylib */,
   1.116 -				1549179222B8EAF20091B6D6 /* libiconv.2.tbd */,
   1.117 -				1549177C22B8DF550091B6D6 /* Security.framework */,
   1.118 -				1549177B22B8DF500091B6D6 /* CFNetwork.framework */,
   1.119 +				155674EA22B82BDA0097930C /* libetpan-ios.a */,
   1.120 +				155674D322B7F9670097930C /* libsequoia_openpgp_ffi.a */,
   1.121 +				43E3986A221D7EDD008E7983 /* libiconv.2.tbd */,
   1.122 +				43E39868221D7EC2008E7983 /* libbz2.tbd */,
   1.123 +				155674EC22B82D710097930C /* libz.dylib */,
   1.124  			);
   1.125  			name = Frameworks;
   1.126  			sourceTree = "<group>";