Skip to content

Commit dd9da3b

Browse files
chrisballingerchrisballinger
authored
Merge pull request #1155 from ChatSecure/xcode-11
Xcode 11 updates
2 parents c862735 + f7fdb66 commit dd9da3b

File tree

374 files changed

+3977
-2629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

374 files changed

+3977
-2629
lines changed

‎.travis.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode10.2
1+
osx_image: xcode11.3
22
language: objective-c
33

44
# Handle git submodules yourself
@@ -9,7 +9,7 @@ git:
99
# Use sed to replace the SSH URL with the public URL, then initialize submodules
1010
before_install:
1111
# Fix Travis xcodebuild exited with 65 https://github.com/travis-ci/travis-ci/issues/6675#issuecomment-257964767
12-
- export IOS_SIMULATOR_UDID=`instruments -s devices | grep -m 1 "iPhone 8 (12" | awk -F '[ ]' '{print $4}' | awk -F '[\[]' '{print $2}' | sed 's/.$//'`
12+
- export IOS_SIMULATOR_UDID=`instruments -s devices | grep -m 1 "iPhone 8 (13" | awk -F '[ ]' '{print $4}' | awk -F '[\[]' '{print $2}' | sed 's/.$//'`
1313
- echo $IOS_SIMULATOR_UDID
1414
- bundle install # We need a pre-release CocoaPods version
1515
- sed -i -e 's/[email protected]:/git:\/\/github.com\//' .gitmodules
@@ -21,10 +21,8 @@ install:
2121
- curl -L https://github.com/ChatSecure/ChatSecure-iOS-Precompiled-Dependencies/archive/master.zip -o ChatSecure-iOS-Precompiled-Dependencies.zip
2222
- unzip -q ChatSecure-iOS-Precompiled-Dependencies.zip
2323
- mv ChatSecure-iOS-Precompiled-Dependencies-master ChatSecure-iOS-Precompiled-Dependencies
24-
- mkdir -p ./Carthage/Build/iOS/
25-
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/CPAProxyDependencies-iOS.zip -d ./Submodules/CPAProxy/
26-
- cp -r ./Submodules/CPAProxy/CPAProxyDependencies-iOS ./Submodules/CPAProxy/CPAProxyDependencies-macOS
27-
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/OTRKitDependencies-iOS.zip -d ./Submodules/OTRKit/
24+
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/CPAProxyDependencies.zip -d ./Submodules/CPAProxy/
25+
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/OTRKitDependencies.zip -d ./Submodules/OTRKit/
2826
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/Pods.zip
2927

3028
before_script:

‎ChatSecure.xcodeproj/project.pbxproj

+2,706-1,436
Large diffs are not rendered by default.

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure (Mac).xcscheme

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1120"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "6396AF991A169D54009F3E6C"
18+
BuildableName = "ChatSecure.app"
19+
BlueprintName = "ChatSecure"
20+
ReferencedContainer = "container:ChatSecure.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "NO">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "6396AFB21A169D54009F3E6C"
32+
BuildableName = "ChatSecureTests.xctest"
33+
BlueprintName = "ChatSecureTests"
34+
ReferencedContainer = "container:ChatSecure.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
</BuildActionEntries>
38+
</BuildAction>
39+
<TestAction
40+
buildConfiguration = "macOS_Debug"
41+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
42+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
disableMainThreadChecker = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "6396AF991A169D54009F3E6C"
49+
BuildableName = "ChatSecure.app"
50+
BlueprintName = "ChatSecure"
51+
ReferencedContainer = "container:ChatSecure.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<Testables>
55+
<TestableReference
56+
skipped = "NO">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "6396AFB21A169D54009F3E6C"
60+
BuildableName = "ChatSecureTests.xctest"
61+
BlueprintName = "ChatSecureTests"
62+
ReferencedContainer = "container:ChatSecure.xcodeproj">
63+
</BuildableReference>
64+
</TestableReference>
65+
<TestableReference
66+
skipped = "YES">
67+
<BuildableReference
68+
BuildableIdentifier = "primary"
69+
BlueprintIdentifier = "6365CEFB1E2453F6009E213F"
70+
BuildableName = "ChatSecureUITests.xctest"
71+
BlueprintName = "ChatSecureUITests"
72+
ReferencedContainer = "container:ChatSecure.xcodeproj">
73+
</BuildableReference>
74+
</TestableReference>
75+
</Testables>
76+
</TestAction>
77+
<LaunchAction
78+
buildConfiguration = "macOS_Debug"
79+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
80+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
81+
launchStyle = "0"
82+
useCustomWorkingDirectory = "NO"
83+
ignoresPersistentStateOnLaunch = "NO"
84+
debugDocumentVersioning = "YES"
85+
debugServiceExtension = "internal"
86+
allowLocationSimulation = "YES">
87+
<BuildableProductRunnable
88+
runnableDebuggingMode = "0">
89+
<BuildableReference
90+
BuildableIdentifier = "primary"
91+
BlueprintIdentifier = "6396AF991A169D54009F3E6C"
92+
BuildableName = "ChatSecure.app"
93+
BlueprintName = "ChatSecure"
94+
ReferencedContainer = "container:ChatSecure.xcodeproj">
95+
</BuildableReference>
96+
</BuildableProductRunnable>
97+
<EnvironmentVariables>
98+
<EnvironmentVariable
99+
key = "OS_ACTIVITY_MODE"
100+
value = "disable"
101+
isEnabled = "NO">
102+
</EnvironmentVariable>
103+
</EnvironmentVariables>
104+
</LaunchAction>
105+
<ProfileAction
106+
buildConfiguration = "macOS_Release"
107+
shouldUseLaunchSchemeArgsEnv = "YES"
108+
savedToolIdentifier = ""
109+
useCustomWorkingDirectory = "NO"
110+
debugDocumentVersioning = "YES">
111+
<BuildableProductRunnable
112+
runnableDebuggingMode = "0">
113+
<BuildableReference
114+
BuildableIdentifier = "primary"
115+
BlueprintIdentifier = "6396AF991A169D54009F3E6C"
116+
BuildableName = "ChatSecure.app"
117+
BlueprintName = "ChatSecure"
118+
ReferencedContainer = "container:ChatSecure.xcodeproj">
119+
</BuildableReference>
120+
</BuildableProductRunnable>
121+
</ProfileAction>
122+
<AnalyzeAction
123+
buildConfiguration = "macOS_Debug">
124+
</AnalyzeAction>
125+
<ArchiveAction
126+
buildConfiguration = "macOS_Release"
127+
revealArchiveInOrganizer = "YES">
128+
</ArchiveAction>
129+
</Scheme>

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme

+19-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1120"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,11 +37,20 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40-
buildConfiguration = "Debug"
40+
buildConfiguration = "iOS_Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
disableMainThreadChecker = "YES"
44-
shouldUseLaunchSchemeArgsEnv = "YES">
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
disableMainThreadChecker = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "6396AF991A169D54009F3E6C"
49+
BuildableName = "ChatSecure.app"
50+
BlueprintName = "ChatSecure"
51+
ReferencedContainer = "container:ChatSecure.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
4554
<Testables>
4655
<TestableReference
4756
skipped = "NO">
@@ -54,7 +63,7 @@
5463
</BuildableReference>
5564
</TestableReference>
5665
<TestableReference
57-
skipped = "NO">
66+
skipped = "YES">
5867
<BuildableReference
5968
BuildableIdentifier = "primary"
6069
BlueprintIdentifier = "6365CEFB1E2453F6009E213F"
@@ -64,20 +73,9 @@
6473
</BuildableReference>
6574
</TestableReference>
6675
</Testables>
67-
<MacroExpansion>
68-
<BuildableReference
69-
BuildableIdentifier = "primary"
70-
BlueprintIdentifier = "6396AF991A169D54009F3E6C"
71-
BuildableName = "ChatSecure.app"
72-
BlueprintName = "ChatSecure"
73-
ReferencedContainer = "container:ChatSecure.xcodeproj">
74-
</BuildableReference>
75-
</MacroExpansion>
76-
<AdditionalOptions>
77-
</AdditionalOptions>
7876
</TestAction>
7977
<LaunchAction
80-
buildConfiguration = "Debug"
78+
buildConfiguration = "iOS_Debug"
8179
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
8280
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
8381
launchStyle = "0"
@@ -100,14 +98,12 @@
10098
<EnvironmentVariable
10199
key = "OS_ACTIVITY_MODE"
102100
value = "disable"
103-
isEnabled = "YES">
101+
isEnabled = "NO">
104102
</EnvironmentVariable>
105103
</EnvironmentVariables>
106-
<AdditionalOptions>
107-
</AdditionalOptions>
108104
</LaunchAction>
109105
<ProfileAction
110-
buildConfiguration = "Release"
106+
buildConfiguration = "iOS_Release"
111107
shouldUseLaunchSchemeArgsEnv = "YES"
112108
savedToolIdentifier = ""
113109
useCustomWorkingDirectory = "NO"
@@ -124,10 +120,10 @@
124120
</BuildableProductRunnable>
125121
</ProfileAction>
126122
<AnalyzeAction
127-
buildConfiguration = "Debug">
123+
buildConfiguration = "iOS_Debug">
128124
</AnalyzeAction>
129125
<ArchiveAction
130-
buildConfiguration = "Release"
126+
buildConfiguration = "iOS_Release"
131127
revealArchiveInOrganizer = "YES">
132128
</ArchiveAction>
133129
</Scheme>

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureCore.xcscheme

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1130"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "D9C527FF235CB55C002B213A"
18+
BuildableName = "ChatSecureCore.framework"
19+
BlueprintName = "ChatSecureCore"
20+
ReferencedContainer = "container:ChatSecure.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "iOS_Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "iOS_Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "iOS_Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "D9C527FF235CB55C002B213A"
54+
BuildableName = "ChatSecureCore.framework"
55+
BlueprintName = "ChatSecureCore"
56+
ReferencedContainer = "container:ChatSecure.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "iOS_Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "iOS_Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme

+15-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1120"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,19 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26-
buildConfiguration = "Debug"
26+
buildConfiguration = "iOS_Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "6396AFB21A169D54009F3E6C"
34+
BuildableName = "ChatSecureTests.xctest"
35+
BlueprintName = "ChatSecureTests"
36+
ReferencedContainer = "container:ChatSecure.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,20 +48,9 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "6396AFB21A169D54009F3E6C"
46-
BuildableName = "ChatSecureTests.xctest"
47-
BlueprintName = "ChatSecureTests"
48-
ReferencedContainer = "container:ChatSecure.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
55-
buildConfiguration = "Debug"
53+
buildConfiguration = "iOS_Debug"
5654
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5755
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5856
launchStyle = "0"
@@ -77,11 +75,9 @@
7775
isEnabled = "YES">
7876
</EnvironmentVariable>
7977
</EnvironmentVariables>
80-
<AdditionalOptions>
81-
</AdditionalOptions>
8278
</LaunchAction>
8379
<ProfileAction
84-
buildConfiguration = "Release"
80+
buildConfiguration = "iOS_Release"
8581
shouldUseLaunchSchemeArgsEnv = "YES"
8682
savedToolIdentifier = ""
8783
useCustomWorkingDirectory = "NO"
@@ -97,10 +93,10 @@
9793
</MacroExpansion>
9894
</ProfileAction>
9995
<AnalyzeAction
100-
buildConfiguration = "Debug">
96+
buildConfiguration = "iOS_Debug">
10197
</AnalyzeAction>
10298
<ArchiveAction
103-
buildConfiguration = "Release"
99+
buildConfiguration = "iOS_Release"
104100
revealArchiveInOrganizer = "YES">
105101
</ArchiveAction>
106102
</Scheme>

0 commit comments

Comments
 (0)