- Fixed a compilation issue

- Updated Xcode version in travis.yml
hackiftekhar · May 1, 2019 · 24d498a · 24d498a
1 parent c861956
commit 24d498a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
           only:
               - master
       os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       xcode_workspace: Demo.xcworkspace
       xcode_project: Demo.xcodeproj
       xcode_scheme: DemoObjC
@@ -22,7 +22,7 @@ matrix:
           only:
               - master
       os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       xcode_workspace: Demo.xcworkspace
       xcode_project: Demo.xcodeproj
       xcode_scheme: DemoSwift

diff --git a/...roj/project.xcworkspace/xcuserdata/iemacbook01.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/iemacbook01.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/IQKeyboardManager/IQKeyboardManager.m b/IQKeyboardManager/IQKeyboardManager.m
@@ -50,6 +50,7 @@
 #import <UIKit/UITouch.h>
 #import <UIKit/UIWindow.h>
 #import <UIKit/NSLayoutConstraint.h>
+#import <UIKit/UIStackView.h>
 
 NSInteger const kIQDoneButtonToolbarTag             =   -1002;
 NSInteger const kIQPreviousNextButtonToolbarTag     =   -1005;
@@ -629,7 +630,7 @@ -(void)adjustPosition
 
     CGFloat keyboardDistanceFromTextField = (specialKeyboardDistanceFromTextField == kIQUseDefaultKeyboardDistance)?_keyboardDistanceFromTextField:specialKeyboardDistanceFromTextField;
 
-    CGSize kbSize = _kbFrame.size;
+    CGSize kbSize;
 
     {
         CGRect kbFrame = _kbFrame;
@@ -1324,10 +1325,12 @@ - (void)keyboardWillHide:(NSNotification*)aNotification
     if (strongLastScrollView)
     {
         __weak typeof(self) weakSelf = self;
+        __weak typeof(UIView) *weakTextFieldView = self.textFieldView;
 
         [UIView animateWithDuration:_animationDuration delay:0 options:(_animationCurve|UIViewAnimationOptionBeginFromCurrentState) animations:^{
 
             __strong typeof(self) strongSelf = weakSelf;
+            __strong typeof(UIView) *strongTextFieldView = weakTextFieldView;
 
             if (UIEdgeInsetsEqualToEdgeInsets(strongLastScrollView.contentInset, strongSelf.startingContentInsets) == NO)
             {
@@ -1348,7 +1351,7 @@ - (void)keyboardWillHide:(NSNotification*)aNotification
                 if (IQ_IS_IOS9_OR_GREATER)
 #endif
                 {
-                    animatedContentOffset = ([strongSelf.textFieldView superviewOfClassType:[UIStackView class] belowView:strongLastScrollView] != nil);
+                    animatedContentOffset = ([strongTextFieldView superviewOfClassType:[UIStackView class] belowView:strongLastScrollView] != nil);
                 }
 
                 if (animatedContentOffset) {