SwiftPM, Xcode11 and iOS 13 support support against develop branch (#51)

* Swift 5 upgrade (#49) Upgraded Swift version to 5.0 * Updated podspec * Version support description changed * Create SwiftPM Package.swift * Specify appropriate @available * Updated for iOS 13
vhesener · Aug 25, 2019 · 27ac4c3 · 27ac4c3
1 parent 90e48ce
commit 27ac4c3
Show file tree

Hide file tree

Showing 16 changed files with 253 additions and 52 deletions.
diff --git a/Closures.podspec.json b/Closures.podspec.json
@@ -18,5 +18,6 @@
   },
   "source_files": "Xcode/Closures/Source",
   "documentation_url": "https://vhesener.github.io/Closures/",
-  "description": "Closures is an iOS Framework that adds closure handlers to many of the popular\nUIKit and Foundation classes. Although this framework is a substitute for \nsome Cocoa Touch design patterns, such as Delegation and Data Sources, and \nTarget-Action, the authors make no claim regarding which is a better way to \naccomplish the same type of task. Most of the time it is a matter of style, \npreference, or convenience that will determine if any of these closure extensions \nare beneficial.\n\nWhether you’re a functional purist, dislike a particular API, or simply just \nwant to organize your code a little bit, you might enjoy using this library."
-}
+  "description": "Closures is an iOS Framework that adds closure handlers to many of the popular\nUIKit and Foundation classes. Although this framework is a substitute for \nsome Cocoa Touch design patterns, such as Delegation and Data Sources, and \nTarget-Action, the authors make no claim regarding which is a better way to \naccomplish the same type of task. Most of the time it is a matter of style, \npreference, or convenience that will determine if any of these closure extensions \nare beneficial.\n\nWhether you’re a functional purist, dislike a particular API, or simply just \nwant to organize your code a little bit, you might enjoy using this library.",
+  "pushed_with_swift_version": "5.0"
+}
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,14 @@
+// swift-tools-version:5.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+import PackageDescription
+
+let package = Package(
+    name: "Closures",
+    products: [
+        .library(name: "Closures",  targets: ["Closures"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(name: "Closures", path: "Xcode/Closures")
+    ]
+)
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 Whether you're a functional purist, dislike a particular API, or simply just want to organize your code a little bit, you might enjoy using this library.
 
 > ***<sub>note</sub>*** <br/>
-> `Closures` currently only supports projects written in **Swift 4.0**+. 
+> `Closures` currently only supports projects written in **Swift 5.0**+. 
 
 ***
 ## [Usage Overview](#usage-overview)

diff --git a/Xcode/Closures.xcodeproj/project.pbxproj b/Xcode/Closures.xcodeproj/project.pbxproj
@@ -202,7 +202,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = "Your Mom";
 				TargetAttributes = {
 					3F7620DD1D849B5000E17BF5 = {
@@ -426,7 +426,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -449,7 +449,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;

diff --git a/Xcode/Closures.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Xcode/Closures.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>
diff --git a/Xcode/Closures.xcodeproj/xcshareddata/xcschemes/Closures.xcscheme b/Xcode/Closures.xcodeproj/xcshareddata/xcschemes/Closures.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3F7620DD1D849B5000E17BF5"
+            BuildableName = "Closures.framework"
+            BlueprintName = "Closures"
+            ReferencedContainer = "container:Closures.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3F7620DD1D849B5000E17BF5"
-            BuildableName = "Closures.framework"
-            BlueprintName = "Closures"
-            ReferencedContainer = "container:Closures.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:Closures.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Xcode/Closures/Source/Core.swift b/Xcode/Closures/Source/Core.swift
@@ -23,15 +23,18 @@ import Foundation
 protocol DelegateProtocol: class {
 }
 
+@available(iOS 9.0, *)
 public protocol DelegatorProtocol: class {
     /**
      Clears any delegates/datasources that were assigned by the `Closures`
      framework for this object. This cleans up memory as well as sets the
      delegate/datasource properties to nil.
      */
+    @available(iOS 9.0, *)
     func clearClosureDelegates()
 }
 
+@available(iOS 9.0, *)
 class DelegateWrapper<Delegator: DelegatorProtocol, Delegate: DelegateProtocol>: NSObject {
     weak var delegator: Delegator?
     let delegate: Delegate
@@ -75,6 +78,7 @@ class DelegateWrapper<Delegator: DelegatorProtocol, Delegate: DelegateProtocol>:
         }
     }
 
+    @available(iOS 9.0, *)
     public static func update(_ delegator: Delegator,
                               delegate: @autoclosure () -> Delegate,
                               delegates:  inout Set<DelegateWrapper<Delegator,Delegate>>,

diff --git a/Xcode/Closures/Source/UICollectionView.swift b/Xcode/Closures/Source/UICollectionView.swift
@@ -23,6 +23,7 @@ import UIKit
 /// :nodoc:
 private let jzyBug = 0 // Prevent the license header from showing up in Jazzy Docs for UICollectionView
 
+@available(iOS 9.0, *)
 extension UICollectionView {
     // MARK: Common Array Usage
     /**
@@ -110,6 +111,7 @@ extension UICollectionView {
     }
 }
 
+@available(iOS 9.0, *)
 class CollectionViewDelegate: ScrollViewDelegate, UICollectionViewDelegateFlowLayout, UICollectionViewDataSource {
     fileprivate static var delegates = Set<DelegateWrapper<UICollectionView, CollectionViewDelegate>>()
 
@@ -355,6 +357,7 @@ class CollectionViewDelegate: ScrollViewDelegate, UICollectionViewDelegateFlowLa
     }
 }
 
+@available(iOS 9.0, *)
 extension UICollectionView {
     // MARK: Delegate and DataSource Overrides
     /**
@@ -755,6 +758,7 @@ extension UICollectionView {
     }
 }
 
+@available(iOS 9.0, *)
 extension UICollectionView {
     @discardableResult
     @objc override func update(handler: (_ delegate: CollectionViewDelegate) -> Void) -> Self {

diff --git a/Xcode/Closures/Source/UIControl.swift b/Xcode/Closures/Source/UIControl.swift
@@ -20,6 +20,7 @@
 
 import UIKit
 
+@available(iOS 9.0, *)
 fileprivate extension UIControl {
     func _onChange<ControlType, ValueType>(
         callerHandler: @escaping (_ value: ValueType) -> (Void),
@@ -33,6 +34,7 @@ fileprivate extension UIControl {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIControl {
     public typealias EventHandler = (_ sender: UIControl, _ forEvent: UIEvent?) -> Void
     /**
@@ -166,6 +168,7 @@ extension UIControl {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIControl {
     /**
      Provides the proper internal selector to call for the type of UIControlEvent
@@ -223,6 +226,7 @@ extension UIControl {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIButton {
     // MARK: Common Events
     /**
@@ -251,6 +255,7 @@ extension UIButton {
     }
 }
 
+@available(iOS 9.0, *)
 extension UITextField {
     // MARK: Common Events
     /**
@@ -337,6 +342,7 @@ extension UITextField {
     }
 }
 
+@available(iOS 9.0, *)
 extension UITextField {
     // MARK: Delegate Overrides
     /**
@@ -457,6 +463,7 @@ extension UITextField {
     }
 }
 
+@available(iOS 9.0, *)
 extension UITextField: DelegatorProtocol {
     @discardableResult
     fileprivate func update(handler: (_ delegate: TextFieldDelegate) -> Void) -> Self {
@@ -488,11 +495,13 @@ extension UITextField: DelegatorProtocol {
 }
 
 #if DEBUG
+@available(iOS 9.0, *)
 var textFieldDelegates: Set<AnyHashable> {
     return TextFieldDelegate.delegates
 }
 #endif
 
+@available(iOS 9.0, *)
 fileprivate final class TextFieldDelegate: NSObject, UITextFieldDelegate, DelegateProtocol {
     fileprivate static var delegates = Set<DelegateWrapper<UITextField, TextFieldDelegate>>()
 
@@ -557,6 +566,7 @@ fileprivate final class TextFieldDelegate: NSObject, UITextFieldDelegate, Delega
     }
 }
 
+@available(iOS 9.0, *)
 extension UISwitch {
     // MARK: Common Events
     /**
@@ -576,6 +586,7 @@ extension UISwitch {
     }
 }
 
+@available(iOS 9.0, *)
 extension UISlider {
     // MARK: Common Events
     /**
@@ -595,6 +606,7 @@ extension UISlider {
     }
 }
 
+@available(iOS 9.0, *)
 extension UISegmentedControl {
     // MARK: Common Events
     /**
@@ -614,6 +626,7 @@ extension UISegmentedControl {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIStepper {
     // MARK: Common Events
     /**
@@ -633,6 +646,7 @@ extension UIStepper {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIPageControl {
     // MARK: Common Events
     /**
@@ -652,6 +666,7 @@ extension UIPageControl {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIDatePicker {
     // MARK: Common Events
     /**

diff --git a/Xcode/Closures/Source/UIGestureRecognizer.swift b/Xcode/Closures/Source/UIGestureRecognizer.swift
@@ -343,6 +343,7 @@ extension UIView {
     }
 }
 
+@available(iOS 9.0, *)
 fileprivate final class GestureRecognizerDelegate: NSObject, UIGestureRecognizerDelegate, DelegateProtocol {
     static var delegates = Set<DelegateWrapper<UIGestureRecognizer, GestureRecognizerDelegate>>()
 
@@ -396,6 +397,7 @@ fileprivate final class GestureRecognizerDelegate: NSObject, UIGestureRecognizer
     }
 }
 
+@available(iOS 9.0, *)
 extension UIGestureRecognizer {
     // MARK: Delegate Overrides
     /**
@@ -471,6 +473,7 @@ extension UIGestureRecognizer {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIGestureRecognizer: DelegatorProtocol {
     @discardableResult
     fileprivate func update(handler: (_ delegate: GestureRecognizerDelegate) -> Void) -> Self {

diff --git a/Xcode/Closures/Source/UIImagePickerController.swift b/Xcode/Closures/Source/UIImagePickerController.swift
@@ -22,6 +22,7 @@ import UIKit
 import MobileCoreServices
 import PhotosUI
 
+@available(iOS 9.0, *)
 fileprivate final class ImagePickerControllerDelegate: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate, DelegateProtocol {
     static var delegates = Set<DelegateWrapper<UIImagePickerController, ImagePickerControllerDelegate>>()
 
@@ -49,6 +50,7 @@ fileprivate final class ImagePickerControllerDelegate: NSObject, UIImagePickerCo
     }
 }
 
+@available(iOS 9.0, *)
 extension UIImagePickerController {
     // MARK: Convenient Presenting
     /**
@@ -169,6 +171,7 @@ extension UIImagePickerController {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIImagePickerController {
     // MARK: Delegate Overrides
     /**
@@ -196,6 +199,7 @@ extension UIImagePickerController {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIImagePickerController {
     // MARK: Helper Types
     /**
@@ -317,13 +321,15 @@ extension UIImagePickerController {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIImagePickerController.MediaFilter: ExpressibleByIntegerLiteral {
     /// :nodoc:
     public init(integerLiteral value: Int) {
         self.init(rawValue: value)
     }
 }
 
+@available(iOS 9.0, *)
 fileprivate extension CFString {
     var mediaFilter: UIImagePickerController.MediaFilter {
         switch self {
@@ -337,6 +343,7 @@ fileprivate extension CFString {
     }
 }
 
+@available(iOS 9.0, *)
 extension UIImagePickerController: DelegatorProtocol {
     @discardableResult
     fileprivate func update(handler: (_ delegate: ImagePickerControllerDelegate) -> Void) -> Self {