From d6b61b16fbeab57536a193016217ad38b16b05eb Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 19:08:52 -0700 Subject: [PATCH 01/12] IPHONEOS_DEPLOYMENT_TARGET = 8.0 --- MathEditor.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 MathEditor.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/MathEditor.xcodeproj/project.pbxproj b/MathEditor.xcodeproj/project.pbxproj index e601607..8010306 100644 --- a/MathEditor.xcodeproj/project.pbxproj +++ b/MathEditor.xcodeproj/project.pbxproj @@ -609,7 +609,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -629,7 +629,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/MathEditor.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MathEditor.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/MathEditor.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From 8edf8892cb1cac9ae49691ba07333460a0794c43 Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 19:12:38 -0700 Subject: [PATCH 02/12] Temp modify Podfile to use iosMath 4f46aff6b745676ff3d98752bb7f5189fc448843 --- Podfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Podfile b/Podfile index e0a9d88..8e8788f 100644 --- a/Podfile +++ b/Podfile @@ -9,5 +9,8 @@ target 'MathEditor_Tests' do pod 'MathEditor', :path => './' end target 'MathEditor' do - pod 'iosMath' + # Kellyroach/fix warnings (#103) has been approved and merged onto iosMath master + # at commit = 4f46aff6b745676ff3d98752bb7f5189fc448843 , but isn't released on + # COCOAPODS.ORG yet. Temporarily, modify Podfile on our branch to point to this commit. + pod 'iosMath', :git => 'https://github.com/kostub/iosMath.git', :commit => '4f46aff6b745676ff3d98752bb7f5189fc448843' end From c2686f3187d2b360998a5b2d07d53f70b666f3f6 Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 19:14:45 -0700 Subject: [PATCH 03/12] pod install --- MathEditor.xcodeproj/project.pbxproj | 60 ++++++++++++---------------- Podfile.lock | 24 +++++++---- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/MathEditor.xcodeproj/project.pbxproj b/MathEditor.xcodeproj/project.pbxproj index 8010306..8084a74 100644 --- a/MathEditor.xcodeproj/project.pbxproj +++ b/MathEditor.xcodeproj/project.pbxproj @@ -336,7 +336,6 @@ 6003F586195388D20070C39A /* Sources */, 6003F587195388D20070C39A /* Frameworks */, 6003F588195388D20070C39A /* Resources */, - D8A5CFAD5F09AAA428AB4D10 /* [CP] Embed Pods Frameworks */, E202BD0EA2A01E97CAF04F2E /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -356,7 +355,6 @@ 6003F5AA195388D20070C39A /* Sources */, 6003F5AB195388D20070C39A /* Frameworks */, 6003F5AC195388D20070C39A /* Resources */, - E5084554A0ECA0F3755B8CC7 /* [CP] Embed Pods Frameworks */, 02495CB9EE6CCCBF5814B5C0 /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -431,9 +429,14 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-MathEditor_Tests/Pods-MathEditor_Tests-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/MathEditor/MTKeyboardResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/iosMath/mathFonts.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MTKeyboardResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -446,13 +449,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-MathEditor-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + 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"; showEnvVarsInLog = 0; }; 4B44B263AD3BCE039EE8DD71 /* [CP] Check Pods Manifest.lock */ = { @@ -461,13 +467,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-MathEditor_Tests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + 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"; showEnvVarsInLog = 0; }; 4C3A2645A6B5FE31FA662BF1 /* [CP] Copy Pods Resources */ = { @@ -476,9 +485,12 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-MathEditor/Pods-MathEditor-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/iosMath/mathFonts.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -491,28 +503,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-MathEditor_Example-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; - showEnvVarsInLog = 0; - }; - D8A5CFAD5F09AAA428AB4D10 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MathEditor_Example/Pods-MathEditor_Example-frameworks.sh\"\n"; + 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"; showEnvVarsInLog = 0; }; E202BD0EA2A01E97CAF04F2E /* [CP] Copy Pods Resources */ = { @@ -521,30 +521,20 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-MathEditor_Example/Pods-MathEditor_Example-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/MathEditor/MTKeyboardResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/iosMath/mathFonts.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MTKeyboardResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/mathFonts.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MathEditor_Example/Pods-MathEditor_Example-resources.sh\"\n"; showEnvVarsInLog = 0; }; - E5084554A0ECA0F3755B8CC7 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MathEditor_Tests/Pods-MathEditor_Tests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Podfile.lock b/Podfile.lock index 5f07901..bf9cfb4 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,20 +1,28 @@ PODS: - - iosMath (0.9.3) - - MathEditor (0.2.0): + - iosMath (0.9.4) + - MathEditor (0.3.0): - iosMath (~> 0.9.3) DEPENDENCIES: - - iosMath + - iosMath (from `https://github.com/kostub/iosMath.git`, commit `4f46aff6b745676ff3d98752bb7f5189fc448843`) - MathEditor (from `./`) EXTERNAL SOURCES: + iosMath: + :commit: 4f46aff6b745676ff3d98752bb7f5189fc448843 + :git: https://github.com/kostub/iosMath.git MathEditor: - :path: ./ + :path: "./" + +CHECKOUT OPTIONS: + iosMath: + :commit: 4f46aff6b745676ff3d98752bb7f5189fc448843 + :git: https://github.com/kostub/iosMath.git SPEC CHECKSUMS: - iosMath: 619e53c34dfa19ac3062869f9974747b44507083 - MathEditor: e93c1344182203e0eafe5c95a6c424a3bbc89bbd + iosMath: f7a6cbadf9d836d2149c2a84c435b1effc244cba + MathEditor: f470005e0d04126644a80b7a245d7ce7c68a9e40 -PODFILE CHECKSUM: 824592d1d06afe0a23f07736e4e1f8968e497263 +PODFILE CHECKSUM: 9be28ece4538835d86d317c30c8f19bce87fc88c -COCOAPODS: 1.1.1 +COCOAPODS: 1.5.3 From cde6a1d5985ff26f5e28dae9bb2ce54fdbd6e716 Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 19:17:59 -0700 Subject: [PATCH 04/12] Xcode 9.4.1 Update to recommended settings --- MathEditor.xcodeproj/project.pbxproj | 28 ++++++++++++++++++- .../xcschemes/iosMathEditor-Example.xcscheme | 2 +- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/MathEditor.xcodeproj/project.pbxproj b/MathEditor.xcodeproj/project.pbxproj index 8084a74..bae7b70 100644 --- a/MathEditor.xcodeproj/project.pbxproj +++ b/MathEditor.xcodeproj/project.pbxproj @@ -373,7 +373,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = MT; - LastUpgradeCheck = 0720; + LastUpgradeCheck = 0940; ORGANIZATIONNAME = "Kostub Deshmukh"; TargetAttributes = { 490BE5551CE695CC00AE31A0 = { @@ -638,19 +638,32 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -678,18 +691,31 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; diff --git a/MathEditor.xcodeproj/xcshareddata/xcschemes/iosMathEditor-Example.xcscheme b/MathEditor.xcodeproj/xcshareddata/xcschemes/iosMathEditor-Example.xcscheme index 6ca118a..0a10336 100644 --- a/MathEditor.xcodeproj/xcshareddata/xcschemes/iosMathEditor-Example.xcscheme +++ b/MathEditor.xcodeproj/xcshareddata/xcschemes/iosMathEditor-Example.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 12 Jul 2018 19:19:58 -0700 Subject: [PATCH 05/12] Fix 'Block implicitly retains self' yellow warning --- mathEditor/keyboard/MTMathKeyboardRootView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathEditor/keyboard/MTMathKeyboardRootView.m b/mathEditor/keyboard/MTMathKeyboardRootView.m index cdbb35f..1bc222a 100644 --- a/mathEditor/keyboard/MTMathKeyboardRootView.m +++ b/mathEditor/keyboard/MTMathKeyboardRootView.m @@ -130,7 +130,7 @@ -(void)assignAndAnimateKeyboard:(NSInteger)keyboardNumber _currentKeyboard.alpha = 1.0; [UIView animateWithDuration:0.1 animations:^{ newKeyboard.alpha = 1.0; - _currentKeyboard.alpha = 0.5; + self->_currentKeyboard.alpha = 0.5; }]; [_contentView bringSubviewToFront:newKeyboard]; From 0a9b8b236e4f2209eb6fb0f4ebfe9ebe7a2aba6f Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 19:22:35 -0700 Subject: [PATCH 06/12] Fix 'Dead Store' Analyze issue --- mathEditor/internal/MTDisplay+Editing.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathEditor/internal/MTDisplay+Editing.m b/mathEditor/internal/MTDisplay+Editing.m index bc719e4..36dbc77 100644 --- a/mathEditor/internal/MTDisplay+Editing.m +++ b/mathEditor/internal/MTDisplay+Editing.m @@ -534,7 +534,7 @@ - (MTDisplay*) subAtomForIndex:(MTMathListIndex*) index - (CGPoint)caretPositionForIndex:(MTMathListIndex *)index { - CGPoint position = kInvalidPosition; + CGPoint position; if (!index) { return kInvalidPosition; } From 3f69d4de3681afacb53e048d1c201392c54497ec Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 19:41:33 -0700 Subject: [PATCH 07/12] Fix 'nil returned from a method' Analyze issue --- mathEditor/editor/MTEditableMathLabel.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mathEditor/editor/MTEditableMathLabel.m b/mathEditor/editor/MTEditableMathLabel.m index 05f528f..feedef7 100644 --- a/mathEditor/editor/MTEditableMathLabel.m +++ b/mathEditor/editor/MTEditableMathLabel.m @@ -1004,7 +1004,8 @@ - (void)replaceRange:(UITextRange *)range withText:(NSString *)text } - (NSArray *)selectionRectsForRange:(UITextRange *)range { - return nil; + // NOTE: Must return non-nil NSArray* according to UIKit/Headers/UITextInput.h + return [NSArray array]; } - (void)setBaseWritingDirection:(UITextWritingDirection)writingDirection forRange:(UITextRange *)range { From 503673be184e2ca0eaa1048f1fa2971abf21950f Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 19:57:51 -0700 Subject: [PATCH 08/12] Fix another 'nil returned from a method' Analyze issue --- mathEditor/editor/MTEditableMathLabel.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mathEditor/editor/MTEditableMathLabel.m b/mathEditor/editor/MTEditableMathLabel.m index feedef7..8aa10c4 100644 --- a/mathEditor/editor/MTEditableMathLabel.m +++ b/mathEditor/editor/MTEditableMathLabel.m @@ -976,7 +976,12 @@ - (void)insertDictationResult:(NSArray *)dictationResult } - (id)insertDictationResultPlaceholder { - return nil; + // NOTE: "Implementation of this method is optional ... + // The actual contents of the object are not accessed by UIKit but + // you can use the object to store whatever information you need + // to identify the location for the animation." + // https://developer.apple.com/documentation/uikit/uitextinput/1614466-insertdictationresultplaceholder?language=objc + return [NSObject new]; } - (NSInteger)offsetFromPosition:(UITextPosition *)fromPosition toPosition:(UITextPosition *)toPosition From ad5c45bb6a6dadc6c90f00badc6be13a7aa1e4d2 Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 20:17:13 -0700 Subject: [PATCH 09/12] Fix 'Could not load the keyboard-marine-pressed image' runtime error (capitalization issue in MTKeyboardTab3.xib) --- MathKeyboardResources/MTKeyboardTab3.xib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MathKeyboardResources/MTKeyboardTab3.xib b/MathKeyboardResources/MTKeyboardTab3.xib index ba3d5b6..e1fd211 100644 --- a/MathKeyboardResources/MTKeyboardTab3.xib +++ b/MathKeyboardResources/MTKeyboardTab3.xib @@ -262,7 +262,7 @@ - + @@ -476,7 +476,7 @@ - + From 1da4d20ef0cab996e567f3350d13bbc609d65753 Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 20:20:58 -0700 Subject: [PATCH 10/12] Done testing and fixing. Restoring original Podfile before we branched. --- Podfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Podfile b/Podfile index 8e8788f..e0a9d88 100644 --- a/Podfile +++ b/Podfile @@ -9,8 +9,5 @@ target 'MathEditor_Tests' do pod 'MathEditor', :path => './' end target 'MathEditor' do - # Kellyroach/fix warnings (#103) has been approved and merged onto iosMath master - # at commit = 4f46aff6b745676ff3d98752bb7f5189fc448843 , but isn't released on - # COCOAPODS.ORG yet. Temporarily, modify Podfile on our branch to point to this commit. - pod 'iosMath', :git => 'https://github.com/kostub/iosMath.git', :commit => '4f46aff6b745676ff3d98752bb7f5189fc448843' + pod 'iosMath' end From 70038e066f2512eafd2a14fc5c7a17441b591995 Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 20:21:49 -0700 Subject: [PATCH 11/12] pod install --- Podfile.lock | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index bf9cfb4..1fb6169 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -4,25 +4,21 @@ PODS: - iosMath (~> 0.9.3) DEPENDENCIES: - - iosMath (from `https://github.com/kostub/iosMath.git`, commit `4f46aff6b745676ff3d98752bb7f5189fc448843`) + - iosMath - MathEditor (from `./`) +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - iosMath + EXTERNAL SOURCES: - iosMath: - :commit: 4f46aff6b745676ff3d98752bb7f5189fc448843 - :git: https://github.com/kostub/iosMath.git MathEditor: :path: "./" -CHECKOUT OPTIONS: - iosMath: - :commit: 4f46aff6b745676ff3d98752bb7f5189fc448843 - :git: https://github.com/kostub/iosMath.git - SPEC CHECKSUMS: iosMath: f7a6cbadf9d836d2149c2a84c435b1effc244cba MathEditor: f470005e0d04126644a80b7a245d7ce7c68a9e40 -PODFILE CHECKSUM: 9be28ece4538835d86d317c30c8f19bce87fc88c +PODFILE CHECKSUM: 824592d1d06afe0a23f07736e4e1f8968e497263 COCOAPODS: 1.5.3 From b8ae5afa5687875d7471da2bf9a08eb14b61cbbb Mon Sep 17 00:00:00 2001 From: Kelly Roach Date: Thu, 12 Jul 2018 21:31:36 -0700 Subject: [PATCH 12/12] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1c1977b..9127e12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # * http://www.objc.io/issue-6/travis-ci.html language: objective-c -osx_image: xcode7.1 +osx_image: xcode9.4 # cache: cocoapods before_install: - gem install cocoapods # Since Travis is not always on latest version