Skip to content

Commit 4f46aff

Browse files
kellyroachkostub
kellyroach
authored and
kostub
committed
Kellyroach/fix warnings (#103)
* pod install * Xcode 9.4.1 Update to Recommended Settings * Fix 18 Analyze warnings in MTMathAtomFactory.m+.h * Fix 4 Analyze warnings in MTFont.m * Fix 3 yellow warnings in MTTypesetter.m * Fix 2 'Assigned value is garbage or undefined' Analyze issues * Fix 1 Analyze warning in MTFontMathTable.m * Fix 'colorWithRed:green:blue:alpha: is only available on macOS 10.9' yellow warning
1 parent 416fe39 commit 4f46aff

File tree

12 files changed

+136
-96
lines changed

12 files changed

+136
-96
lines changed

‎MacOSMath.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
26123D471E230D80007A742A /* Sources */,
118118
26123D481E230D80007A742A /* Frameworks */,
119119
26123D491E230D80007A742A /* Resources */,
120-
B004BBC1D57722B45C3856E3 /* [CP] Embed Pods Frameworks */,
121120
2CE45346B6FE841608881E74 /* [CP] Copy Pods Resources */,
122121
);
123122
buildRules = (
@@ -135,7 +134,7 @@
135134
267EC26E1E230CB400E34886 /* Project object */ = {
136135
isa = PBXProject;
137136
attributes = {
138-
LastUpgradeCheck = 0810;
137+
LastUpgradeCheck = 0940;
139138
TargetAttributes = {
140139
26123D4A1E230D80007A742A = {
141140
CreatedOnToolsVersion = 8.1;
@@ -179,9 +178,12 @@
179178
files = (
180179
);
181180
inputPaths = (
181+
"${SRCROOT}/Pods/Target Support Files/Pods-MacOSMath/Pods-MacOSMath-resources.sh",
182+
"${PODS_CONFIGURATION_BUILD_DIR}/iosMath-macOS10.8/mathFonts.bundle",
182183
);
183184
name = "[CP] Copy Pods Resources";
184185
outputPaths = (
186+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle",
185187
);
186188
runOnlyForDeploymentPostprocessing = 0;
187189
shellPath = /bin/sh;
@@ -194,28 +196,16 @@
194196
files = (
195197
);
196198
inputPaths = (
199+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
200+
"${PODS_ROOT}/Manifest.lock",
197201
);
198202
name = "[CP] Check Pods Manifest.lock";
199203
outputPaths = (
204+
"$(DERIVED_FILE_DIR)/Pods-MacOSMath-checkManifestLockResult.txt",
200205
);
201206
runOnlyForDeploymentPostprocessing = 0;
202207
shellPath = /bin/sh;
203-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
204-
showEnvVarsInLog = 0;
205-
};
206-
B004BBC1D57722B45C3856E3 /* [CP] Embed Pods Frameworks */ = {
207-
isa = PBXShellScriptBuildPhase;
208-
buildActionMask = 2147483647;
209-
files = (
210-
);
211-
inputPaths = (
212-
);
213-
name = "[CP] Embed Pods Frameworks";
214-
outputPaths = (
215-
);
216-
runOnlyForDeploymentPostprocessing = 0;
217-
shellPath = /bin/sh;
218-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MacOSMath/Pods-MacOSMath-frameworks.sh\"\n";
208+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
219209
showEnvVarsInLog = 0;
220210
};
221211
/* End PBXShellScriptBuildPhase section */
@@ -348,12 +338,20 @@
348338
267EC2721E230CB400E34886 /* Debug */ = {
349339
isa = XCBuildConfiguration;
350340
buildSettings = {
341+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
351342
CLANG_WARN_BOOL_CONVERSION = YES;
343+
CLANG_WARN_COMMA = YES;
352344
CLANG_WARN_CONSTANT_CONVERSION = YES;
345+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
353346
CLANG_WARN_EMPTY_BODY = YES;
354347
CLANG_WARN_ENUM_CONVERSION = YES;
355348
CLANG_WARN_INFINITE_RECURSION = YES;
356349
CLANG_WARN_INT_CONVERSION = YES;
350+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
351+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
352+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
353+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
354+
CLANG_WARN_STRICT_PROTOTYPES = YES;
357355
CLANG_WARN_SUSPICIOUS_MOVE = YES;
358356
CLANG_WARN_UNREACHABLE_CODE = YES;
359357
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -375,12 +373,20 @@
375373
267EC2731E230CB400E34886 /* Release */ = {
376374
isa = XCBuildConfiguration;
377375
buildSettings = {
376+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
378377
CLANG_WARN_BOOL_CONVERSION = YES;
378+
CLANG_WARN_COMMA = YES;
379379
CLANG_WARN_CONSTANT_CONVERSION = YES;
380+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
380381
CLANG_WARN_EMPTY_BODY = YES;
381382
CLANG_WARN_ENUM_CONVERSION = YES;
382383
CLANG_WARN_INFINITE_RECURSION = YES;
383384
CLANG_WARN_INT_CONVERSION = YES;
385+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
386+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
387+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
388+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
389+
CLANG_WARN_STRICT_PROTOTYPES = YES;
384390
CLANG_WARN_SUSPICIOUS_MOVE = YES;
385391
CLANG_WARN_UNREACHABLE_CODE = YES;
386392
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎MacOSMath.xcodeproj/xcshareddata/xcschemes/MacOSMath.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PODS:
2-
- iosMath (0.9.3)
2+
- iosMath (0.9.4)
33

44
DEPENDENCIES:
55
- iosMath (from `./`)
66

77
EXTERNAL SOURCES:
88
iosMath:
9-
:path: ./
9+
:path: "./"
1010

1111
SPEC CHECKSUMS:
12-
iosMath: 619e53c34dfa19ac3062869f9974747b44507083
12+
iosMath: dfb93f207b01838413242bb5252b3eaf91558a12
1313

1414
PODFILE CHECKSUM: bade56080a0531a08830155fc215a0a5b44dd183
1515

16-
COCOAPODS: 1.2.0
16+
COCOAPODS: 1.5.3

‎iosMath.xcodeproj/project.pbxproj‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,6 @@
437437
49965EF817CBBA2700A555C5 /* Sources */,
438438
49965EF917CBBA2700A555C5 /* Frameworks */,
439439
49965EFA17CBBA2700A555C5 /* Resources */,
440-
3442884B289896C8F015C1E5 /* [CP] Embed Pods Frameworks */,
441440
C897D2526C33F372299D91F4 /* [CP] Copy Pods Resources */,
442441
);
443442
buildRules = (
@@ -457,7 +456,6 @@
457456
49965F1717CBBA2700A555C5 /* Sources */,
458457
49965F1817CBBA2700A555C5 /* Frameworks */,
459458
49965F1917CBBA2700A555C5 /* Resources */,
460-
89BE4A420E67730DC572540C /* [CP] Embed Pods Frameworks */,
461459
C6253ABF539A9D25D25B1108 /* [CP] Copy Pods Resources */,
462460
);
463461
buildRules = (
@@ -493,7 +491,7 @@
493491
isa = PBXProject;
494492
attributes = {
495493
LastTestingUpgradeCheck = 0630;
496-
LastUpgradeCheck = 0820;
494+
LastUpgradeCheck = 0940;
497495
};
498496
buildConfigurationList = 49965EF717CBBA2700A555C5 /* Build configuration list for PBXProject "iosMath" */;
499497
compatibilityVersion = "Xcode 3.2";
@@ -559,43 +557,16 @@
559557
files = (
560558
);
561559
inputPaths = (
560+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
561+
"${PODS_ROOT}/Manifest.lock",
562562
);
563563
name = "[CP] Check Pods Manifest.lock";
564564
outputPaths = (
565+
"$(DERIVED_FILE_DIR)/Pods-iosMathTests-checkManifestLockResult.txt",
565566
);
566567
runOnlyForDeploymentPostprocessing = 0;
567568
shellPath = /bin/sh;
568-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
569-
showEnvVarsInLog = 0;
570-
};
571-
3442884B289896C8F015C1E5 /* [CP] Embed Pods Frameworks */ = {
572-
isa = PBXShellScriptBuildPhase;
573-
buildActionMask = 2147483647;
574-
files = (
575-
);
576-
inputPaths = (
577-
);
578-
name = "[CP] Embed Pods Frameworks";
579-
outputPaths = (
580-
);
581-
runOnlyForDeploymentPostprocessing = 0;
582-
shellPath = /bin/sh;
583-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iosMathExample/Pods-iosMathExample-frameworks.sh\"\n";
584-
showEnvVarsInLog = 0;
585-
};
586-
89BE4A420E67730DC572540C /* [CP] Embed Pods Frameworks */ = {
587-
isa = PBXShellScriptBuildPhase;
588-
buildActionMask = 2147483647;
589-
files = (
590-
);
591-
inputPaths = (
592-
);
593-
name = "[CP] Embed Pods Frameworks";
594-
outputPaths = (
595-
);
596-
runOnlyForDeploymentPostprocessing = 0;
597-
shellPath = /bin/sh;
598-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iosMathTests/Pods-iosMathTests-frameworks.sh\"\n";
569+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
599570
showEnvVarsInLog = 0;
600571
};
601572
C6253ABF539A9D25D25B1108 /* [CP] Copy Pods Resources */ = {
@@ -604,9 +575,12 @@
604575
files = (
605576
);
606577
inputPaths = (
578+
"${SRCROOT}/Pods/Target Support Files/Pods-iosMathTests/Pods-iosMathTests-resources.sh",
579+
"${PODS_CONFIGURATION_BUILD_DIR}/iosMath-iOS6.0/mathFonts.bundle",
607580
);
608581
name = "[CP] Copy Pods Resources";
609582
outputPaths = (
583+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle",
610584
);
611585
runOnlyForDeploymentPostprocessing = 0;
612586
shellPath = /bin/sh;
@@ -619,9 +593,12 @@
619593
files = (
620594
);
621595
inputPaths = (
596+
"${SRCROOT}/Pods/Target Support Files/Pods-iosMathExample/Pods-iosMathExample-resources.sh",
597+
"${PODS_CONFIGURATION_BUILD_DIR}/iosMath-iOS9.0/mathFonts.bundle",
622598
);
623599
name = "[CP] Copy Pods Resources";
624600
outputPaths = (
601+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle",
625602
);
626603
runOnlyForDeploymentPostprocessing = 0;
627604
shellPath = /bin/sh;
@@ -634,13 +611,16 @@
634611
files = (
635612
);
636613
inputPaths = (
614+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
615+
"${PODS_ROOT}/Manifest.lock",
637616
);
638617
name = "[CP] Check Pods Manifest.lock";
639618
outputPaths = (
619+
"$(DERIVED_FILE_DIR)/Pods-iosMathExample-checkManifestLockResult.txt",
640620
);
641621
runOnlyForDeploymentPostprocessing = 0;
642622
shellPath = /bin/sh;
643-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
623+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
644624
showEnvVarsInLog = 0;
645625
};
646626
/* End PBXShellScriptBuildPhase section */
@@ -753,12 +733,20 @@
753733
CLANG_CXX_LIBRARY = "libc++";
754734
CLANG_ENABLE_MODULES = YES;
755735
CLANG_ENABLE_OBJC_ARC = YES;
736+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
756737
CLANG_WARN_BOOL_CONVERSION = YES;
738+
CLANG_WARN_COMMA = YES;
757739
CLANG_WARN_CONSTANT_CONVERSION = YES;
740+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
758741
CLANG_WARN_EMPTY_BODY = YES;
759742
CLANG_WARN_ENUM_CONVERSION = YES;
760743
CLANG_WARN_INFINITE_RECURSION = YES;
761744
CLANG_WARN_INT_CONVERSION = YES;
745+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
746+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
747+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
748+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
749+
CLANG_WARN_STRICT_PROTOTYPES = YES;
762750
CLANG_WARN_SUSPICIOUS_MOVE = YES;
763751
CLANG_WARN_UNREACHABLE_CODE = YES;
764752
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -780,7 +768,7 @@
780768
GCC_WARN_UNINITIALIZED_AUTOS = YES;
781769
GCC_WARN_UNUSED_FUNCTION = YES;
782770
GCC_WARN_UNUSED_VARIABLE = YES;
783-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
771+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
784772
ONLY_ACTIVE_ARCH = YES;
785773
SDKROOT = iphoneos;
786774
TARGETED_DEVICE_FAMILY = "1,2";
@@ -795,12 +783,20 @@
795783
CLANG_CXX_LIBRARY = "libc++";
796784
CLANG_ENABLE_MODULES = YES;
797785
CLANG_ENABLE_OBJC_ARC = YES;
786+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
798787
CLANG_WARN_BOOL_CONVERSION = YES;
788+
CLANG_WARN_COMMA = YES;
799789
CLANG_WARN_CONSTANT_CONVERSION = YES;
790+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
800791
CLANG_WARN_EMPTY_BODY = YES;
801792
CLANG_WARN_ENUM_CONVERSION = YES;
802793
CLANG_WARN_INFINITE_RECURSION = YES;
803794
CLANG_WARN_INT_CONVERSION = YES;
795+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
796+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
797+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
798+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
799+
CLANG_WARN_STRICT_PROTOTYPES = YES;
804800
CLANG_WARN_SUSPICIOUS_MOVE = YES;
805801
CLANG_WARN_UNREACHABLE_CODE = YES;
806802
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -814,7 +810,7 @@
814810
GCC_WARN_UNINITIALIZED_AUTOS = YES;
815811
GCC_WARN_UNUSED_FUNCTION = YES;
816812
GCC_WARN_UNUSED_VARIABLE = YES;
817-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
813+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
818814
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
819815
SDKROOT = iphoneos;
820816
TARGETED_DEVICE_FAMILY = "1,2";

‎iosMath.xcodeproj/xcshareddata/xcschemes/iosMath.xcscheme‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -28,7 +28,7 @@
2828
buildForAnalyzing = "YES">
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "0D198B351C6AFD5AC715DEE4"
31+
BlueprintIdentifier = "000000001120"
3232
BuildableName = "libPods-iosMathExample.a"
3333
BlueprintName = "Pods-iosMathExample"
3434
ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -42,7 +42,7 @@
4242
buildForAnalyzing = "YES">
4343
<BuildableReference
4444
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "79146D0438FC83449563C364"
45+
BlueprintIdentifier = "000000001220"
4646
BuildableName = "libPods-iosMathTests.a"
4747
BlueprintName = "Pods-iosMathTests"
4848
ReferencedContainer = "container:Pods/Pods.xcodeproj">

‎iosMath.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)