Merge pull request #15 from devxoul/swift-5.0

Let's Swift 5.0 🚀

Author: devxoul

.swift-version

@@ -1,7 +1,7 @@
 SwiftyImage
 ===========
 
-![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg)
+![Swift](https://img.shields.io/badge/Swift-5.0-orange.svg)
 [![CocoaPods](http://img.shields.io/cocoapods/v/SwiftyImage.svg?style=flat)](https://cocoapods.org/pods/SwiftyImage)
 
 The most sexy way to use images in Swift.

README.md

@@ -19,13 +19,13 @@ public enum BorderAlignment {
 
 public extension UIImage {
 
-  public typealias ContextBlock = (CGContext) -> Void
+  typealias ContextBlock = (CGContext) -> Void
 
-  public class func with(width: CGFloat, height: CGFloat, block: ContextBlock) -> UIImage {
+  class func with(width: CGFloat, height: CGFloat, block: ContextBlock) -> UIImage {
     return self.with(size: CGSize(width: width, height: height), block: block)
   }
 
-  public class func with(size: CGSize, opaque: Bool = false, scale: CGFloat = 0, block: ContextBlock) -> UIImage {
+  class func with(size: CGSize, opaque: Bool = false, scale: CGFloat = 0, block: ContextBlock) -> UIImage {
     UIGraphicsBeginImageContextWithOptions(size, opaque, scale)
     let context = UIGraphicsGetCurrentContext()!
     block(context)
@@ -34,7 +34,7 @@ public extension UIImage {
     return image ?? UIImage()
   }
 
-  public func with(_ contextBlock: (CGContext) -> Void) -> UIImage! {
+  func with(_ contextBlock: (CGContext) -> Void) -> UIImage! {
     return UIImage.with(size: self.size, opaque: false, scale: self.scale) { context in
       let rect = CGRect(x: 0, y: 0, width: self.size.width, height: self.size.height)
       self.draw(in: rect)
@@ -69,17 +69,17 @@ public func + (lhs: UIImage, rhs: UIImage) -> UIImage {
 
 public extension UIImage {
 
-  public class func size(width: CGFloat, height: CGFloat) -> ImageDrawer {
+  class func size(width: CGFloat, height: CGFloat) -> ImageDrawer {
     return self.size(CGSize(width: width, height: height))
   }
 
-  public class func size(_ size: CGSize) -> ImageDrawer {
+  class func size(_ size: CGSize) -> ImageDrawer {
     let drawer = ImageDrawer()
     drawer.size = .fixed(size)
     return drawer
   }
 
-  public class func resizable() -> ImageDrawer {
+  class func resizable() -> ImageDrawer {
     let drawer = ImageDrawer()
     drawer.size = .resizable
     return drawer
@@ -460,7 +460,7 @@ open class ImageDrawer {
 
 public extension UIImage {
 
-  public func with(color: UIColor) -> UIImage {
+  func with(color: UIColor) -> UIImage {
     return UIImage.with(size: self.size) { context in
       context.translateBy(x: 0, y: self.size.height)
       context.scaleBy(x: 1, y: -1)

Sources/SwiftyImage.swift

@@ -193,7 +193,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Suyeol Jeon";
 				TargetAttributes = {
 					03B1193D1B54E2AB00427302 = {
@@ -211,10 +211,11 @@
 			};
 			buildConfigurationList = 03B119381B54E2AB00427302 /* Build configuration list for PBXProject "SwiftyImage" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 03B119341B54E2AB00427302;
 			productRefGroup = 03B1193F1B54E2AB00427302 /* Products */;
@@ -292,6 +293,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -341,7 +343,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -352,6 +354,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -393,7 +396,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -417,7 +420,6 @@
 				PRODUCT_NAME = SwiftyImage;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -436,7 +438,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "kr.xoul.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = SwiftyImage;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -453,7 +454,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "kr.xoul.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -466,7 +466,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "kr.xoul.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -499,7 +498,6 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -532,7 +530,6 @@
 				PRODUCT_NAME = SwiftyImage;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};

SwiftyImage.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SwiftyImage.xcodeproj/xcshareddata/xcschemes/SwiftyImage-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"