Skip to content

Commit ab03f2b

Browse files
author
Viacheslav Volodko
committed
Fixed configuration issues
1 parent 8dd2fe0 commit ab03f2b

File tree

4 files changed

+178
-4
lines changed

4 files changed

+178
-4
lines changed

‎objectivec/Config.xcconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//
2+
// Config.xcconfig
3+
// DiffMatchPatch
4+
//
5+
// Created by Vyacheslav Volodko on 11.12.2020.
6+
//
7+
8+
// Configuration settings file format documentation can be found at:
9+
// https://help.apple.com/xcode/#/dev745c5c974
10+
11+
MARKETING_VERSION = 1.0.0
12+
PROJECT_VERSION = 1.0

‎objectivec/DiffMatchPatch.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
3DC87024129FF4B6001F602B /* NSString+JavaSubstring.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+JavaSubstring.m"; sourceTree = "<group>"; };
6969
3DEE4C70129D484D00885485 /* NSMutableDictionary+DMPExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+DMPExtensions.h"; sourceTree = "<group>"; };
7070
3DEE4C71129D484D00885485 /* NSMutableDictionary+DMPExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+DMPExtensions.m"; sourceTree = "<group>"; };
71+
4116B34D2584040B00C3DDE8 /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
7172
4CF04C272032368B00945640 /* Speedtest2.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = Speedtest2.txt; sourceTree = "<group>"; };
7273
4CF04C282032368B00945640 /* Speedtest1.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = Speedtest1.txt; sourceTree = "<group>"; };
7374
4CF04C2B2032394300945640 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
@@ -141,6 +142,7 @@
141142
children = (
142143
8DC2EF5A0486A6940098B216 /* Info.plist */,
143144
089C1666FE841158C02AAC07 /* InfoPlist.strings */,
145+
4116B34D2584040B00C3DDE8 /* Config.xcconfig */,
144146
);
145147
name = Resources;
146148
sourceTree = "<group>";
@@ -468,6 +470,7 @@
468470
};
469471
1DEB91B208733DA50010E9CD /* Debug */ = {
470472
isa = XCBuildConfiguration;
473+
baseConfigurationReference = 4116B34D2584040B00C3DDE8 /* Config.xcconfig */;
471474
buildSettings = {
472475
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
473476
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -497,6 +500,7 @@
497500
};
498501
1DEB91B308733DA50010E9CD /* Release */ = {
499502
isa = XCBuildConfiguration;
503+
baseConfigurationReference = 4116B34D2584040B00C3DDE8 /* Config.xcconfig */;
500504
buildSettings = {
501505
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
502506
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -522,6 +526,7 @@
522526
};
523527
3D105A0C12DA601C002111E1 /* Debug 10.6 */ = {
524528
isa = XCBuildConfiguration;
529+
baseConfigurationReference = 4116B34D2584040B00C3DDE8 /* Config.xcconfig */;
525530
buildSettings = {
526531
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
527532
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -596,6 +601,7 @@
596601
};
597602
3D105A1012DA6024002111E1 /* Release 10.6 */ = {
598603
isa = XCBuildConfiguration;
604+
baseConfigurationReference = 4116B34D2584040B00C3DDE8 /* Config.xcconfig */;
599605
buildSettings = {
600606
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
601607
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -863,6 +869,7 @@
863869
isa = XCBuildConfiguration;
864870
buildSettings = {
865871
ALWAYS_SEARCH_USER_PATHS = NO;
872+
BITCODE_GENERATION_MODE = bitcode;
866873
CLANG_ANALYZER_NONNULL = YES;
867874
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
868875
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -882,10 +889,11 @@
882889
CURRENT_PROJECT_VERSION = 1;
883890
DEBUG_INFORMATION_FORMAT = dwarf;
884891
DEFINES_MODULE = YES;
885-
DEVELOPMENT_TEAM = KWSK6KH49N;
892+
DEVELOPMENT_TEAM = NP6C69VJ78;
886893
DYLIB_COMPATIBILITY_VERSION = 1;
887894
DYLIB_CURRENT_VERSION = 1;
888895
DYLIB_INSTALL_NAME_BASE = "@rpath";
896+
ENABLE_BITCODE = YES;
889897
GCC_C_LANGUAGE_STANDARD = gnu11;
890898
GCC_DYNAMIC_NO_PIC = NO;
891899
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -903,6 +911,7 @@
903911
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
904912
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
905913
MTL_ENABLE_DEBUG_INFO = YES;
914+
OTHER_CFLAGS = "-fembed-bitcode";
906915
PRODUCT_BUNDLE_IDENTIFIER = "de.geheimwerk.DiffMatchPatch-iOS";
907916
PRODUCT_NAME = DiffMatchPatch;
908917
SDKROOT = iphoneos;
@@ -917,6 +926,7 @@
917926
isa = XCBuildConfiguration;
918927
buildSettings = {
919928
ALWAYS_SEARCH_USER_PATHS = NO;
929+
BITCODE_GENERATION_MODE = bitcode;
920930
CLANG_ANALYZER_NONNULL = YES;
921931
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
922932
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -936,10 +946,11 @@
936946
CURRENT_PROJECT_VERSION = 1;
937947
DEBUG_INFORMATION_FORMAT = dwarf;
938948
DEFINES_MODULE = YES;
939-
DEVELOPMENT_TEAM = KWSK6KH49N;
949+
DEVELOPMENT_TEAM = NP6C69VJ78;
940950
DYLIB_COMPATIBILITY_VERSION = 1;
941951
DYLIB_CURRENT_VERSION = 1;
942952
DYLIB_INSTALL_NAME_BASE = "@rpath";
953+
ENABLE_BITCODE = YES;
943954
GCC_C_LANGUAGE_STANDARD = gnu11;
944955
GCC_DYNAMIC_NO_PIC = NO;
945956
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -957,6 +968,7 @@
957968
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
958969
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
959970
MTL_ENABLE_DEBUG_INFO = YES;
971+
OTHER_CFLAGS = "-fembed-bitcode";
960972
PRODUCT_BUNDLE_IDENTIFIER = "de.geheimwerk.DiffMatchPatch-iOS";
961973
PRODUCT_NAME = DiffMatchPatch;
962974
SDKROOT = iphoneos;
@@ -971,6 +983,7 @@
971983
isa = XCBuildConfiguration;
972984
buildSettings = {
973985
ALWAYS_SEARCH_USER_PATHS = NO;
986+
BITCODE_GENERATION_MODE = bitcode;
974987
CLANG_ANALYZER_NONNULL = YES;
975988
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
976989
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -990,10 +1003,11 @@
9901003
CURRENT_PROJECT_VERSION = 1;
9911004
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
9921005
DEFINES_MODULE = YES;
993-
DEVELOPMENT_TEAM = KWSK6KH49N;
1006+
DEVELOPMENT_TEAM = NP6C69VJ78;
9941007
DYLIB_COMPATIBILITY_VERSION = 1;
9951008
DYLIB_CURRENT_VERSION = 1;
9961009
DYLIB_INSTALL_NAME_BASE = "@rpath";
1010+
ENABLE_BITCODE = YES;
9971011
ENABLE_NS_ASSERTIONS = NO;
9981012
GCC_C_LANGUAGE_STANDARD = gnu11;
9991013
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1007,6 +1021,7 @@
10071021
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
10081022
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10091023
MTL_ENABLE_DEBUG_INFO = NO;
1024+
OTHER_CFLAGS = "-fembed-bitcode";
10101025
PRODUCT_BUNDLE_IDENTIFIER = "de.geheimwerk.DiffMatchPatch-iOS";
10111026
PRODUCT_NAME = DiffMatchPatch;
10121027
SDKROOT = iphoneos;
@@ -1022,6 +1037,7 @@
10221037
isa = XCBuildConfiguration;
10231038
buildSettings = {
10241039
ALWAYS_SEARCH_USER_PATHS = NO;
1040+
BITCODE_GENERATION_MODE = bitcode;
10251041
CLANG_ANALYZER_NONNULL = YES;
10261042
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
10271043
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -1041,10 +1057,11 @@
10411057
CURRENT_PROJECT_VERSION = 1;
10421058
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10431059
DEFINES_MODULE = YES;
1044-
DEVELOPMENT_TEAM = KWSK6KH49N;
1060+
DEVELOPMENT_TEAM = NP6C69VJ78;
10451061
DYLIB_COMPATIBILITY_VERSION = 1;
10461062
DYLIB_CURRENT_VERSION = 1;
10471063
DYLIB_INSTALL_NAME_BASE = "@rpath";
1064+
ENABLE_BITCODE = YES;
10481065
ENABLE_NS_ASSERTIONS = NO;
10491066
GCC_C_LANGUAGE_STANDARD = gnu11;
10501067
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1058,6 +1075,7 @@
10581075
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
10591076
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10601077
MTL_ENABLE_DEBUG_INFO = NO;
1078+
OTHER_CFLAGS = "-fembed-bitcode";
10611079
PRODUCT_BUNDLE_IDENTIFIER = "de.geheimwerk.DiffMatchPatch-iOS";
10621080
PRODUCT_NAME = DiffMatchPatch;
10631081
SDKROOT = iphoneos;

‎objectivec/DiffMatchPatch.xcodeproj/xcshareddata/xcschemes/DiffMatchPatch.xcscheme‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1140"
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 = "8DC2EF4F0486A6940098B216"
18+
BuildableName = "DiffMatchPatch.framework"
19+
BlueprintName = "DiffMatchPatch"
20+
ReferencedContainer = "container:DiffMatchPatch.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "4CF04C3020323A1100945640"
36+
BuildableName = "DiffMatchPatchTest.xctest"
37+
BlueprintName = "DiffMatchPatchTest"
38+
ReferencedContainer = "container:DiffMatchPatch.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
</TestAction>
43+
<LaunchAction
44+
buildConfiguration = "Debug"
45+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
46+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
launchStyle = "0"
48+
useCustomWorkingDirectory = "NO"
49+
ignoresPersistentStateOnLaunch = "NO"
50+
debugDocumentVersioning = "YES"
51+
debugServiceExtension = "internal"
52+
allowLocationSimulation = "YES">
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<MacroExpansion>
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
64+
BuildableName = "DiffMatchPatch.framework"
65+
BlueprintName = "DiffMatchPatch"
66+
ReferencedContainer = "container:DiffMatchPatch.xcodeproj">
67+
</BuildableReference>
68+
</MacroExpansion>
69+
</ProfileAction>
70+
<AnalyzeAction
71+
buildConfiguration = "Debug">
72+
</AnalyzeAction>
73+
<ArchiveAction
74+
buildConfiguration = "Release"
75+
revealArchiveInOrganizer = "YES">
76+
</ArchiveAction>
77+
</Scheme>

‎objectivec/DiffMatchPatch.xcodeproj/xcshareddata/xcschemes/DiffMatchPatch_iOS.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 = "1140"
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 = "E2C74E3F212B1F8E00947DE0"
18+
BuildableName = "DiffMatchPatch.framework"
19+
BlueprintName = "DiffMatchPatch_iOS"
20+
ReferencedContainer = "container:DiffMatchPatch.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "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 = "Release"
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 = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "E2C74E3F212B1F8E00947DE0"
54+
BuildableName = "DiffMatchPatch.framework"
55+
BlueprintName = "DiffMatchPatch_iOS"
56+
ReferencedContainer = "container:DiffMatchPatch.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

0 commit comments

Comments
 (0)