Skip to content

Commit df50fd6

Browse files
authored
Merge pull request iziz#188 from iziz/revert-187-master
Revert "Fixes up podspec so that it works properly, and adds a swift demo"
2 parents 914c3dd + 4f1f742 commit df50fd6

File tree

4 files changed

+17
-328
lines changed

4 files changed

+17
-328
lines changed

libPhoneNumber-iOS.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ DESC
1717
s.watchos.deployment_target = "2.0"
1818
s.tvos.deployment_target = "9.0"
1919
s.requires_arc = true
20-
s.private_header_files = 'libPhoneNumber/NBGeneratedPhoneNumberMetaData.h'
21-
s.source_files = 'libPhoneNumber/NBPhoneNumberDefines.{h,m}', 'libPhoneNumber/NBPhoneNumber.{h,m}', 'libPhoneNumber/NBNumberFormat.{h,m}', 'libPhoneNumber/NBPhoneNumberDesc.{h,m}', 'libPhoneNumber/NBPhoneMetaData.{h,m}', 'libPhoneNumber/NBPhoneNumberUtil.{h,m}', 'libPhoneNumber/NBMetadataHelper.{h,m}', 'libPhoneNumber/NBAsYouTypeFormatter.{h,m}', 'libPhoneNumber/NSArray+NBAdditions.{h,m}'
20+
s.xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES' }
21+
s.source_files = 'libPhoneNumber/NBPhoneNumberDefines.{h,m}', 'libPhoneNumber/NBPhoneNumber.{h,m}', 'libPhoneNumber/NBNumberFormat.{h,m}', 'libPhoneNumber/NBPhoneNumberDesc.{h,m}', 'libPhoneNumber/NBPhoneMetaData.{h,m}', 'libPhoneNumber/NBPhoneNumberUtil.{h,m}', 'libPhoneNumber/NBMetadataHelper.{h,m}', 'libPhoneNumber/NBAsYouTypeFormatter.{h,m}', 'libPhoneNumber/NSArray+NBAdditions.{h,m}', 'libPhoneNumber/NBGeneratedPhoneNumberMetaData.h'
2222
end

libPhoneNumber.xcodeproj/project.pbxproj

Lines changed: 15 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -119,29 +119,9 @@
119119
8B0FD3021E4A88AC0049DF81 /* NSArray+NBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0FD2FA1E4A88AC0049DF81 /* NSArray+NBAdditions.m */; };
120120
8B0FD3031E4A88AC0049DF81 /* NSArray+NBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0FD2FA1E4A88AC0049DF81 /* NSArray+NBAdditions.m */; };
121121
8B0FD3041E4A88AC0049DF81 /* NSArray+NBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0FD2FA1E4A88AC0049DF81 /* NSArray+NBAdditions.m */; };
122-
8B1FEF981EB7BEFE00FBDE87 /* NBTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B1FEF971EB7BEFE00FBDE87 /* NBTextField.swift */; };
123-
8B1FEF9B1EB7BF3200FBDE87 /* libPhoneNumberiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34ACBB851B7122AC0064B3BD /* libPhoneNumberiOS.framework */; };
124-
8B1FEF9C1EB7BF6900FBDE87 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6AE8F81BEE72B600263DE1 /* AppDelegate.swift */; };
125-
8B1FEF9D1EB7BF6C00FBDE87 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6AE8FA1BEE72B600263DE1 /* ViewController.swift */; };
126-
8B1FEF9E1EB7BF7000FBDE87 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FD6AE8FC1BEE72B600263DE1 /* Main.storyboard */; };
127-
8B1FEF9F1EB7BF7200FBDE87 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FD6AE9011BEE72B600263DE1 /* LaunchScreen.storyboard */; };
128-
8B1FEFA01EB7BFC500FBDE87 /* NBGeneratedPhoneNumberMetaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BB73AA71E7C9C6700B0691B /* NBGeneratedPhoneNumberMetaData.h */; settings = {ATTRIBUTES = (Private, ); }; };
129-
8B1FEFA11EB7BFC500FBDE87 /* NBGeneratedPhoneNumberMetaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BB73AA71E7C9C6700B0691B /* NBGeneratedPhoneNumberMetaData.h */; settings = {ATTRIBUTES = (Private, ); }; };
130-
8B1FEFA21EB7BFC600FBDE87 /* NBGeneratedPhoneNumberMetaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BB73AA71E7C9C6700B0691B /* NBGeneratedPhoneNumberMetaData.h */; settings = {ATTRIBUTES = (Private, ); }; };
131-
8B1FEFA31EB7BFC600FBDE87 /* NBGeneratedPhoneNumberMetaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BB73AA71E7C9C6700B0691B /* NBGeneratedPhoneNumberMetaData.h */; settings = {ATTRIBUTES = (Private, ); }; };
132122
A81D6A2B1BECC44600F68F34 /* NBPhoneNumberDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */; };
133123
/* End PBXBuildFile section */
134124

135-
/* Begin PBXContainerItemProxy section */
136-
8B1FEF991EB7BF2B00FBDE87 /* PBXContainerItemProxy */ = {
137-
isa = PBXContainerItemProxy;
138-
containerPortal = FD7A0613167715A0004BBEB6 /* Project object */;
139-
proxyType = 1;
140-
remoteGlobalIDString = 34ACBB841B7122AC0064B3BD;
141-
remoteInfo = libPhoneNumberiOS;
142-
};
143-
/* End PBXContainerItemProxy section */
144-
145125
/* Begin PBXFileReference section */
146126
1485C5231E06F4890092F541 /* NBAsYouTypeFormatterTest1.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NBAsYouTypeFormatterTest1.m; path = libPhoneNumberTests/NBAsYouTypeFormatterTest1.m; sourceTree = SOURCE_ROOT; };
147127
1485C5241E06F4890092F541 /* NBAsYouTypeFormatterTest2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NBAsYouTypeFormatterTest2.m; path = libPhoneNumberTests/NBAsYouTypeFormatterTest2.m; sourceTree = SOURCE_ROOT; };
@@ -179,8 +159,6 @@
179159
8B0FD2F21E4A85A70049DF81 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
180160
8B0FD2F91E4A88AC0049DF81 /* NSArray+NBAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+NBAdditions.h"; sourceTree = "<group>"; };
181161
8B0FD2FA1E4A88AC0049DF81 /* NSArray+NBAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+NBAdditions.m"; sourceTree = "<group>"; };
182-
8B1FEF731EB7BE7C00FBDE87 /* SwiftDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
183-
8B1FEF971EB7BEFE00FBDE87 /* NBTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NBTextField.swift; path = "libPhoneNumber-iOS/NBTextField.swift"; sourceTree = "<group>"; };
184162
8BB73AA71E7C9C6700B0691B /* NBGeneratedPhoneNumberMetaData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBGeneratedPhoneNumberMetaData.h; sourceTree = "<group>"; };
185163
A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = NBPhoneNumberDefines.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
186164
FD12C2681A87401B00B53856 /* NBMetadataHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBMetadataHelper.h; sourceTree = "<group>"; };
@@ -263,14 +241,6 @@
263241
);
264242
runOnlyForDeploymentPostprocessing = 0;
265243
};
266-
8B1FEF701EB7BE7C00FBDE87 /* Frameworks */ = {
267-
isa = PBXFrameworksBuildPhase;
268-
buildActionMask = 2147483647;
269-
files = (
270-
8B1FEF9B1EB7BF3200FBDE87 /* libPhoneNumberiOS.framework in Frameworks */,
271-
);
272-
runOnlyForDeploymentPostprocessing = 0;
273-
};
274244
/* End PBXFrameworksBuildPhase section */
275245

276246
/* Begin PBXGroup section */
@@ -334,7 +304,6 @@
334304
isa = PBXGroup;
335305
children = (
336306
34ACBB891B7122AC0064B3BD /* libPhoneNumberiOS.h */,
337-
8B1FEF971EB7BEFE00FBDE87 /* NBTextField.swift */,
338307
34ACBB881B7122AC0064B3BD /* Info.plist */,
339308
);
340309
name = iOS;
@@ -441,7 +410,6 @@
441410
14B7A2931DE9B65D0051AED7 /* libPhoneNumberiOSTests.xctest */,
442411
14B7A2BE1DE9D7F60051AED7 /* MetadataGenerator.app */,
443412
7C72507C1E0EBE7D00F916ED /* libPhoneNumbermacOS.framework */,
444-
8B1FEF731EB7BE7C00FBDE87 /* SwiftDemo.app */,
445413
);
446414
name = Products;
447415
sourceTree = "<group>";
@@ -497,7 +465,6 @@
497465
isa = PBXHeadersBuildPhase;
498466
buildActionMask = 2147483647;
499467
files = (
500-
8B1FEFA11EB7BFC500FBDE87 /* NBGeneratedPhoneNumberMetaData.h in Headers */,
501468
1F31D5461DDD478300257818 /* NBPhoneMetaData.h in Headers */,
502469
1F31D5401DDD477300257818 /* NBPhoneNumber.h in Headers */,
503470
1F31D5421DDD477800257818 /* NBNumberFormat.h in Headers */,
@@ -515,7 +482,6 @@
515482
isa = PBXHeadersBuildPhase;
516483
buildActionMask = 2147483647;
517484
files = (
518-
8B1FEFA21EB7BFC600FBDE87 /* NBGeneratedPhoneNumberMetaData.h in Headers */,
519485
1F31D5511DDD47BA00257818 /* libPhoneNumbertvOS.h in Headers */,
520486
1F31D5551DDD47EB00257818 /* NBMetadataHelper.h in Headers */,
521487
1F31D5621DDD482C00257818 /* NBPhoneMetaData.h in Headers */,
@@ -533,7 +499,6 @@
533499
isa = PBXHeadersBuildPhase;
534500
buildActionMask = 2147483647;
535501
files = (
536-
8B1FEFA01EB7BFC500FBDE87 /* NBGeneratedPhoneNumberMetaData.h in Headers */,
537502
34ACBBB61B7124AB0064B3BD /* NBPhoneNumberDefines.h in Headers */,
538503
34ACBBBD1B7125450064B3BD /* NBAsYouTypeFormatter.h in Headers */,
539504
34ACBBBA1B7124E40064B3BD /* NBPhoneMetaData.h in Headers */,
@@ -551,7 +516,6 @@
551516
isa = PBXHeadersBuildPhase;
552517
buildActionMask = 2147483647;
553518
files = (
554-
8B1FEFA31EB7BFC600FBDE87 /* NBGeneratedPhoneNumberMetaData.h in Headers */,
555519
7C7250801E0EBE7D00F916ED /* libPhoneNumbermacOS.h in Headers */,
556520
7C72508E1E0EC05900F916ED /* NBMetadataHelper.h in Headers */,
557521
7C7250941E0EC06900F916ED /* NBPhoneMetaData.h in Headers */,
@@ -674,31 +638,13 @@
674638
productReference = 7C72507C1E0EBE7D00F916ED /* libPhoneNumbermacOS.framework */;
675639
productType = "com.apple.product-type.framework";
676640
};
677-
8B1FEF721EB7BE7C00FBDE87 /* SwiftDemo */ = {
678-
isa = PBXNativeTarget;
679-
buildConfigurationList = 8B1FEF821EB7BE7C00FBDE87 /* Build configuration list for PBXNativeTarget "SwiftDemo" */;
680-
buildPhases = (
681-
8B1FEF6F1EB7BE7C00FBDE87 /* Sources */,
682-
8B1FEF701EB7BE7C00FBDE87 /* Frameworks */,
683-
8B1FEF711EB7BE7C00FBDE87 /* Resources */,
684-
);
685-
buildRules = (
686-
);
687-
dependencies = (
688-
8B1FEF9A1EB7BF2B00FBDE87 /* PBXTargetDependency */,
689-
);
690-
name = SwiftDemo;
691-
productName = SwiftDemo;
692-
productReference = 8B1FEF731EB7BE7C00FBDE87 /* SwiftDemo.app */;
693-
productType = "com.apple.product-type.application";
694-
};
695641
/* End PBXNativeTarget section */
696642

697643
/* Begin PBXProject section */
698644
FD7A0613167715A0004BBEB6 /* Project object */ = {
699645
isa = PBXProject;
700646
attributes = {
701-
LastSwiftUpdateCheck = 0830;
647+
LastSwiftUpdateCheck = 0710;
702648
LastTestingUpgradeCheck = 0510;
703649
LastUpgradeCheck = 0810;
704650
ORGANIZATIONNAME = ohtalk.me;
@@ -726,10 +672,6 @@
726672
CreatedOnToolsVersion = 8.2.1;
727673
ProvisioningStyle = Automatic;
728674
};
729-
8B1FEF721EB7BE7C00FBDE87 = {
730-
CreatedOnToolsVersion = 8.3.2;
731-
ProvisioningStyle = Automatic;
732-
};
733675
};
734676
};
735677
buildConfigurationList = FD7A0616167715A0004BBEB6 /* Build configuration list for PBXProject "libPhoneNumber" */;
@@ -750,7 +692,6 @@
750692
7C72507B1E0EBE7D00F916ED /* libPhoneNumbermacOS */,
751693
14B7A2921DE9B65D0051AED7 /* libPhoneNumberiOSTests */,
752694
14B7A2BD1DE9D7F60051AED7 /* MetadataGenerator */,
753-
8B1FEF721EB7BE7C00FBDE87 /* SwiftDemo */,
754695
);
755696
};
756697
/* End PBXProject section */
@@ -803,15 +744,6 @@
803744
);
804745
runOnlyForDeploymentPostprocessing = 0;
805746
};
806-
8B1FEF711EB7BE7C00FBDE87 /* Resources */ = {
807-
isa = PBXResourcesBuildPhase;
808-
buildActionMask = 2147483647;
809-
files = (
810-
8B1FEF9E1EB7BF7000FBDE87 /* Main.storyboard in Resources */,
811-
8B1FEF9F1EB7BF7200FBDE87 /* LaunchScreen.storyboard in Resources */,
812-
);
813-
runOnlyForDeploymentPostprocessing = 0;
814-
};
815747
/* End PBXResourcesBuildPhase section */
816748

817749
/* Begin PBXSourcesBuildPhase section */
@@ -918,26 +850,8 @@
918850
);
919851
runOnlyForDeploymentPostprocessing = 0;
920852
};
921-
8B1FEF6F1EB7BE7C00FBDE87 /* Sources */ = {
922-
isa = PBXSourcesBuildPhase;
923-
buildActionMask = 2147483647;
924-
files = (
925-
8B1FEF9D1EB7BF6C00FBDE87 /* ViewController.swift in Sources */,
926-
8B1FEF9C1EB7BF6900FBDE87 /* AppDelegate.swift in Sources */,
927-
8B1FEF981EB7BEFE00FBDE87 /* NBTextField.swift in Sources */,
928-
);
929-
runOnlyForDeploymentPostprocessing = 0;
930-
};
931853
/* End PBXSourcesBuildPhase section */
932854

933-
/* Begin PBXTargetDependency section */
934-
8B1FEF9A1EB7BF2B00FBDE87 /* PBXTargetDependency */ = {
935-
isa = PBXTargetDependency;
936-
target = 34ACBB841B7122AC0064B3BD /* libPhoneNumberiOS */;
937-
targetProxy = 8B1FEF991EB7BF2B00FBDE87 /* PBXContainerItemProxy */;
938-
};
939-
/* End PBXTargetDependency section */
940-
941855
/* Begin PBXVariantGroup section */
942856
14B7A2C91DE9D7F70051AED7 /* Main.storyboard */ = {
943857
isa = PBXVariantGroup;
@@ -978,6 +892,7 @@
978892
isa = XCBuildConfiguration;
979893
buildSettings = {
980894
APPLICATION_EXTENSION_API_ONLY = NO;
895+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
981896
CLANG_ANALYZER_NONNULL = YES;
982897
CLANG_ENABLE_CODE_COVERAGE = NO;
983898
CLANG_ENABLE_MODULES = YES;
@@ -1007,6 +922,7 @@
1007922
isa = XCBuildConfiguration;
1008923
buildSettings = {
1009924
APPLICATION_EXTENSION_API_ONLY = NO;
925+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
1010926
CLANG_ANALYZER_NONNULL = YES;
1011927
CLANG_ENABLE_CODE_COVERAGE = NO;
1012928
CLANG_ENABLE_MODULES = YES;
@@ -1035,6 +951,7 @@
1035951
isa = XCBuildConfiguration;
1036952
buildSettings = {
1037953
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
954+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
1038955
CLANG_ANALYZER_NONNULL = YES;
1039956
CLANG_ENABLE_MODULES = YES;
1040957
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -1057,6 +974,7 @@
1057974
isa = XCBuildConfiguration;
1058975
buildSettings = {
1059976
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
977+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
1060978
CLANG_ANALYZER_NONNULL = YES;
1061979
CLANG_ENABLE_MODULES = YES;
1062980
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -1080,6 +998,7 @@
1080998
1F31D52F1DDD46B100257818 /* Debug */ = {
1081999
isa = XCBuildConfiguration;
10821000
buildSettings = {
1001+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
10831002
CLANG_ANALYZER_NONNULL = YES;
10841003
CLANG_ENABLE_MODULES = YES;
10851004
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -1125,6 +1044,7 @@
11251044
1F31D5301DDD46B100257818 /* Release */ = {
11261045
isa = XCBuildConfiguration;
11271046
buildSettings = {
1047+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
11281048
CLANG_ANALYZER_NONNULL = YES;
11291049
CLANG_ENABLE_MODULES = YES;
11301050
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -1172,6 +1092,7 @@
11721092
1F31D5531DDD47BA00257818 /* Debug */ = {
11731093
isa = XCBuildConfiguration;
11741094
buildSettings = {
1095+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
11751096
CLANG_ANALYZER_NONNULL = YES;
11761097
CLANG_ENABLE_MODULES = YES;
11771098
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -1217,6 +1138,7 @@
12171138
1F31D5541DDD47BA00257818 /* Release */ = {
12181139
isa = XCBuildConfiguration;
12191140
buildSettings = {
1141+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
12201142
CLANG_ANALYZER_NONNULL = YES;
12211143
CLANG_ENABLE_MODULES = YES;
12221144
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -1264,6 +1186,7 @@
12641186
34ACBB9E1B7122AC0064B3BD /* Debug */ = {
12651187
isa = XCBuildConfiguration;
12661188
buildSettings = {
1189+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
12671190
CLANG_ENABLE_MODULES = YES;
12681191
CLANG_WARN_BOOL_CONVERSION = YES;
12691192
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -1307,6 +1230,7 @@
13071230
34ACBB9F1B7122AC0064B3BD /* Release */ = {
13081231
isa = XCBuildConfiguration;
13091232
buildSettings = {
1233+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
13101234
CLANG_ENABLE_MODULES = YES;
13111235
CLANG_WARN_BOOL_CONVERSION = YES;
13121236
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -1349,6 +1273,7 @@
13491273
7C7250811E0EBE7D00F916ED /* Debug */ = {
13501274
isa = XCBuildConfiguration;
13511275
buildSettings = {
1276+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
13521277
CLANG_ANALYZER_NONNULL = YES;
13531278
CLANG_ENABLE_MODULES = YES;
13541279
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -1383,6 +1308,7 @@
13831308
7C7250821E0EBE7D00F916ED /* Release */ = {
13841309
isa = XCBuildConfiguration;
13851310
buildSettings = {
1311+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
13861312
CLANG_ANALYZER_NONNULL = YES;
13871313
CLANG_ENABLE_MODULES = YES;
13881314
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -1416,60 +1342,12 @@
14161342
};
14171343
name = Release;
14181344
};
1419-
8B1FEF831EB7BE7C00FBDE87 /* Debug */ = {
1420-
isa = XCBuildConfiguration;
1421-
buildSettings = {
1422-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1423-
CLANG_ANALYZER_NONNULL = YES;
1424-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
1425-
CLANG_ENABLE_MODULES = YES;
1426-
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1427-
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
1428-
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1429-
DEBUG_INFORMATION_FORMAT = dwarf;
1430-
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1431-
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
1432-
INFOPLIST_FILE = "$(SRCROOT)/libPhoneNumber-SwiftDemo/Info.plist";
1433-
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1434-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1435-
MTL_ENABLE_DEBUG_INFO = YES;
1436-
PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.SwiftDemo;
1437-
PRODUCT_NAME = "$(TARGET_NAME)";
1438-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1439-
SWIFT_VERSION = 3.0;
1440-
};
1441-
name = Debug;
1442-
};
1443-
8B1FEF841EB7BE7C00FBDE87 /* Release */ = {
1444-
isa = XCBuildConfiguration;
1445-
buildSettings = {
1446-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1447-
CLANG_ANALYZER_NONNULL = YES;
1448-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
1449-
CLANG_ENABLE_MODULES = YES;
1450-
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1451-
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
1452-
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1453-
COPY_PHASE_STRIP = NO;
1454-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1455-
ENABLE_NS_ASSERTIONS = NO;
1456-
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1457-
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
1458-
INFOPLIST_FILE = "$(SRCROOT)/libPhoneNumber-SwiftDemo/Info.plist";
1459-
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1460-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1461-
MTL_ENABLE_DEBUG_INFO = NO;
1462-
PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.SwiftDemo;
1463-
PRODUCT_NAME = "$(TARGET_NAME)";
1464-
SWIFT_VERSION = 3.0;
1465-
};
1466-
name = Release;
1467-
};
14681345
FD7A064D167715A1004BBEB6 /* Debug */ = {
14691346
isa = XCBuildConfiguration;
14701347
buildSettings = {
14711348
ALWAYS_SEARCH_USER_PATHS = NO;
14721349
APPLICATION_EXTENSION_API_ONLY = YES;
1350+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
14731351
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
14741352
CLANG_CXX_LIBRARY = "libc++";
14751353
CLANG_ENABLE_OBJC_ARC = YES;
@@ -1518,6 +1396,7 @@
15181396
buildSettings = {
15191397
ALWAYS_SEARCH_USER_PATHS = NO;
15201398
APPLICATION_EXTENSION_API_ONLY = YES;
1399+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
15211400
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
15221401
CLANG_CXX_LIBRARY = "libc++";
15231402
CLANG_ENABLE_OBJC_ARC = YES;
@@ -1610,14 +1489,6 @@
16101489
defaultConfigurationIsVisible = 0;
16111490
defaultConfigurationName = Release;
16121491
};
1613-
8B1FEF821EB7BE7C00FBDE87 /* Build configuration list for PBXNativeTarget "SwiftDemo" */ = {
1614-
isa = XCConfigurationList;
1615-
buildConfigurations = (
1616-
8B1FEF831EB7BE7C00FBDE87 /* Debug */,
1617-
8B1FEF841EB7BE7C00FBDE87 /* Release */,
1618-
);
1619-
defaultConfigurationIsVisible = 0;
1620-
};
16211492
FD7A0616167715A0004BBEB6 /* Build configuration list for PBXProject "libPhoneNumber" */ = {
16221493
isa = XCConfigurationList;
16231494
buildConfigurations = (

0 commit comments

Comments
 (0)