Merge pull request #251 from ruslanskorb/develop

Version 4.1.0
ruslanskorb · Apr 8, 2024 · 1717c49 · 1717c49
2 parents 36c6289 + 7a7d096
commit 1717c49
Show file tree

Hide file tree

Showing 56 changed files with 475 additions and 190 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,16 +5,16 @@ on:
   workflow_dispatch:
 jobs:
   iOS:
-    runs-on: macos-12
+    runs-on: macos-13
     env:
-      DEVELOPER_DIR: '/Applications/Xcode_13.4.app/Contents/Developer'
+      DEVELOPER_DIR: '/Applications/Xcode_15.0.1.app/Contents/Developer'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.7'
           bundler-cache: true
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: Example/Pods
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -31,4 +31,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: e2296c0f63c75329f0583a4252b3dfcb582ff009
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2
diff --git a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj
@@ -31,7 +31,7 @@
 		B8D73A871B9B1E73003AFA4A /* RSKInternalUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = B8D73A861B9B1E73003AFA4A /* RSKInternalUtility.m */; };
 		B8F617661AE43CEF00499402 /* RSKImageCropperPerformanceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F617651AE43CEF00499402 /* RSKImageCropperPerformanceTests.m */; };
 		B8F617681AE4468000499402 /* RSKImageScrollViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F617671AE4468000499402 /* RSKImageScrollViewTests.m */; };
-		ED6AB2167F8AE24BA43C7555 /* libPods-RSKImageCropperExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1D7827AE01F17D6196BBEC0 /* libPods-RSKImageCropperExampleTests.a */; };
+		D6C4891228B0D5D4681BB50D /* libPods-RSKImageCropperExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2161A88867D09281BCE7A079 /* libPods-RSKImageCropperExampleTests.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -45,7 +45,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		01A71E3D794357135D4C815F /* Pods-RSKImageCropperExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RSKImageCropperExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-RSKImageCropperExampleTests/Pods-RSKImageCropperExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
+		2161A88867D09281BCE7A079 /* libPods-RSKImageCropperExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RSKImageCropperExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		46AAEE5D1B29155700E10C42 /* RSKImageCropViewController+Protected.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RSKImageCropViewController+Protected.h"; sourceTree = "<group>"; };
+		996086E4617CD3436300F4E4 /* Pods-RSKImageCropperExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RSKImageCropperExampleTests.release.xcconfig"; path = "Target Support Files/Pods-RSKImageCropperExampleTests/Pods-RSKImageCropperExampleTests.release.xcconfig"; sourceTree = "<group>"; };
 		B803F69C1AAB0A1F004141CF /* CGGeometry+RSKImageCropper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CGGeometry+RSKImageCropper.h"; sourceTree = "<group>"; };
 		B803F69D1AAB0A1F004141CF /* CGGeometry+RSKImageCropper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CGGeometry+RSKImageCropper.m"; sourceTree = "<group>"; };
 		B8182F2D1ABC998B00601E43 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
@@ -84,9 +87,6 @@
 		B8D73A861B9B1E73003AFA4A /* RSKInternalUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSKInternalUtility.m; sourceTree = "<group>"; };
 		B8F617651AE43CEF00499402 /* RSKImageCropperPerformanceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSKImageCropperPerformanceTests.m; sourceTree = "<group>"; };
 		B8F617671AE4468000499402 /* RSKImageScrollViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSKImageScrollViewTests.m; sourceTree = "<group>"; };
-		E6FAA073685BE5E78305A11F /* Pods-RSKImageCropperExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RSKImageCropperExampleTests.release.xcconfig"; path = "Target Support Files/Pods-RSKImageCropperExampleTests/Pods-RSKImageCropperExampleTests.release.xcconfig"; sourceTree = "<group>"; };
-		F1D7827AE01F17D6196BBEC0 /* libPods-RSKImageCropperExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RSKImageCropperExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		FB8BD8ED2909E82D44808408 /* Pods-RSKImageCropperExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RSKImageCropperExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-RSKImageCropperExampleTests/Pods-RSKImageCropperExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -107,7 +107,7 @@
 				B87A9A0919A4D2CD00D12CD4 /* XCTest.framework in Frameworks */,
 				B87A9A0B19A4D2CD00D12CD4 /* UIKit.framework in Frameworks */,
 				B87A9A0A19A4D2CD00D12CD4 /* Foundation.framework in Frameworks */,
-				ED6AB2167F8AE24BA43C7555 /* libPods-RSKImageCropperExampleTests.a in Frameworks */,
+				D6C4891228B0D5D4681BB50D /* libPods-RSKImageCropperExampleTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -117,8 +117,8 @@
 		45354A06E09E0095C4070E12 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				FB8BD8ED2909E82D44808408 /* Pods-RSKImageCropperExampleTests.debug.xcconfig */,
-				E6FAA073685BE5E78305A11F /* Pods-RSKImageCropperExampleTests.release.xcconfig */,
+				01A71E3D794357135D4C815F /* Pods-RSKImageCropperExampleTests.debug.xcconfig */,
+				996086E4617CD3436300F4E4 /* Pods-RSKImageCropperExampleTests.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -151,7 +151,7 @@
 				B87A99F119A4D2CD00D12CD4 /* CoreGraphics.framework */,
 				B87A99F319A4D2CD00D12CD4 /* UIKit.framework */,
 				B87A9A0819A4D2CD00D12CD4 /* XCTest.framework */,
-				F1D7827AE01F17D6196BBEC0 /* libPods-RSKImageCropperExampleTests.a */,
+				2161A88867D09281BCE7A079 /* libPods-RSKImageCropperExampleTests.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -276,7 +276,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = B87A9A1B19A4D2CD00D12CD4 /* Build configuration list for PBXNativeTarget "RSKImageCropperExampleTests" */;
 			buildPhases = (
-				60073F70E21CEB41C716D9E9 /* [CP] Check Pods Manifest.lock */,
+				E80ED87158857BE8135460A8 /* [CP] Check Pods Manifest.lock */,
 				B87A9A0319A4D2CD00D12CD4 /* Sources */,
 				B87A9A0419A4D2CD00D12CD4 /* Frameworks */,
 				B87A9A0519A4D2CD00D12CD4 /* Resources */,
@@ -352,7 +352,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		60073F70E21CEB41C716D9E9 /* [CP] Check Pods Manifest.lock */ = {
+		E80ED87158857BE8135460A8 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -555,12 +555,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = J3P7YV7464;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "RSKImageCropperExample/RSKImageCropperExample-Prefix.pch";
 				INFOPLIST_FILE = "RSKImageCropperExample/RSKImageCropperExample-Info.plist";
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ruslanskorb.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = RSKImageCropperExample;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -572,12 +572,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = J3P7YV7464;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "RSKImageCropperExample/RSKImageCropperExample-Prefix.pch";
 				INFOPLIST_FILE = "RSKImageCropperExample/RSKImageCropperExample-Info.plist";
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ruslanskorb.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = RSKImageCropperExample;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -587,7 +587,7 @@
 		};
 		B87A9A1C19A4D2CD00D12CD4 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FB8BD8ED2909E82D44808408 /* Pods-RSKImageCropperExampleTests.debug.xcconfig */;
+			baseConfigurationReference = 01A71E3D794357135D4C815F /* Pods-RSKImageCropperExampleTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/RSKImageCropperExample.app/RSKImageCropperExample";
 				DEVELOPMENT_TEAM = J3P7YV7464;
@@ -611,7 +611,7 @@
 		};
 		B87A9A1D19A4D2CD00D12CD4 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E6FAA073685BE5E78305A11F /* Pods-RSKImageCropperExampleTests.release.xcconfig */;
+			baseConfigurationReference = 996086E4617CD3436300F4E4 /* Pods-RSKImageCropperExampleTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/RSKImageCropperExample.app/RSKImageCropperExample";
 				DEVELOPMENT_TEAM = J3P7YV7464;

diff --git a/...e/RSKImageCropperExample.xcodeproj/xcshareddata/xcschemes/RSKImageCropperExample.xcscheme b/...e/RSKImageCropperExample.xcodeproj/xcshareddata/xcschemes/RSKImageCropperExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1340"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m b/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m
@@ -44,8 +44,8 @@ - (CGRect)imageCropViewControllerCustomMaskRect:(RSKImageCropViewController *)co
     CGFloat viewWidth = CGRectGetWidth(controller.view.frame);
     CGFloat viewHeight = CGRectGetHeight(controller.view.frame);
 
-    CGRect maskRect = CGRectMake((viewWidth - maskSize.width) * 0.5f,
-                                 (viewHeight - maskSize.height) * 0.5f,
+    CGRect maskRect = CGRectMake(floor((viewWidth - maskSize.width) * 0.5f),
+                                 floor((viewHeight - maskSize.height) * 0.5f),
                                  maskSize.width,
                                  maskSize.height);
 
@@ -147,8 +147,8 @@ - (void)resetZoomScale;
     [imageCropViewController.view setNeedsLayout];
     [imageCropViewController.view layoutIfNeeded];
 
-    [imageCropViewController viewWillAppear:YES];
-    [imageCropViewController viewDidAppear:YES];
+    [imageCropViewController beginAppearanceTransition:YES animated:YES];
+    [imageCropViewController endAppearanceTransition];
 };
 
 beforeAll(^{
@@ -815,9 +815,11 @@ - (void)resetZoomScale;
         [[mock expect] setNavigationBarHidden:YES animated:NO];
 
         [imageCropViewController view];
-        [imageCropViewController viewWillAppear:NO];
+        [imageCropViewController beginAppearanceTransition:YES animated:NO];
 
         [mock verify];
+
+        [imageCropViewController endAppearanceTransition];
     });
 
     it(@"restores visibility of the navigation bar in viewWillDisappear:", ^{
@@ -827,13 +829,16 @@ - (void)resetZoomScale;
         id mock = [OCMockObject partialMockForObject:navigationController];
 
         [imageCropViewController view];
-        [imageCropViewController viewWillAppear:NO];
+        [imageCropViewController beginAppearanceTransition:YES animated:NO];
+        [imageCropViewController endAppearanceTransition];
 
         [[mock expect] setNavigationBarHidden:imageCropViewController.originalNavigationControllerNavigationBarHidden animated:NO];
 
-        [imageCropViewController viewWillDisappear:NO];
+        [imageCropViewController beginAppearanceTransition:NO animated:NO];
 
         [mock verify];
+
+        [imageCropViewController endAppearanceTransition];
     });
 
     after(^{
@@ -990,6 +995,7 @@ - (void)resetZoomScale;
 
             sharedIt();
 
+            imageCropViewController.imageScrollView.transform = CGAffineTransformIdentity;
             expect(imageCropViewController.imageScrollView.frame).after(kLayoutImageScrollViewAnimationDuration).to.equal(imageCropViewController.maskRect);
         });
 
@@ -998,6 +1004,7 @@ - (void)resetZoomScale;
 
             sharedIt();
 
+            imageCropViewController.imageScrollView.transform = CGAffineTransformIdentity;
             expect(imageCropViewController.imageScrollView.frame).after(kLayoutImageScrollViewAnimationDuration).to.equal(imageCropViewController.maskRect);
         });
 
@@ -1076,17 +1083,10 @@ - (void)resetZoomScale;
     });
 
     it(@"zooms to a specific area of the image", ^{
-        CGRect rect = CGRectMake(100.0, 100.0, 400.0, 400.0);
+        CGRect rect = CGRectMake(196.0f, 290.0f, 60.0f, 60.0f);
         [imageCropViewController zoomToRect:rect animated:NO];
 
-        UIScrollView *imageScrollView = imageCropViewController.imageScrollView;
-        CGRect visibleRect = CGRectMake(round(imageScrollView.contentOffset.x / imageScrollView.zoomScale),
-                                        round(imageScrollView.contentOffset.y / imageScrollView.zoomScale),
-                                        imageScrollView.bounds.size.width / imageScrollView.zoomScale,
-                                        imageScrollView.bounds.size.height / imageScrollView.zoomScale);
-
-        BOOL contains = CGRectContainsRect(visibleRect, rect);
-        expect(contains).to.beTruthy();
+        expect(imageCropViewController.view).to.haveValidSnapshot();
     });
 
     after(^{

diff --git a/Example/RSKImageCropperExampleTests/RSKImageCropperPerformanceTests.m b/Example/RSKImageCropperExampleTests/RSKImageCropperPerformanceTests.m
@@ -50,8 +50,8 @@ - (void)setUp
     [self.imageCropViewController.view updateConstraintsIfNeeded];
     [self.imageCropViewController.view setNeedsLayout];
     [self.imageCropViewController.view layoutIfNeeded];
-    [self.imageCropViewController viewWillAppear:NO];
-    [self.imageCropViewController viewDidAppear:NO];
+    [self.imageCropViewController beginAppearanceTransition:YES animated:NO];
+    [self.imageCropViewController endAppearanceTransition];
 }
 
 - (void)tearDown

diff --git a/Example/RSKImageCropperExampleTests/RSKImageScrollViewTests.m b/Example/RSKImageCropperExampleTests/RSKImageScrollViewTests.m
@@ -30,7 +30,7 @@
 __block UIImage *image = nil;
 
 dispatch_block_t sharedIt = ^{
-    [imageScrollView displayImage:image];
+    imageScrollView.image = image;
 
     [imageScrollView setNeedsLayout];
     [imageScrollView layoutIfNeeded];

diff --git a/.../crop_image_crop_image_with_any_image_orientation_UIImageOrientationDown@3x.png b/.../crop_image_crop_image_with_any_image_orientation_UIImageOrientationDown@3x.png
diff --git a/...age_crop_image_with_any_image_orientation_UIImageOrientationDownMirrored@3x.png b/...age_crop_image_with_any_image_orientation_UIImageOrientationDownMirrored@3x.png
diff --git a/.../crop_image_crop_image_with_any_image_orientation_UIImageOrientationLeft@3x.png b/.../crop_image_crop_image_with_any_image_orientation_UIImageOrientationLeft@3x.png
diff --git a/...age_crop_image_with_any_image_orientation_UIImageOrientationLeftMirrored@3x.png b/...age_crop_image_with_any_image_orientation_UIImageOrientationLeftMirrored@3x.png
diff --git a/...crop_image_crop_image_with_any_image_orientation_UIImageOrientationRight@3x.png b/...crop_image_crop_image_with_any_image_orientation_UIImageOrientationRight@3x.png
diff --git a/...ge_crop_image_with_any_image_orientation_UIImageOrientationRightMirrored@3x.png b/...ge_crop_image_with_any_image_orientation_UIImageOrientationRightMirrored@3x.png
diff --git a/...image_crop_image_with_any_image_orientation_UIImageOrientationUpMirrored@3x.png b/...image_crop_image_with_any_image_orientation_UIImageOrientationUpMirrored@3x.png
diff --git a/...eCropModeCircle_correctly_crop_the_image_when_all_properties_are_default@3x.png b/...eCropModeCircle_correctly_crop_the_image_when_all_properties_are_default@3x.png
diff --git a/...pModeCircle_correctly_crop_the_image_when_applyMaskToCroppedImage_is_YES@3x.png b/...pModeCircle_correctly_crop_the_image_when_applyMaskToCroppedImage_is_YES@3x.png
diff --git a/...odeCircle_correctly_crop_the_image_when_content_offset_is_not_equal_to_0@3x.png b/...odeCircle_correctly_crop_the_image_when_content_offset_is_not_equal_to_0@3x.png
diff --git a/...crop_the_image_when_rotation_angle_and_content_offset_are_not_equal_to_0@3x.png b/...crop_the_image_when_rotation_angle_and_content_offset_are_not_equal_to_0@3x.png
diff --git a/...odeCircle_correctly_crop_the_image_when_rotation_angle_is_not_equal_to_0@3x.png b/...odeCircle_correctly_crop_the_image_when_rotation_angle_is_not_equal_to_0@3x.png
diff --git a/...eCropModeCustom_correctly_crop_the_image_when_all_properties_are_default@3x.png b/...eCropModeCustom_correctly_crop_the_image_when_all_properties_are_default@3x.png
diff --git a/...pModeCustom_correctly_crop_the_image_when_applyMaskToCroppedImage_is_YES@3x.png b/...pModeCustom_correctly_crop_the_image_when_applyMaskToCroppedImage_is_YES@3x.png
diff --git a/...deCustom_correctly_crop_the_image_when_content_offset_are_not_equal_to_0@3x.png b/...deCustom_correctly_crop_the_image_when_content_offset_are_not_equal_to_0@3x.png
diff --git a/...crop_the_image_when_rotation_angle_and_content_offset_are_not_equal_to_0@3x.png b/...crop_the_image_when_rotation_angle_and_content_offset_are_not_equal_to_0@3x.png
diff --git a/...odeCustom_correctly_crop_the_image_when_rotation_angle_is_not_equal_to_0@3x.png b/...odeCustom_correctly_crop_the_image_when_rotation_angle_is_not_equal_to_0@3x.png
diff --git a/...eCropModeSquare_correctly_crop_the_image_when_all_properties_are_default@3x.png b/...eCropModeSquare_correctly_crop_the_image_when_all_properties_are_default@3x.png
diff --git a/...pModeSquare_correctly_crop_the_image_when_applyMaskToCroppedImage_is_YES@3x.png b/...pModeSquare_correctly_crop_the_image_when_applyMaskToCroppedImage_is_YES@3x.png
diff --git a/...deSquare_correctly_crop_the_image_when_content_offset_are_not_equal_to_0@3x.png b/...deSquare_correctly_crop_the_image_when_content_offset_are_not_equal_to_0@3x.png
diff --git a/...crop_the_image_when_rotation_angle_and_content_offset_are_not_equal_to_0@3x.png b/...crop_the_image_when_rotation_angle_and_content_offset_are_not_equal_to_0@3x.png
diff --git a/...odeSquare_correctly_crop_the_image_when_rotation_angle_is_not_equal_to_0@3x.png b/...odeSquare_correctly_crop_the_image_when_rotation_angle_is_not_equal_to_0@3x.png
diff --git a/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCircle@3x.png b/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCircle@3x.png
diff --git a/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCustom@3x.png b/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCustom@3x.png
diff --git a/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeSquare@3x.png b/...landscape_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeSquare@3x.png
diff --git a/...landscape_stroke_of_the_mask_looks_right_when_storked_outline_is_visible@3x.png b/...landscape_stroke_of_the_mask_looks_right_when_storked_outline_is_visible@3x.png
diff --git a/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCircle@3x.png b/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCircle@3x.png
diff --git a/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCustom@3x.png b/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeCustom@3x.png
diff --git a/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeSquare@3x.png b/..._portrait_crop_mode_looks_right_when_crop_mode_is_RSKImageCropModeSquare@3x.png
diff --git a/..._portrait_stroke_of_the_mask_looks_right_when_stroked_outline_is_visible@3x.png b/..._portrait_stroke_of_the_mask_looks_right_when_stroked_outline_is_visible@3x.png
diff --git a/...eCropViewControllerSpec/[email protected] b/...eCropViewControllerSpec/[email protected]
diff --git a/...ts/ReferenceImages/RSKImageScrollViewSpec/[email protected] b/...ts/ReferenceImages/RSKImageScrollViewSpec/[email protected]
diff --git a/...mages/RSKImageScrollViewSpec/[email protected] b/...mages/RSKImageScrollViewSpec/[email protected]
diff --git a/...c/visuals_looks_right_with_minimum_zoom_scale_and_when_aspectFill_is_YES@3x.png b/...c/visuals_looks_right_with_minimum_zoom_scale_and_when_aspectFill_is_YES@3x.png
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '1.11.3'
+gem 'cocoapods', '1.15.2'
 
 gem 'fui', '0.5.0'
 gem 'xcpretty', '0.3.0'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: e2296c0f63c75329f0583a4252b3dfcb582ff009

		COCOAPODS: 1.11.3
		COCOAPODS: 1.15.2