Merge pull request #95 from ruslanskorb/develop

Version 1.5.1
ruslanskorb · Feb 4, 2016 · 90f6cfb · 90f6cfb
2 parents ef861fc + 9459c17
commit 90f6cfb
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 33 deletions.
diff --git a/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist b/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Framework/Info.plist b/Framework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/RSKImageCropper.podspec b/RSKImageCropper.podspec
@@ -1,19 +1,15 @@
 Pod::Spec.new do |s|
-  s.name                = 'RSKImageCropper'
-  s.version             = '1.5.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' }
-  s.authors             = { 'Ruslan Skorb' => '[email protected]' }
-  s.source              = { :git => 'https://github.com/ruslanskorb/RSKImageCropper.git', :tag => s.version.to_s }
-  s.platform            = :ios, '6.0'
-  s.source_files        = 'RSKImageCropper/*.{h,m}'
-  s.resources           = 'RSKImageCropper/RSKImageCropperStrings.bundle'
-  s.frameworks          = 'QuartzCore', 'UIKit'
-  s.requires_arc        = true
-  s.public_header_files = [
-    'RSKImageCropper/RSKImageCropper.h',
-    'RSKImageCropper/RSKImageCropViewController.h',
-    'RSKImageCropper/RSKImageCropViewController+Protected.h'
-  ]
+  s.name          = 'RSKImageCropper'
+  s.version       = '1.5.1'
+  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' }
+  s.authors       = { 'Ruslan Skorb' => '[email protected]' }
+  s.source        = { :git => 'https://github.com/ruslanskorb/RSKImageCropper.git', :tag => s.version.to_s }
+  s.platform      = :ios, '6.0'
+  s.module_map    = 'RSKImageCropper/module.modulemap'
+  s.source_files  = 'RSKImageCropper/*.{h,m}'
+  s.resources     = 'RSKImageCropper/RSKImageCropperStrings.bundle'
+  s.frameworks    = 'QuartzCore', 'UIKit'
+  s.requires_arc  = true
 end
diff --git a/RSKImageCropper.xcodeproj/project.pbxproj b/RSKImageCropper.xcodeproj/project.pbxproj
@@ -8,22 +8,22 @@
 
 /* Begin PBXBuildFile section */
 		A5BE39D91B32BD2B00ECDF88 /* RSKImageCropper.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39CB1B32BD2B00ECDF88 /* RSKImageCropper.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A5BE39DA1B32BD2B00ECDF88 /* CGGeometry+RSKImageCropper.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39CC1B32BD2B00ECDF88 /* CGGeometry+RSKImageCropper.h */; };
+		A5BE39DA1B32BD2B00ECDF88 /* CGGeometry+RSKImageCropper.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39CC1B32BD2B00ECDF88 /* CGGeometry+RSKImageCropper.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A5BE39DB1B32BD2B00ECDF88 /* CGGeometry+RSKImageCropper.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BE39CD1B32BD2B00ECDF88 /* CGGeometry+RSKImageCropper.m */; };
 		A5BE39DC1B32BD2B00ECDF88 /* RSKImageCropViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39CE1B32BD2B00ECDF88 /* RSKImageCropViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A5BE39DD1B32BD2B00ECDF88 /* RSKImageCropViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BE39CF1B32BD2B00ECDF88 /* RSKImageCropViewController.m */; };
 		A5BE39DE1B32BD2B00ECDF88 /* RSKImageCropViewController+Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39D01B32BD2B00ECDF88 /* RSKImageCropViewController+Protected.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A5BE39DF1B32BD2B00ECDF88 /* RSKImageScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39D11B32BD2B00ECDF88 /* RSKImageScrollView.h */; };
+		A5BE39DF1B32BD2B00ECDF88 /* RSKImageScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39D11B32BD2B00ECDF88 /* RSKImageScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A5BE39E01B32BD2B00ECDF88 /* RSKImageScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BE39D21B32BD2B00ECDF88 /* RSKImageScrollView.m */; };
-		A5BE39E11B32BD2B00ECDF88 /* RSKTouchView.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BE39D31B32BD2B00ECDF88 /* RSKTouchView.h */; };
+		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 */; };
+		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 */; };
+		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 = {ASSET_TAGS = (); }; };
-		B02D70CF1BD5DCE200B51B33 /* RSKInternalUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = B02D70CC1BD5DCE200B51B33 /* RSKInternalUtility.m */; settings = {ASSET_TAGS = (); }; };
-		B8585B951BD609A100032364 /* RSKImageCropperStrings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B8585B941BD609A100032364 /* RSKImageCropperStrings.bundle */; settings = {ASSET_TAGS = (); }; };
+		B02D70CE1BD5DCE200B51B33 /* RSKInternalUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = B02D70CB1BD5DCE200B51B33 /* RSKInternalUtility.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B02D70CF1BD5DCE200B51B33 /* RSKInternalUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = B02D70CC1BD5DCE200B51B33 /* RSKInternalUtility.m */; };
+		B8585B951BD609A100032364 /* RSKImageCropperStrings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B8585B941BD609A100032364 /* RSKImageCropperStrings.bundle */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -226,7 +226,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.5.0;
+				CURRENT_PROJECT_VERSION = 1.5.1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -274,7 +274,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.5.0;
+				CURRENT_PROJECT_VERSION = 1.5.1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -300,8 +300,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1.5.0;
-				DYLIB_CURRENT_VERSION = 1.5.0;
+				DYLIB_COMPATIBILITY_VERSION = 1.5.1;
+				DYLIB_CURRENT_VERSION = 1.5.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Framework/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -316,8 +316,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1.5.0;
-				DYLIB_CURRENT_VERSION = 1.5.0;
+				DYLIB_COMPATIBILITY_VERSION = 1.5.1;
+				DYLIB_CURRENT_VERSION = 1.5.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Framework/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

diff --git a/RSKImageCropper/RSKImageCropViewController+Protected.h b/RSKImageCropper/RSKImageCropViewController+Protected.h
@@ -22,6 +22,8 @@
 // THE SOFTWARE.
 //
 
+#import <UIKit/UIKit.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**

diff --git a/RSKImageCropper/RSKImageCropper.h b/RSKImageCropper/RSKImageCropper.h
@@ -34,5 +34,11 @@ FOUNDATION_EXPORT double RSKImageCropperVersionNumber;
 //! Project version string for RSKImageCropper.
 FOUNDATION_EXPORT const unsigned char RSKImageCropperVersionString[];
 
+#import <RSKImageCropper/CGGeometry+RSKImageCropper.h>
 #import <RSKImageCropper/RSKImageCropViewController.h>
 #import <RSKImageCropper/RSKImageCropViewController+Protected.h>
+#import <RSKImageCropper/RSKImageScrollView.h>
+#import <RSKImageCropper/RSKInternalUtility.h>
+#import <RSKImageCropper/RSKTouchView.h>
+#import <RSKImageCropper/UIApplication+RSKImageCropper.h>
+#import <RSKImageCropper/UIImage+RSKImageCropper.h>
diff --git a/RSKImageCropper/module.modulemap b/RSKImageCropper/module.modulemap
@@ -0,0 +1,6 @@
+framework module RSKImageCropper {
+    umbrella header "RSKImageCropper.h"
+
+    export *
+    module * { export * }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ @@
     // THE SOFTWARE.
     //
+    #import <UIKit/UIKit.h>
     NS_ASSUME_NONNULL_BEGIN
     /**
@@ Expand Down @@