IOS-1542 Use secret.xcconfig from extra repo/folder. IOS-1542
authorDirk Zimmermann <dz@pep.security>
Wed, 08 May 2019 15:52:44 +0200
branchIOS-1542
changeset 8531cbba14b01dea
parent 8530 4674e4a9f48d
child 8532 f125044bbfae
IOS-1542 Use secret.xcconfig from extra repo/folder.
README.md
pEpForiOS.xcodeproj/project.pbxproj
pEpForiOS/public.xcconfig
     1.1 --- a/README.md	Wed May 08 15:52:44 2019 +0200
     1.2 +++ b/README.md	Wed May 08 15:52:44 2019 +0200
     1.3 @@ -102,7 +102,7 @@
     1.4  
     1.5  ### secret.xcconfig (needed for OAuth2 config secrects and others)
     1.6  
     1.7 -Create secret.xcconfig @ pEpForiOS/secret.xcconfig, with those contents:
     1.8 +Create secret.xcconfig @ pEpForiOS/../pEp_for_iOS_intern/secret.xcconfig, with those contents:
     1.9  
    1.10  ```
    1.11  OAUTH2_GMAIL_CLIENT_ID = some_content
     2.1 --- a/pEpForiOS.xcodeproj/project.pbxproj	Wed May 08 15:52:44 2019 +0200
     2.2 +++ b/pEpForiOS.xcodeproj/project.pbxproj	Wed May 08 15:52:44 2019 +0200
     2.3 @@ -280,6 +280,7 @@
     2.4  		436795FF1EE98F6E00B03E23 /* CommunicationTypeTests_test001@peptest.ch_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 436795FD1EE98F6E00B03E23 /* CommunicationTypeTests_test001@peptest.ch_sec.asc */; };
     2.5  		436796001EE98F6E00B03E23 /* CommunicationTypeTests_test001@peptest.ch.asc in Resources */ = {isa = PBXBuildFile; fileRef = 436795FE1EE98F6E00B03E23 /* CommunicationTypeTests_test001@peptest.ch.asc */; };
     2.6  		436796021EE9909100B03E23 /* CommunicationTypeTests_Message_test001_to_test002.txt in Resources */ = {isa = PBXBuildFile; fileRef = 436796011EE9909100B03E23 /* CommunicationTypeTests_Message_test001_to_test002.txt */; };
     2.7 +		436981AD2282F6460006FA2D /* secret.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 436981AC2282F6460006FA2D /* secret.xcconfig */; };
     2.8  		436D0066215B5F3800966CC2 /* Undisplayable_HTML_Message.txt in Resources */ = {isa = PBXBuildFile; fileRef = 436D0065215B5F3800966CC2 /* Undisplayable_HTML_Message.txt */; };
     2.9  		436F8E141D36706A007E9829 /* StringExtensionsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436F8E131D36706A007E9829 /* StringExtensionsTest.swift */; };
    2.10  		437027A122315B5700A77AEC /* PEPAppUtilWrappers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437027A022315B5700A77AEC /* PEPAppUtilWrappers.swift */; };
    2.11 @@ -780,6 +781,7 @@
    2.12  		436795FD1EE98F6E00B03E23 /* CommunicationTypeTests_test001@peptest.ch_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CommunicationTypeTests_test001@peptest.ch_sec.asc"; sourceTree = "<group>"; };
    2.13  		436795FE1EE98F6E00B03E23 /* CommunicationTypeTests_test001@peptest.ch.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CommunicationTypeTests_test001@peptest.ch.asc"; sourceTree = "<group>"; };
    2.14  		436796011EE9909100B03E23 /* CommunicationTypeTests_Message_test001_to_test002.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CommunicationTypeTests_Message_test001_to_test002.txt; sourceTree = "<group>"; };
    2.15 +		436981AC2282F6460006FA2D /* secret.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = secret.xcconfig; path = ../../pEp_for_iOS_intern/secret.xcconfig; sourceTree = "<group>"; };
    2.16  		436C5A8D1CFEDF59006A195F /* UIHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIHelper.swift; sourceTree = "<group>"; };
    2.17  		436D0065215B5F3800966CC2 /* Undisplayable_HTML_Message.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Undisplayable_HTML_Message.txt; sourceTree = "<group>"; };
    2.18  		436F8E131D36706A007E9829 /* StringExtensionsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExtensionsTest.swift; sourceTree = "<group>"; };
    2.19 @@ -836,7 +838,6 @@
    2.20  		43AE48E61EEFC93900B92BB6 /* DebugMergePolicy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DebugMergePolicy.swift; sourceTree = "<group>"; };
    2.21  		43B0443820067CC7007BCE3F /* UIAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIAccount.swift; sourceTree = "<group>"; };
    2.22  		43B0443A20067D25007BCE3F /* UITestDataProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITestDataProtocol.swift; sourceTree = "<group>"; };
    2.23 -		43B044412007683E007BCE3F /* secret.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = secret.xcconfig; sourceTree = "<group>"; };
    2.24  		43B0444B20077323007BCE3F /* OAuth2Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OAuth2Configuration.swift; sourceTree = "<group>"; };
    2.25  		43B10C7F1EC2EE7F003E849F /* CppDummy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CppDummy.cpp; sourceTree = "<group>"; };
    2.26  		43B2C3161D2280ED00A08557 /* 5A90_3590_0E48_AB85_F3DB__045E_4623_C5D1_EAB6_643E.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5A90_3590_0E48_AB85_F3DB__045E_4623_C5D1_EAB6_643E.asc; sourceTree = "<group>"; };
    2.27 @@ -1794,8 +1795,8 @@
    2.28  				43980E351CBD0BCA00A7FC3C /* Info.plist */,
    2.29  				43C98AC5219C3691006418B0 /* InfoPlist.strings */,
    2.30  				43C98AC1219C275E006418B0 /* Localizable.strings */,
    2.31 +				436981AC2282F6460006FA2D /* secret.xcconfig */,
    2.32  				4388A0E02008AF61008CB98D /* public.xcconfig */,
    2.33 -				43B044412007683E007BCE3F /* secret.xcconfig */,
    2.34  				433724FC1DA2C2B1005E8DF5 /* pEp.entitlements */,
    2.35  				430C80D41D0EAB6E00CD4582 /* pEpTrustWords.bundle */,
    2.36  			);
    2.37 @@ -2576,6 +2577,7 @@
    2.38  				1526596C216230B1006A78DF /* ComposeData.plist in Resources */,
    2.39  				43980E341CBD0BCA00A7FC3C /* LaunchScreen.storyboard in Resources */,
    2.40  				155F2D9E20530798001B4B1C /* Reusable.storyboard in Resources */,
    2.41 +				436981AD2282F6460006FA2D /* secret.xcconfig in Resources */,
    2.42  				220DCE2F1E0AB544002FE716 /* MessageData.plist in Resources */,
    2.43  				432E80FE2191AF5100359879 /* UniversLTStd-Bold.otf in Resources */,
    2.44  				43980E311CBD0BCA00A7FC3C /* Assets.xcassets in Resources */,
     3.1 --- a/pEpForiOS/public.xcconfig	Wed May 08 15:52:44 2019 +0200
     3.2 +++ b/pEpForiOS/public.xcconfig	Wed May 08 15:52:44 2019 +0200
     3.3 @@ -6,5 +6,5 @@
     3.4  //  Copyright © 2018 p≡p Security S.A. All rights reserved.
     3.5  //
     3.6  
     3.7 -#include "secret.xcconfig"
     3.8 +#include "../pEp_for_iOS_intern/secret.xcconfig"
     3.9