Update for swift 4.2 -- Fix thread issues

Author: Pierre

ShadowView/ShadowView.xcodeproj/project.pbxproj

@@ -260,8 +260,8 @@
 					};
 					F907D1191F27ECA3007D4BE4 = {
 						CreatedOnToolsVersion = 8.3.3;
-						DevelopmentTeam = PCKYQNTV3N;
-						LastSwiftMigration = 0830;
+						DevelopmentTeam = P5PSPS572B;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -561,14 +561,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = PCKYQNTV3N;
+				DEVELOPMENT_TEAM = P5PSPS572B;
 				INFOPLIST_FILE = ShadowViewExample/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = PP.ShadowViewExample;
+				PRODUCT_BUNDLE_IDENTIFIER = PP.ShadowViewExample.Pierre.Perrin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -577,13 +578,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = PCKYQNTV3N;
+				DEVELOPMENT_TEAM = P5PSPS572B;
 				INFOPLIST_FILE = ShadowViewExample/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = PP.ShadowViewExample;
+				PRODUCT_BUNDLE_IDENTIFIER = PP.ShadowViewExample.Pierre.Perrin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

ShadowView/ShadowView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

ShadowView/ShadowView/ShadowView+BlurProcess.swift

@@ -26,43 +26,47 @@ extension ShadowView{
 
 
 
-    public func updateShadow(){
+    public func updateShadow(dispatchQueue: DispatchQueue = .main){
 
         self.shadowImageView.image = nil
-     //   DispatchQueue.global(qos: DispatchQoS.QoSClass.utility).async { [weak self] in
-            self.createLayerImage()
-      //  }
+        self.createLayerImage(dispatchQueue: dispatchQueue)
     }
 
-    private func createLayerImage(){
+    private func createLayerImage(dispatchQueue: DispatchQueue = .main){
 
-        self.convertToImage { (image) in
-            
-            let containerLayer = CALayer()
-            let imageSize = image.size
-            containerLayer.frame = CGRect(origin: .zero, size: imageSize.scaled(by:self.scaleImageConstant))
-            containerLayer.backgroundColor = UIColor.clear.cgColor
-            let blurImageLayer = CALayer()
-            blurImageLayer.frame = CGRect(origin: .zero,size: imageSize)
-            blurImageLayer.position = CGPoint(x:containerLayer.bounds.midX,y:containerLayer.bounds.midY)
-            blurImageLayer.contents = image.applyBlurWithRadius(0, tintColor:self.shadowColor, saturationDeltaFactor: self.shadowSaturation)?.cgImage
-            
-            blurImageLayer.masksToBounds = false
-            containerLayer.addSublayer(blurImageLayer)
-            
-            let containerImage = containerLayer.asImage
-            
-            
-            let resizeImageConstant :CGFloat = self.highPerformanceBlur ? 0.3 : 1
-            guard let resizedContainerImage = containerImage.resized(withPercentage: resizeImageConstant),
-                let blurredImage = resizedContainerImage.applyBlur(blurRadius: self.blurRadius)
-                else {
-                    return
-            }
-            
             DispatchQueue.main.async { [weak self] in
-                self?.layer.masksToBounds = false
-                self?.shadowImageView?.image = blurredImage
+                
+                guard let image = self?.asImage else { return }
+                
+                let shadowColor = self?.shadowColor ?? .clear
+                let shadowSaturation = self?.shadowSaturation ?? 1
+                let scaleImageConstant = self?.scaleImageConstant ?? 1
+                let blurRadius = self?.blurRadius ?? 20
+                dispatchQueue.async { [weak self] in
+                
+                let containerLayer = CALayer()
+                let imageSize = image.size
+                containerLayer.frame = CGRect(origin: .zero, size: imageSize.scaled(by:scaleImageConstant))
+                containerLayer.backgroundColor = UIColor.clear.cgColor
+                let blurImageLayer = CALayer()
+                blurImageLayer.frame = CGRect(origin: .zero,size: imageSize)
+                blurImageLayer.position = CGPoint(x:containerLayer.bounds.midX,y:containerLayer.bounds.midY)
+                blurImageLayer.contents = image.applyBlurWithRadius(0, tintColor: shadowColor, saturationDeltaFactor: shadowSaturation)?.cgImage
+                
+                blurImageLayer.masksToBounds = false
+                containerLayer.addSublayer(blurImageLayer)
+                let containerImage = containerLayer.asImage
+                
+                
+                let resizeImageConstant :CGFloat = 1
+                guard let resizedContainerImage = containerImage.resized(withPercentage: resizeImageConstant),
+                    let blurredImage = resizedContainerImage.applyBlur(blurRadius: blurRadius)
+                    else { return }
+                
+                DispatchQueue.main.async { [weak self] in
+                    self?.layer.masksToBounds = false
+                    self?.shadowImageView?.image = blurredImage
+                }
             }
         }
 

ShadowView/ShadowView/ShadowView.swift

@@ -13,9 +13,6 @@ public class ShadowView: UIView {
     internal var blurRadius :CGFloat = 5.0
     public var shadowImageView : UIImageView!
     internal let scaleImageConstant :CGFloat = 3
-    
-    public var highPerformanceBlur = true
-    
     public var correctShadowScale : CGFloat{
         return shadowScale + scaleImageConstant - 1
     }
@@ -42,21 +39,22 @@ public class ShadowView: UIView {
         }
     }
     private var shadowTintColor : UIColor?
-    public override var shadowColor: UIColor?{
+    
+    @IBInspectable public var shadowColor: UIColor?{
         get{
             return shadowTintColor
         }set{
             shadowTintColor = newValue
         }
     }
 
-    public override var shadowOffset : CGSize{
+    @IBInspectable public var shadowOffset : CGSize = .zero{
         didSet{
             layoutSubviews()
         }
     }
 
-    public override var shadowRadius : CGFloat{
+    @IBInspectable public var shadowRadius : CGFloat{
         set{
             blurRadius = newValue
             updateShadow()
@@ -66,7 +64,7 @@ public class ShadowView: UIView {
         }
     }
 
-    public override var shadowOpacity: Float{
+    @IBInspectable public var shadowOpacity: Float{
         set{
             shadowImageView.alpha = CGFloat(newValue)
         }

ShadowView/ShadowView/UIView+Image.swift

@@ -11,37 +11,23 @@ import UIKit
 extension UIView{
 
     ///Returns a UIImage copy of the view
-    internal func convertToImage(completion:@escaping (UIImage) -> Void){
-        
-        DispatchQueue.main.async {
-            let layer = self.layer
-            let size = layer.frame.size
-            
-            DispatchQueue.global(qos: .utility).async {
-                let image = layer.getImage(size: size)
-                completion(image)
-            }
-        }
+    internal var asImage : UIImage{
+        return layer.asImage
     }
 }
 
 extension CALayer{
 
-    func getImage(size:CGSize) -> UIImage{
-        
-        UIGraphicsBeginImageContext(size)
-        guard let currentContext = UIGraphicsGetCurrentContext()else{return UIImage()}
-        render(in:currentContext)
-        let image = UIGraphicsGetImageFromCurrentImageContext()
-        UIGraphicsEndImageContext()
-        
-        guard let cgImage = image?.cgImage else{return UIImage()}
-         return UIImage.init(cgImage: cgImage)
-    }
-    
     ///Returns a UIImage copy of the layer
     internal var asImage : UIImage{
-        
-        return self.getImage(size: self.frame.size)
+        UIGraphicsBeginImageContext(frame.size)
+        render(in: UIGraphicsGetCurrentContext()!)
+        let image = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+        if let cgImage = image?.cgImage {
+            return UIImage(cgImage: cgImage)
+        } else {
+            return UIImage()
+        }
     }
 }

ShadowView/ShadowView/UIView+Shadow.swift

@@ -7,54 +7,3 @@
 //
 
 import UIKit
-
-extension UIView{
-    
-    @IBInspectable public var shadowRadius : CGFloat{
-        set{
-            layer.shadowRadius = newValue
-            layer.masksToBounds = newValue < 0
-        }
-        get{
-            return layer.shadowRadius
-        }
-    }
-    
-    @IBInspectable public var shadowOffset : CGSize{
-        set{
-            layer.shadowOffset = newValue
-        }
-        get{
-            return layer.shadowOffset
-        }
-    }
-    
-    
-    @IBInspectable public var shadowColor : UIColor?{
-        set{
-            layer.shadowColor = newValue?.cgColor
-        }
-        get{
-            return UIColor(cgColor: layer.shadowColor ?? UIColor().cgColor)
-        }
-    }
-    
-    @IBInspectable public var shadowOpacity : Float{
-        set{
-            layer.shadowOpacity = newValue
-            layer.masksToBounds = newValue < 0
-        }
-        get{
-            return layer.shadowOpacity
-        }
-    }
-    
-    @IBInspectable public var shadowPath : CGPath?{
-        set{
-            layer.shadowPath = newValue
-        }
-        get{
-            return layer.shadowPath
-        }
-    }
-}

ShadowView/ShadowViewExample/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

ShadowView/ShadowViewExample/Base.lproj/Main.storyboard

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="2yo-QA-Q5K">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="2yo-QA-Q5K">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -32,7 +31,7 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="163.5" height="163.5"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sample.jpg" translatesAutoresizingMaskIntoConstraints="NO" id="vHf-yD-evt">
-                                                        <rect key="frame" x="0.0" y="0.0" width="164" height="164"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="163.5" height="163.5"/>
                                                     </imageView>
                                                 </subviews>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -64,16 +63,16 @@
                                                     <constraint firstAttribute="width" secondItem="lUd-IE-JvU" secondAttribute="height" id="uvx-hC-qwD"/>
                                                 </constraints>
                                                 <userDefinedRuntimeAttributes>
-                                                    <userDefinedRuntimeAttribute type="number" keyPath="shadowRadius">
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius">
                                                         <real key="value" value="5"/>
                                                     </userDefinedRuntimeAttribute>
-                                                    <userDefinedRuntimeAttribute type="size" keyPath="shadowOffset">
+                                                    <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset">
                                                         <size key="value" width="0.0" height="5"/>
                                                     </userDefinedRuntimeAttribute>
-                                                    <userDefinedRuntimeAttribute type="number" keyPath="shadowOpacity">
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity">
                                                         <real key="value" value="0.69999999999999996"/>
                                                     </userDefinedRuntimeAttribute>
-                                                    <userDefinedRuntimeAttribute type="color" keyPath="shadowColor">
+                                                    <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowColor">
                                                         <color key="value" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                                     </userDefinedRuntimeAttribute>
                                                 </userDefinedRuntimeAttributes>
@@ -198,7 +197,6 @@
         <!--Collection View Example Collection View Controller-->
         <scene sceneID="Sk3-uc-K7P">
             <objects>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="uYJ-9c-ZML" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <collectionViewController id="C4x-Q2-0J5" customClass="CollectionViewExampleCollectionViewController" customModule="ShadowViewExample" customModuleProvider="target" sceneMemberID="viewController">
                     <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="g2o-qQ-xNu">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
@@ -253,6 +251,7 @@
                         </connections>
                     </collectionView>
                 </collectionViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="uYJ-9c-ZML" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="2432.8000000000002" y="35.532233883058474"/>
         </scene>

ShadowView/ShadowViewExample/ViewController.swift

@@ -27,7 +27,7 @@ class ViewController: UIViewController {
         sender.isContinuous = false
 
         self.exampleView.shadowRadius = CGFloat(sender.value * 50)
-        self.otherImage.shadowRadius = CGFloat(sender.value * 50)
+        self.otherImage.layer.shadowRadius = CGFloat(sender.value * 50)
     }
 
     @IBAction func shadowSize(_ sender: UISlider) {
@@ -38,7 +38,7 @@ class ViewController: UIViewController {
     @IBAction func shadowOpacity(_ sender: UISlider) {
 
         self.exampleView.shadowOpacity = sender.value
-        self.otherImage.shadowOpacity = sender.value
+        self.otherImage.layer.shadowOpacity = sender.value
     }
 
     @IBAction func CHANGEiMAGE(_ sender: Any) {