From 6db4e7e6b84ea54a85fbd9efda2c02b0f88cbcfc Mon Sep 17 00:00:00 2001 From: Ruslan Skorb Date: Thu, 8 Oct 2020 13:25:52 +0300 Subject: [PATCH 1/8] [Example] [RSKImageCropViewControllerTests] [crop image] Initialize and configure `croppedImageImageView` before each test. --- .../RSKImageCropViewControllerTests.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m b/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m index 834ae24..553e90c 100644 --- a/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m +++ b/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m @@ -220,6 +220,11 @@ - (void)resetZoomScale; describe(@"crop image", ^{ __block UIImageView *croppedImageImageView = nil; + before(^{ + croppedImageImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 130.0, 130.0)]; + croppedImageImageView.contentMode = UIViewContentModeScaleAspectFit; + }); + dispatch_block_t sharedIt = ^{ UIImage *croppedImage = [imageCropViewController croppedImage:imageCropViewController.originalImage cropMode:imageCropViewController.cropMode cropRect:imageCropViewController.cropRect imageRect:imageCropViewController.imageRect rotationAngle:imageCropViewController.rotationAngle zoomScale:imageCropViewController.zoomScale maskPath:imageCropViewController.maskPath applyMaskToCroppedImage:imageCropViewController.applyMaskToCroppedImage]; @@ -234,8 +239,6 @@ - (void)resetZoomScale; describe(@"crop mode is `RSKImageCropModeCircle`", ^{ before(^{ imageCropViewController = [[RSKImageCropViewController alloc] initWithImage:originalImage cropMode:RSKImageCropModeCircle]; - croppedImageImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 130.0, 130.0)]; - croppedImageImageView.contentMode = UIViewContentModeScaleAspectFit; sharedLoadView(); }); From d569414604c6bccc7c76776a3938b74c2c5bbe0e Mon Sep 17 00:00:00 2001 From: Ruslan Skorb Date: Thu, 8 Oct 2020 13:29:55 +0300 Subject: [PATCH 2/8] [README] [Installation] Add `Using [Swift Package Manager]`. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 0bf3b26..efd5bd0 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,12 @@ An image cropper for iOS like in the Contacts app with support for landscape ori ## Installation *RSKImageCropper requires iOS 6.0 or later.* +### Using [Swift Package Manager](https://swift.org/package-manager/) + +1. To add the `RSKImageCropper` package to your Xcode project, select File > Swift Packages > Add Package Dependency and enter the repository URL. + + https://github.com/ruslanskorb/RSKImageCropper.git + ### Using [CocoaPods](http://cocoapods.org) 1. Add the pod `RSKImageCropper` to your [Podfile](http://guides.cocoapods.org/using/the-podfile.html). From 512a1878a4a5c055aa8207b4ac95978370d82fbb Mon Sep 17 00:00:00 2001 From: Ruslan Skorb Date: Thu, 8 Oct 2020 13:34:44 +0300 Subject: [PATCH 3/8] [Package.swift + README + Example + RSKImageCropper] Update version of minimum supported iOS platform (9.0). --- Example/Podfile | 4 ++-- Example/Podfile.lock | 6 +++--- Example/RSKImageCropperExample.xcodeproj/project.pbxproj | 4 ++-- Package.swift | 2 +- README.md | 2 +- RSKImageCropper.xcodeproj/project.pbxproj | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Example/Podfile b/Example/Podfile index 915d9ed..e2fc341 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,4 +1,4 @@ -platform :ios, '8.0' +platform :ios, '9.0' inhibit_all_warnings! @@ -13,7 +13,7 @@ target 'RSKImageCropperExampleTests' do installer.pods_project.targets.each do |target| if target.name == 'Expecta' || target.name == 'Specta' || target.name == 'FBSnapshotTestCase' target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' end end end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 9be9a36..56a9e7c 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -15,7 +15,7 @@ DEPENDENCIES: - Specta (= 1.0.7) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - Expecta - "Expecta+Snapshots" - FBSnapshotTestCase @@ -29,6 +29,6 @@ SPEC CHECKSUMS: OCMock: ebe9ee1dca7fbed0ff9193ac0b3e2d8862ea56f6 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 -PODFILE CHECKSUM: b86b013bec210aa1f997028a5c25b96c1125fbd9 +PODFILE CHECKSUM: 18474e83bf091eb6550572c22fb3534227bfa142 -COCOAPODS: 1.5.3 +COCOAPODS: 1.9.3 diff --git a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj index 7931c7c..b538835 100644 --- a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj +++ b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj @@ -492,7 +492,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, .., ); - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -546,7 +546,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, .., ); - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; diff --git a/Package.swift b/Package.swift index 5b5bf8b..ec13ed6 100644 --- a/Package.swift +++ b/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "RSKImageCropper", - platforms: [.iOS(.v8)], + platforms: [.iOS(.v9)], products: [ .library( name: "RSKImageCropper", diff --git a/README.md b/README.md index efd5bd0..af9ce57 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ An image cropper for iOS like in the Contacts app with support for landscape orientation. ## Installation -*RSKImageCropper requires iOS 6.0 or later.* +*RSKImageCropper requires iOS 9.0 or later.* ### Using [Swift Package Manager](https://swift.org/package-manager/) diff --git a/RSKImageCropper.xcodeproj/project.pbxproj b/RSKImageCropper.xcodeproj/project.pbxproj index 9b95ae2..64d761c 100644 --- a/RSKImageCropper.xcodeproj/project.pbxproj +++ b/RSKImageCropper.xcodeproj/project.pbxproj @@ -257,7 +257,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -309,7 +309,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; From 4eff8e0c9131bfa7aa0c5dfb4373284c6f6783b5 Mon Sep 17 00:00:00 2001 From: Ruslan Skorb Date: Thu, 8 Oct 2020 13:35:46 +0300 Subject: [PATCH 4/8] [Example] Remove `LaunchImage`. --- .../project.pbxproj | 2 - .../Images.xcassets/Contents.json | 6 +-- .../LaunchImage.launchimage/Contents.json | 51 ------------------- 3 files changed, 3 insertions(+), 56 deletions(-) delete mode 100755 Example/RSKImageCropperExample/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj index b538835..0bf3a90 100644 --- a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj +++ b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj @@ -557,7 +557,6 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; DEVELOPMENT_TEAM = J3P7YV7464; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RSKImageCropperExample/RSKImageCropperExample-Prefix.pch"; @@ -573,7 +572,6 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; DEVELOPMENT_TEAM = J3P7YV7464; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RSKImageCropperExample/RSKImageCropperExample-Prefix.pch"; diff --git a/Example/RSKImageCropperExample/Images.xcassets/Contents.json b/Example/RSKImageCropperExample/Images.xcassets/Contents.json index da4a164..73c0059 100644 --- a/Example/RSKImageCropperExample/Images.xcassets/Contents.json +++ b/Example/RSKImageCropperExample/Images.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Example/RSKImageCropperExample/Images.xcassets/LaunchImage.launchimage/Contents.json b/Example/RSKImageCropperExample/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100755 index 6f870a4..0000000 --- a/Example/RSKImageCropperExample/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "subtype" : "retina4", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file From fd87078e30fed89caba2bed31a2a94e731723ce5 Mon Sep 17 00:00:00 2001 From: Ruslan Skorb Date: Thu, 8 Oct 2020 13:38:16 +0300 Subject: [PATCH 5/8] [Example + RSKImageCropper] Remove `UIApplication+RSKImageCropper` and `UIApplication+RSKImageCropperTests`. --- .../project.pbxproj | 10 ---- .../RSKImageCropViewControllerTests.m | 43 ++------------ .../UIApplication+RSKImageCropperTests.m | 49 ---------------- RSKImageCropper.xcodeproj/project.pbxproj | 8 --- RSKImageCropper/RSKImageCropViewController.m | 21 ------- RSKImageCropper/RSKImageCropper.h | 1 - .../UIApplication+RSKImageCropper.h | 39 ------------- .../UIApplication+RSKImageCropper.m | 56 ------------------- 8 files changed, 4 insertions(+), 223 deletions(-) delete mode 100644 Example/RSKImageCropperExampleTests/UIApplication+RSKImageCropperTests.m delete mode 100644 RSKImageCropper/UIApplication+RSKImageCropper.h delete mode 100644 RSKImageCropper/UIApplication+RSKImageCropper.m diff --git a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj index 0bf3a90..ed33d77 100644 --- a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj +++ b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ B8182F2E1ABC998B00601E43 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = B8182F2D1ABC998B00601E43 /* LaunchScreen.xib */; }; B82DF9C11AE27E81001F4ED2 /* RSKTouchViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B82DF9C01AE27E81001F4ED2 /* RSKTouchViewTests.m */; }; B82DF9C91AE2B28B001F4ED2 /* RSKImageCropViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B82DF9C81AE2B28B001F4ED2 /* RSKImageCropViewControllerTests.m */; }; - B857871A1AE44E26004232F0 /* UIApplication+RSKImageCropperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B85787191AE44E26004232F0 /* UIApplication+RSKImageCropperTests.m */; }; B87A99F019A4D2CD00D12CD4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B87A99EF19A4D2CD00D12CD4 /* Foundation.framework */; }; B87A99F219A4D2CD00D12CD4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B87A99F119A4D2CD00D12CD4 /* CoreGraphics.framework */; }; B87A99F419A4D2CD00D12CD4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B87A99F319A4D2CD00D12CD4 /* UIKit.framework */; }; @@ -29,7 +28,6 @@ B87A9A2D19A4D39800D12CD4 /* RSKImageCropViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B87A9A2719A4D39800D12CD4 /* RSKImageCropViewController.m */; }; B87A9A2E19A4D39800D12CD4 /* RSKTouchView.m in Sources */ = {isa = PBXBuildFile; fileRef = B87A9A2919A4D39800D12CD4 /* RSKTouchView.m */; }; B87A9A2F19A4D39800D12CD4 /* UIImage+RSKImageCropper.m in Sources */ = {isa = PBXBuildFile; fileRef = B87A9A2B19A4D39800D12CD4 /* UIImage+RSKImageCropper.m */; }; - B8B3824C1AC721A7004C55F0 /* UIApplication+RSKImageCropper.m in Sources */ = {isa = PBXBuildFile; fileRef = B8B3824B1AC721A7004C55F0 /* UIApplication+RSKImageCropper.m */; }; B8D73A841B9B1E22003AFA4A /* RSKImageCropperStrings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B8D73A831B9B1E22003AFA4A /* RSKImageCropperStrings.bundle */; }; B8D73A871B9B1E73003AFA4A /* RSKInternalUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = B8D73A861B9B1E73003AFA4A /* RSKInternalUtility.m */; }; B8F617661AE43CEF00499402 /* RSKImageCropperPerformanceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F617651AE43CEF00499402 /* RSKImageCropperPerformanceTests.m */; }; @@ -55,7 +53,6 @@ B82DF9BF1AE26DAD001F4ED2 /* RSKImageCropperExample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RSKImageCropperExample-Prefix.pch"; sourceTree = ""; }; B82DF9C01AE27E81001F4ED2 /* RSKTouchViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSKTouchViewTests.m; sourceTree = ""; }; B82DF9C81AE2B28B001F4ED2 /* RSKImageCropViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSKImageCropViewControllerTests.m; sourceTree = ""; }; - B85787191AE44E26004232F0 /* UIApplication+RSKImageCropperTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIApplication+RSKImageCropperTests.m"; sourceTree = ""; }; B87A99EC19A4D2CD00D12CD4 /* RSKImageCropperExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RSKImageCropperExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; B87A99EF19A4D2CD00D12CD4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; B87A99F119A4D2CD00D12CD4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -82,8 +79,6 @@ B87A9A2919A4D39800D12CD4 /* RSKTouchView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSKTouchView.m; sourceTree = ""; }; B87A9A2A19A4D39800D12CD4 /* UIImage+RSKImageCropper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+RSKImageCropper.h"; sourceTree = ""; }; B87A9A2B19A4D39800D12CD4 /* UIImage+RSKImageCropper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+RSKImageCropper.m"; sourceTree = ""; }; - B8B3824A1AC721A7004C55F0 /* UIApplication+RSKImageCropper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIApplication+RSKImageCropper.h"; sourceTree = ""; }; - B8B3824B1AC721A7004C55F0 /* UIApplication+RSKImageCropper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIApplication+RSKImageCropper.m"; sourceTree = ""; }; B8D73A831B9B1E22003AFA4A /* RSKImageCropperStrings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = RSKImageCropperStrings.bundle; sourceTree = ""; }; B8D73A851B9B1E73003AFA4A /* RSKInternalUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSKInternalUtility.h; sourceTree = ""; }; B8D73A861B9B1E73003AFA4A /* RSKInternalUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSKInternalUtility.m; sourceTree = ""; }; @@ -193,7 +188,6 @@ B8F617671AE4468000499402 /* RSKImageScrollViewTests.m */, B82DF9C01AE27E81001F4ED2 /* RSKTouchViewTests.m */, B87A9A0F19A4D2CD00D12CD4 /* Supporting Files */, - B85787191AE44E26004232F0 /* UIApplication+RSKImageCropperTests.m */, ); path = RSKImageCropperExampleTests; sourceTree = ""; @@ -232,8 +226,6 @@ B8D73A861B9B1E73003AFA4A /* RSKInternalUtility.m */, B87A9A2819A4D39800D12CD4 /* RSKTouchView.h */, B87A9A2919A4D39800D12CD4 /* RSKTouchView.m */, - B8B3824A1AC721A7004C55F0 /* UIApplication+RSKImageCropper.h */, - B8B3824B1AC721A7004C55F0 /* UIApplication+RSKImageCropper.m */, B87A9A2A19A4D39800D12CD4 /* UIImage+RSKImageCropper.h */, B87A9A2B19A4D39800D12CD4 /* UIImage+RSKImageCropper.m */, B8D73A881B9B3C3F003AFA4A /* Resources */, @@ -383,7 +375,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B8B3824C1AC721A7004C55F0 /* UIApplication+RSKImageCropper.m in Sources */, B87A9A2C19A4D39800D12CD4 /* RSKImageScrollView.m in Sources */, B87A9A2E19A4D39800D12CD4 /* RSKTouchView.m in Sources */, B87A9A2019A4D31100D12CD4 /* RSKExampleViewController.m in Sources */, @@ -402,7 +393,6 @@ files = ( B8F617681AE4468000499402 /* RSKImageScrollViewTests.m in Sources */, B82DF9C11AE27E81001F4ED2 /* RSKTouchViewTests.m in Sources */, - B857871A1AE44E26004232F0 /* UIApplication+RSKImageCropperTests.m in Sources */, B8F617661AE43CEF00499402 /* RSKImageCropperPerformanceTests.m in Sources */, B82DF9C91AE2B28B001F4ED2 /* RSKImageCropViewControllerTests.m in Sources */, ); diff --git a/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m b/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m index 553e90c..1daf321 100644 --- a/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m +++ b/Example/RSKImageCropperExampleTests/RSKImageCropViewControllerTests.m @@ -116,7 +116,6 @@ @interface RSKImageCropViewController (Testing) @property (readonly, nonatomic) CGRect imageRect; @property (strong, nonatomic) RSKImageScrollView *imageScrollView; @property (assign, nonatomic) BOOL originalNavigationControllerNavigationBarHidden; -@property (assign, nonatomic) BOOL originalStatusBarHidden; @property (assign, nonatomic) CGFloat rotationAngle; @property (strong, nonatomic) UIRotationGestureRecognizer *rotationGestureRecognizer; @@ -1026,45 +1025,11 @@ - (void)resetZoomScale; }); describe(@"status bar", ^{ - if (@available(iOS 7.0, *)) { + it(@"hides status bar", ^{ - it(@"hides status bar", ^{ - - imageCropViewController = [[RSKImageCropViewController alloc] init]; - expect(imageCropViewController.prefersStatusBarHidden).to.beTruthy(); - }); - } - else { - - it(@"hides status bar in viewWillAppear:", ^{ - UIApplication *application = [UIApplication sharedApplication]; - id mock = [OCMockObject partialMockForObject:application]; - - [[mock expect] setStatusBarHidden:YES]; - - imageCropViewController = [[RSKImageCropViewController alloc] init]; - [imageCropViewController view]; - [imageCropViewController viewWillAppear:NO]; - - [mock verify]; - }); - - it(@"restores visibility of the status bar in viewWillDisappear:", ^{ - imageCropViewController = [[RSKImageCropViewController alloc] init]; - - UIApplication *application = [UIApplication sharedApplication]; - id mock = [OCMockObject partialMockForObject:application]; - - [imageCropViewController view]; - [imageCropViewController viewWillAppear:NO]; - - [[mock expect] setStatusBarHidden:imageCropViewController.originalStatusBarHidden]; - - [imageCropViewController viewWillDisappear:NO]; - - [mock verify]; - }); - } + imageCropViewController = [[RSKImageCropViewController alloc] init]; + expect(imageCropViewController.prefersStatusBarHidden).to.beTruthy(); + }); }); describe(@"taps", ^{ diff --git a/Example/RSKImageCropperExampleTests/UIApplication+RSKImageCropperTests.m b/Example/RSKImageCropperExampleTests/UIApplication+RSKImageCropperTests.m deleted file mode 100644 index 6c33065..0000000 --- a/Example/RSKImageCropperExampleTests/UIApplication+RSKImageCropperTests.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// UIApplication+RSKImageCropperTests.m -// -// Copyright (c) 2015 Ruslan Skorb, http://ruslanskorb.com/ -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -#import "UIApplication+RSKImageCropper.h" -#import - -@interface UIApplication (Testing) - -+ (IMP)rsk_sharedApplicationOriginalImplementation; - -@end - -SpecBegin(UIApplicationRSKImageCropper) - -describe(@"rsk_sharedApplication", ^{ - it(@"should return the singleton app instance", ^{ - expect([UIApplication rsk_sharedApplication]).to.equal([UIApplication sharedApplication]); - }); - - it(@"should return `nil` in original implementaion", ^{ - IMP rsk_sharedApplicationOriginalImplementation = [UIApplication rsk_sharedApplicationOriginalImplementation]; - UIApplication *application = rsk_sharedApplicationOriginalImplementation([UIApplication class], @selector(rsk_sharedApplication)); - - expect(application).to.beNil(); - }); -}); - -SpecEnd diff --git a/RSKImageCropper.xcodeproj/project.pbxproj b/RSKImageCropper.xcodeproj/project.pbxproj index 64d761c..ffe6079 100644 --- a/RSKImageCropper.xcodeproj/project.pbxproj +++ b/RSKImageCropper.xcodeproj/project.pbxproj @@ -17,8 +17,6 @@ A5BE39E01B32BD2B00ECDF88 /* RSKImageScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BE39D21B32BD2B00ECDF88 /* RSKImageScrollView.m */; }; A5BE39E11B32BD2B00ECDF88 /* RSKTouchView.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39D31B32BD2B00ECDF88 /* RSKTouchView.h */; settings = {ATTRIBUTES = (Public, ); }; }; A5BE39E21B32BD2B00ECDF88 /* RSKTouchView.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BE39D41B32BD2B00ECDF88 /* RSKTouchView.m */; }; - A5BE39E31B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39D51B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A5BE39E41B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BE39D61B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.m */; }; A5BE39E51B32BD2B00ECDF88 /* UIImage+RSKImageCropper.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39D71B32BD2B00ECDF88 /* UIImage+RSKImageCropper.h */; settings = {ATTRIBUTES = (Public, ); }; }; A5BE39E61B32BD2B00ECDF88 /* UIImage+RSKImageCropper.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BE39D81B32BD2B00ECDF88 /* UIImage+RSKImageCropper.m */; }; B02D70CE1BD5DCE200B51B33 /* RSKInternalUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = B02D70CB1BD5DCE200B51B33 /* RSKInternalUtility.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -38,8 +36,6 @@ A5BE39D21B32BD2B00ECDF88 /* RSKImageScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RSKImageScrollView.m; path = RSKImageCropper/RSKImageScrollView.m; sourceTree = ""; }; A5BE39D31B32BD2B00ECDF88 /* RSKTouchView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSKTouchView.h; path = RSKImageCropper/RSKTouchView.h; sourceTree = ""; }; A5BE39D41B32BD2B00ECDF88 /* RSKTouchView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RSKTouchView.m; path = RSKImageCropper/RSKTouchView.m; sourceTree = ""; }; - A5BE39D51B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIApplication+RSKImageCropper.h"; path = "RSKImageCropper/UIApplication+RSKImageCropper.h"; sourceTree = ""; }; - A5BE39D61B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIApplication+RSKImageCropper.m"; path = "RSKImageCropper/UIApplication+RSKImageCropper.m"; sourceTree = ""; }; A5BE39D71B32BD2B00ECDF88 /* UIImage+RSKImageCropper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+RSKImageCropper.h"; path = "RSKImageCropper/UIImage+RSKImageCropper.h"; sourceTree = ""; }; A5BE39D81B32BD2B00ECDF88 /* UIImage+RSKImageCropper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImage+RSKImageCropper.m"; path = "RSKImageCropper/UIImage+RSKImageCropper.m"; sourceTree = ""; }; B02D70CB1BD5DCE200B51B33 /* RSKInternalUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSKInternalUtility.h; path = RSKImageCropper/RSKInternalUtility.h; sourceTree = ""; }; @@ -91,8 +87,6 @@ B02D70CC1BD5DCE200B51B33 /* RSKInternalUtility.m */, A5BE39D31B32BD2B00ECDF88 /* RSKTouchView.h */, A5BE39D41B32BD2B00ECDF88 /* RSKTouchView.m */, - A5BE39D51B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.h */, - A5BE39D61B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.m */, A5BE39D71B32BD2B00ECDF88 /* UIImage+RSKImageCropper.h */, A5BE39D81B32BD2B00ECDF88 /* UIImage+RSKImageCropper.m */, A5BE39CA1B32BAFA00ECDF88 /* Supporting Files */, @@ -122,7 +116,6 @@ A5BE39E51B32BD2B00ECDF88 /* UIImage+RSKImageCropper.h in Headers */, A5BE39E11B32BD2B00ECDF88 /* RSKTouchView.h in Headers */, B02D70CE1BD5DCE200B51B33 /* RSKInternalUtility.h in Headers */, - A5BE39E31B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.h in Headers */, A5BE39DA1B32BD2B00ECDF88 /* CGGeometry+RSKImageCropper.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -195,7 +188,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A5BE39E41B32BD2B00ECDF88 /* UIApplication+RSKImageCropper.m in Sources */, A5BE39E01B32BD2B00ECDF88 /* RSKImageScrollView.m in Sources */, A5BE39DB1B32BD2B00ECDF88 /* CGGeometry+RSKImageCropper.m in Sources */, B02D70CF1BD5DCE200B51B33 /* RSKInternalUtility.m in Sources */, diff --git a/RSKImageCropper/RSKImageCropViewController.m b/RSKImageCropper/RSKImageCropViewController.m index 1f584da..6e99328 100644 --- a/RSKImageCropper/RSKImageCropViewController.m +++ b/RSKImageCropper/RSKImageCropViewController.m @@ -28,7 +28,6 @@ #import "RSKInternalUtility.h" #import "UIImage+RSKImageCropper.h" #import "CGGeometry+RSKImageCropper.h" -#import "UIApplication+RSKImageCropper.h" static const CGFloat kResetAnimationDuration = 0.4; static const CGFloat kLayoutImageScrollViewAnimationDuration = 0.25; @@ -38,7 +37,6 @@ @interface RSKImageCropViewController () @property (assign, nonatomic) BOOL originalNavigationControllerNavigationBarHidden; @property (strong, nonatomic) UIImage *originalNavigationControllerNavigationBarShadowImage; @property (copy, nonatomic) UIColor *originalNavigationControllerViewBackgroundColor; -@property (assign, nonatomic) BOOL originalStatusBarHidden; @property (strong, nonatomic) RSKImageScrollView *imageScrollView; @property (strong, nonatomic) RSKTouchView *overlayView; @@ -161,16 +159,6 @@ - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - if ([self respondsToSelector:@selector(prefersStatusBarHidden)] == NO) { - - UIApplication *application = [UIApplication rsk_sharedApplication]; - if (application) { - - self.originalStatusBarHidden = application.statusBarHidden; - [application setStatusBarHidden:YES]; - } - } - self.originalNavigationControllerNavigationBarHidden = self.navigationController.navigationBarHidden; [self.navigationController setNavigationBarHidden:YES animated:NO]; @@ -190,15 +178,6 @@ - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; - if ([self respondsToSelector:@selector(prefersStatusBarHidden)] == NO) { - - UIApplication *application = [UIApplication rsk_sharedApplication]; - if (application) { - - [application setStatusBarHidden:self.originalStatusBarHidden]; - } - } - [self.navigationController setNavigationBarHidden:self.originalNavigationControllerNavigationBarHidden animated:animated]; self.navigationController.navigationBar.shadowImage = self.originalNavigationControllerNavigationBarShadowImage; self.navigationController.view.backgroundColor = self.originalNavigationControllerViewBackgroundColor; diff --git a/RSKImageCropper/RSKImageCropper.h b/RSKImageCropper/RSKImageCropper.h index 3717066..6618f15 100755 --- a/RSKImageCropper/RSKImageCropper.h +++ b/RSKImageCropper/RSKImageCropper.h @@ -40,5 +40,4 @@ FOUNDATION_EXPORT const unsigned char RSKImageCropperVersionString[]; #import #import #import -#import #import diff --git a/RSKImageCropper/UIApplication+RSKImageCropper.h b/RSKImageCropper/UIApplication+RSKImageCropper.h deleted file mode 100644 index 55de003..0000000 --- a/RSKImageCropper/UIApplication+RSKImageCropper.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// UIApplication+RSKImageCropper.h -// -// Copyright (c) 2015 Ruslan Skorb, http://ruslanskorb.com/ -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -#import - -/** - The category `RSKImageCropper` of the class `UIApplication` provides the method `rsk_sharedApplication` which returns `nil` in an application extension, otherwise it returns the singleton app instance. - */ -@interface UIApplication (RSKImageCropper) - -/** - Returns `nil` in an application extension, otherwise returns the singleton app instance. - - @return `nil` in an application extension, otherwise the app instance is created in the `UIApplicationMain` function. - */ -+ (UIApplication *)rsk_sharedApplication; - -@end diff --git a/RSKImageCropper/UIApplication+RSKImageCropper.m b/RSKImageCropper/UIApplication+RSKImageCropper.m deleted file mode 100644 index f8e1a6c..0000000 --- a/RSKImageCropper/UIApplication+RSKImageCropper.m +++ /dev/null @@ -1,56 +0,0 @@ -// -// UIApplication+RSKImageCropper.m -// -// Copyright (c) 2015 Ruslan Skorb, http://ruslanskorb.com/ -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -#import "UIApplication+RSKImageCropper.h" -#import - -static IMP rsk_sharedApplicationOriginalImplementation; - -@implementation UIApplication (RSKImageCropper) - -+ (void)load -{ - // When you build an extension based on an Xcode template, you get an extension bundle that ends in .appex. - // https://developer.apple.com/library/ios/documentation/General/Conceptual/ExtensibilityPG/ExtensionCreation.html - if (![[[NSBundle mainBundle] bundlePath] hasSuffix:@".appex"]) { - Method sharedApplicationMethod = class_getClassMethod([UIApplication class], @selector(sharedApplication)); - if (sharedApplicationMethod != NULL) { - IMP sharedApplicationMethodImplementation = method_getImplementation(sharedApplicationMethod); - Method rsk_sharedApplicationMethod = class_getClassMethod([UIApplication class], @selector(rsk_sharedApplication)); - rsk_sharedApplicationOriginalImplementation = method_setImplementation(rsk_sharedApplicationMethod, sharedApplicationMethodImplementation); - } - } -} - -+ (UIApplication *)rsk_sharedApplication -{ - return nil; -} - -+ (IMP)rsk_sharedApplicationOriginalImplementation -{ - return rsk_sharedApplicationOriginalImplementation; -} - -@end From 900e043db2ab201e6f8fcae0a62ba5a91c9f85e2 Mon Sep 17 00:00:00 2001 From: Ruslan Skorb Date: Thu, 8 Oct 2020 13:40:54 +0300 Subject: [PATCH 6/8] [RSKImageCropper.podspec] Update `platform` (9.0). --- RSKImageCropper.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RSKImageCropper.podspec b/RSKImageCropper.podspec index ff6f273..af13d6b 100644 --- a/RSKImageCropper.podspec +++ b/RSKImageCropper.podspec @@ -6,7 +6,7 @@ Pod::Spec.new do |s| s.license = { :type => 'MIT', :file => 'LICENSE' } s.authors = { 'Ruslan Skorb' => 'ruslan.skorb@gmail.com' } s.source = { :git => 'https://github.com/ruslanskorb/RSKImageCropper.git', :tag => s.version.to_s } - s.platform = :ios, '6.0' + s.platform = :ios, '9.0' s.module_map = 'RSKImageCropper/RSKImageCropper.modulemap' s.source_files = 'RSKImageCropper/*.{h,m}' s.resources = 'RSKImageCropper/RSKImageCropperStrings.bundle' From c9013ae77190a0e4124f9ce6228e53e7439e1b8e Mon Sep 17 00:00:00 2001 From: Ruslan Skorb Date: Thu, 8 Oct 2020 14:04:50 +0300 Subject: [PATCH 7/8] [RSKImageCropper.xcscheme] Add support for Xcode 12.0.1. --- .../xcschemes/RSKImageCropper.xcscheme | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/RSKImageCropper.xcodeproj/xcshareddata/xcschemes/RSKImageCropper.xcscheme b/RSKImageCropper.xcodeproj/xcshareddata/xcschemes/RSKImageCropper.xcscheme index 867a2d2..e25e650 100755 --- a/RSKImageCropper.xcodeproj/xcshareddata/xcschemes/RSKImageCropper.xcscheme +++ b/RSKImageCropper.xcodeproj/xcshareddata/xcschemes/RSKImageCropper.xcscheme @@ -41,6 +41,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -53,17 +62,6 @@ - - - - - - - - Date: Fri, 9 Oct 2020 13:30:24 +0300 Subject: [PATCH 8/8] Update RSKImageCropper version (3.0.0). --- .../project.pbxproj | 2 ++ .../RSKImageCropperExample-Info.plist | 2 +- Framework/Info.plist | 2 +- RSKImageCropper.podspec | 2 +- RSKImageCropper.xcodeproj/project.pbxproj | 16 ++++++++++------ 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj index ed33d77..c77e21e 100644 --- a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj +++ b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj @@ -551,6 +551,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RSKImageCropperExample/RSKImageCropperExample-Prefix.pch"; INFOPLIST_FILE = "RSKImageCropperExample/RSKImageCropperExample-Info.plist"; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = "com.ruslanskorb.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = RSKImageCropperExample; TARGETED_DEVICE_FAMILY = 1; @@ -566,6 +567,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RSKImageCropperExample/RSKImageCropperExample-Prefix.pch"; INFOPLIST_FILE = "RSKImageCropperExample/RSKImageCropperExample-Info.plist"; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = "com.ruslanskorb.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = RSKImageCropperExample; TARGETED_DEVICE_FAMILY = 1; diff --git a/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist b/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist index de48699..c153de6 100755 --- a/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist +++ b/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.3.1 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion diff --git a/Framework/Info.plist b/Framework/Info.plist index a5d169c..ca23c84 100755 --- a/Framework/Info.plist +++ b/Framework/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.3.1 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion diff --git a/RSKImageCropper.podspec b/RSKImageCropper.podspec index af13d6b..c1b4c8e 100644 --- a/RSKImageCropper.podspec +++ b/RSKImageCropper.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'RSKImageCropper' - s.version = '2.3.1' + s.version = '3.0.0' s.summary = 'An image cropper for iOS like in the Contacts app with support for landscape orientation.' s.homepage = 'https://github.com/ruslanskorb/RSKImageCropper' s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/RSKImageCropper.xcodeproj/project.pbxproj b/RSKImageCropper.xcodeproj/project.pbxproj index ffe6079..7620106 100644 --- a/RSKImageCropper.xcodeproj/project.pbxproj +++ b/RSKImageCropper.xcodeproj/project.pbxproj @@ -230,7 +230,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.3.1; + CURRENT_PROJECT_VERSION = 3.0.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -289,7 +289,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.3.1; + CURRENT_PROJECT_VERSION = 3.0.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -315,13 +315,15 @@ isa = XCBuildConfiguration; buildSettings = { "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CURRENT_PROJECT_VERSION = 3.0.0; DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 2.3.1; - DYLIB_CURRENT_VERSION = 2.3.1; + DYLIB_COMPATIBILITY_VERSION = 3.0.0; + DYLIB_CURRENT_VERSION = 3.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 3.0.0; MODULEMAP_FILE = "$(SRCROOT)/RSKImageCropper/RSKImageCropper.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = "com.ruslanskorb.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = RSKImageCropper; @@ -333,13 +335,15 @@ isa = XCBuildConfiguration; buildSettings = { "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CURRENT_PROJECT_VERSION = 3.0.0; DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 2.3.1; - DYLIB_CURRENT_VERSION = 2.3.1; + DYLIB_COMPATIBILITY_VERSION = 3.0.0; + DYLIB_CURRENT_VERSION = 3.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 3.0.0; MODULEMAP_FILE = "$(SRCROOT)/RSKImageCropper/RSKImageCropper.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = "com.ruslanskorb.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = RSKImageCropper;