Skip to content

Commit 76aa267

Browse files
chrisballingerchrisballinger
committed
Use xcconfigs for ITS export compliance
1 parent c083034 commit 76aa267

15 files changed

Lines changed: 726 additions & 97 deletions

File tree

‎ChatSecure.xcodeproj/project.pbxproj‎

Lines changed: 469 additions & 43 deletions
Large diffs are not rendered by default.

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

Lines changed: 129 additions & 0 deletions
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‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
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"
4343
shouldUseLaunchSchemeArgsEnv = "YES"
@@ -75,7 +75,7 @@
7575
</Testables>
7676
</TestAction>
7777
<LaunchAction
78-
buildConfiguration = "Debug"
78+
buildConfiguration = "iOS_Debug"
7979
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
8080
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
8181
launchStyle = "0"
@@ -103,7 +103,7 @@
103103
</EnvironmentVariables>
104104
</LaunchAction>
105105
<ProfileAction
106-
buildConfiguration = "Release"
106+
buildConfiguration = "iOS_Release"
107107
shouldUseLaunchSchemeArgsEnv = "YES"
108108
savedToolIdentifier = ""
109109
useCustomWorkingDirectory = "NO"
@@ -120,10 +120,10 @@
120120
</BuildableProductRunnable>
121121
</ProfileAction>
122122
<AnalyzeAction
123-
buildConfiguration = "Debug">
123+
buildConfiguration = "iOS_Debug">
124124
</AnalyzeAction>
125125
<ArchiveAction
126-
buildConfiguration = "Release"
126+
buildConfiguration = "iOS_Release"
127127
revealArchiveInOrganizer = "YES">
128128
</ArchiveAction>
129129
</Scheme>

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

Lines changed: 67 additions & 0 deletions
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/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<key>ITSAppUsesNonExemptEncryption</key>
4848
<true/>
4949
<key>ITSEncryptionExportComplianceCode</key>
50-
<string>EXPORT_COMPLIANCE_CODE</string>
50+
<string>$(EXPORT_COMPLIANCE_CODE)</string>
5151
<key>LSApplicationCategoryType</key>
5252
<string>public.app-category.social-networking</string>
5353
<key>LSApplicationQueriesSchemes</key>

‎ChatSecure/InfoPlist.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,3 @@
55
// Created by Chris Ballinger on 10/27/19.
66
// Copyright © 2019 Chris Ballinger. All rights reserved.
77
//
8-
9-
#import <TargetConditionals.h>
10-
11-
#if TARGET_OS_MACCATALYST
12-
#define EXPORT_COMPLIANCE_CODE 240f0a63-ba8b-40ff-bfce-20848ef174d0
13-
#else
14-
#define EXPORT_COMPLIANCE_CODE 51d17d3e-5e07-49ad-a308-9625d81e411f
15-
#endif

‎ChatSecure/xcconfig/iOS_Debug.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EXPORT_COMPLIANCE_CODE=51d17d3e-5e07-49ad-a308-9625d81e411f

‎ChatSecure/xcconfig/iOS_Release.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EXPORT_COMPLIANCE_CODE=51d17d3e-5e07-49ad-a308-9625d81e411f

‎ChatSecure/xcconfig/macOS_Debug.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EXPORT_COMPLIANCE_CODE=240f0a63-ba8b-40ff-bfce-20848ef174d0

‎ChatSecure/xcconfig/macOS_Release.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EXPORT_COMPLIANCE_CODE=240f0a63-ba8b-40ff-bfce-20848ef174d0

0 commit comments

Comments
 (0)