Updated to Swift 5

acecilia · acecilia · commit ee3121f040da · 2020-04-13T19:36:19.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,36 @@
+
+# Created by https://www.gitignore.io/api/xcode,macos,swift,swiftpm,swiftpackagemanager
+# Edit at https://www.gitignore.io/?templates=xcode,macos,swift,swiftpm,swiftpackagemanager
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Swift ###
 # Xcode
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
@@ -19,7 +52,8 @@ xcuserdata/
 
 ## Other
 *.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
@@ -32,36 +66,76 @@ timeline.xctimeline
 playground.xcworkspace
 
 # Swift Package Manager
-#
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
+# Package.pins
+# Package.resolved
 .build/
+# Add this line if you want to avoid checking in Xcode SPM integration.
+.swiftpm/xcode
 
 # CocoaPods
-#
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
 # Pods/
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
-#
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 # Carthage/Checkouts
 
 Carthage/Build
 
+# Accio dependency management
+Dependencies/
+.accio/
+
 # fastlane
-#
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots
+fastlane/screenshots/**/*.png
 fastlane/test_output
-ObjectiveKit.xcodeproj/project.xcworkspace/xcuserdata/marmelroy.xcuserdatad/UserInterfaceState.xcuserstate
-ObjectiveKit.xcodeproj/xcuserdata/marmelroy.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+
+# Code Injection
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+### SwiftPackageManager ###
+Packages
+xcuserdata
+*.xcodeproj
+
+
+### SwiftPM ###
+
+
+### Xcode ###
+# Xcode
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+
+## Xcode Patch
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+
+### Xcode Patch ###
+**/xcshareddata/WorkspaceSettings.xcsettings
+
+# End of https://www.gitignore.io/api/xcode,macos,swift,swiftpm,swiftpackagemanager
diff --git a/ObjectiveKit/ObjectiveClass.swift b/ObjectiveKit/ObjectiveClass.swift
@@ -8,10 +8,8 @@
 
 import Foundation
 
-typealias ImplementationBlock = @convention(block) () -> Void
-
 /// An object that allows you to introspect and modify classes through the ObjC runtime.
-public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
+public class ObjectiveClass<T: NSObject>: ObjectiveKitRuntimeModification {
 
     public var internalClass: AnyClass
 
@@ -33,7 +31,7 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
             var ivars = [String]()
             let ivarList = class_copyIvarList(internalClass, &count)
             for i in (0..<Int(count)) {
-                let unwrapped  = ivarList?[i].unsafelyUnwrapped
+                let unwrapped  = (ivarList?[i]).unsafelyUnwrapped
                 if let ivar = ivar_getName(unwrapped) {
                     let string = String(cString: ivar)
                     ivars.append(string)
@@ -44,7 +42,6 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
         }
     }
 
-
     /// Get all selectors implemented by the class.
     ///
     /// - Returns: An array of selectors.
@@ -54,8 +51,8 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
             var selectors = [Selector]()
             let methodList = class_copyMethodList(internalClass, &count)
             for i in (0..<Int(count)) {
-                let unwrapped  = methodList?[i].unsafelyUnwrapped
-                if let selector = method_getName(unwrapped) {
+                if let unwrapped = methodList?[i] {
+                    let selector = method_getName(unwrapped)
                     selectors.append(selector)
                 }
             }
@@ -73,8 +70,8 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
             var protocols = [String]()
             let protocolList = class_copyProtocolList(internalClass, &count)
             for i in (0..<Int(count)) {
-                let unwrapped  = protocolList?[i].unsafelyUnwrapped
-                if let protocolName = protocol_getName(unwrapped) {
+                if let unwrapped  = protocolList?[i] {
+                    let protocolName = protocol_getName(unwrapped)
                     let string = String(cString: protocolName)
                     protocols.append(string)
                 }
@@ -92,8 +89,8 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
             var properties = [String]()
             let propertyList = class_copyPropertyList(internalClass, &count)
             for i in (0..<Int(count)) {
-                let unwrapped  = propertyList?[i].unsafelyUnwrapped
-                if let propretyName = property_getName(unwrapped) {
+                if let unwrapped  = propertyList?[i] {
+                    let propretyName = property_getName(unwrapped)
                     let string = String(cString: propretyName)
                     properties.append(string)
                 }
@@ -102,7 +99,4 @@ public class ObjectiveClass <T: NSObject>: ObjectiveKitRuntimeModification {
             return properties
         }
     }
-
 }
-
-
diff --git a/ObjectiveKit/RuntimeClass.swift b/ObjectiveKit/RuntimeClass.swift
@@ -10,9 +10,7 @@ import Foundation
 
 /// A class created at runtime.
 public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {
-
     public var internalClass: AnyClass
-
     private var registered: Bool = false
 
     // MARK: Lifecycle
@@ -22,7 +20,10 @@ public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {
     /// - Parameter superclass: Superclass to inherit from.
     public init(superclass: AnyClass = NSObject.classForCoder()) {
         let name = NSUUID().uuidString
-        self.internalClass = objc_allocateClassPair(superclass, name, 0)
+        guard let internalClass = objc_allocateClassPair(superclass, name, 0) else {
+            fatalError("The class '\(superclass)' could not be created")
+        }
+        self.internalClass = internalClass
     }
 
     // MARK: Dynamic class creation
@@ -41,7 +42,6 @@ public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {
         class_addIvar(self.internalClass, name, size, UInt8(alignment), rawEncoding)
     }
 
-
     /// Register class. Required before usage. Happens automatically on allocate.
     public func register() {
         if registered == false {
@@ -57,10 +57,8 @@ public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {
         self.register()
         return internalClass.alloc() as! NSObject
     }
-
 }
 
-
 /// Objective Type
 ///
 /// - NSString: NSString
@@ -87,6 +85,4 @@ public enum ObjectiveType: Int {
             case .Void: return "v"
         }
     }
-
 }
-
diff --git a/ObjectiveKit/RuntimeModification.swift b/ObjectiveKit/RuntimeModification.swift
@@ -9,7 +9,6 @@
 import Foundation
 
 public protocol ObjectiveKitRuntimeModification {
-
     var internalClass: AnyClass { get }
 
     // MARK: Runtime modification
@@ -26,50 +25,50 @@ public protocol ObjectiveKitRuntimeModification {
     /// - Parameters:
     ///   - identifier: Selector name.
     ///   - implementation: Implementation as a closure.
-    func addMethod(_ identifier: String, implementation: ImplementationBlock)
+    @discardableResult
+    func addMethod(_ identifier: String, implementation: @escaping @convention(block) (AnyObject) -> Void) -> Selector
 
     /// Exchange selectors implemented in the current class.
     ///
     /// - Parameters:
     ///   - aSelector: Selector.
     ///   - otherSelector: Selector.
     func exchangeSelector(_ aSelector: Selector, with otherSelector: Selector)
-
 }
 
 extension ObjectiveKitRuntimeModification {
-
     public func addSelector(_ selector: Selector, from originalClass: AnyClass) {
-        guard let method = class_getInstanceMethod(originalClass, selector), let implementation = method_getImplementation(method), let typeEncoding = method_getTypeEncoding(method) else {
+        guard let method = class_getInstanceMethod(originalClass, selector), let typeEncoding = method_getTypeEncoding(method) else {
             return
         }
+        let implementation = method_getImplementation(method)
         let string = String(cString: typeEncoding)
         class_addMethod(internalClass, selector, implementation, string)
     }
 
-    public func addMethod(_ identifier: String, implementation: ImplementationBlock) {
-        let blockObject = unsafeBitCast(implementation, to: AnyObject.self)
+    @discardableResult
+    public func addMethod(_ identifier: String, implementation: @escaping @convention(block) (AnyObject) -> Void) -> Selector {
+        let blockObject = unsafeBitCast(implementation, to: NSObject.self)
         let implementation = imp_implementationWithBlock(blockObject)
         let selector = NSSelectorFromString(identifier)
         let encoding = "v@:f"
-        class_addMethod(internalClass, selector, implementation, encoding)
+        class_replaceMethod(internalClass, selector, implementation, encoding)
+        return selector
     }
 
     public func exchangeSelector(_ aSelector: Selector, with otherSelector: Selector) {
-        let method = class_getInstanceMethod(internalClass, aSelector)
-        let otherMethod = class_getInstanceMethod(internalClass, otherSelector)
+        guard let method = class_getInstanceMethod(internalClass, aSelector), let otherMethod = class_getInstanceMethod(internalClass, otherSelector) else {
+            return
+        }
         method_exchangeImplementations(method, otherMethod)
     }
-
 }
 
 public extension NSObject {
-
     /// A convenience method to perform selectors by identifier strings.
     ///
     /// - Parameter identifier: Selector name.
-    public func performMethod(_ identifier: String) {
+    func performMethod(_ identifier: String) {
         perform(NSSelectorFromString(identifier))
     }
 }
-
diff --git a/ObjectiveKitTests/ObjectiveKitTests.swift b/ObjectiveKitTests/ObjectiveKitTests.swift
@@ -7,23 +7,20 @@
 //
 
 import XCTest
-import MapKit
 @testable import ObjectiveKit
 
-@objc class Subview: UIView {
+@objc protocol CustomProtocol { }
 
-    dynamic func testSelector() {
-        print("test selector")
-    }
+class Subview: UIView, CustomProtocol {
+    @objc var customVar = "something"
+    @objc let customLet = "something"
 
-    dynamic func swizzledSelector(){
-        print("swizzled selector")
+    @objc func customSelector() {
+        print("test selector")
     }
-
 }
 
-@objc class ObjectiveKitTests: XCTestCase {
-
+class ObjectiveKitTests: XCTestCase {
     let closureName = "random"
 
     dynamic func testSelector() {
@@ -33,7 +30,7 @@ import MapKit
     func testAddClosure() {
         let methodExpectation = expectation(description: "Method was called")
         let objectiveView = ObjectiveClass<UIView>()
-        objectiveView.addMethod(closureName, implementation: {
+        objectiveView.addMethod(closureName, implementation: { _ in
             methodExpectation.fulfill()
         })
         let view = UIView()
@@ -58,16 +55,14 @@ import MapKit
     }
 
     func testIntrospection() {
-        let objectiveView = ObjectiveClass<MKMapView>()
+        let objectiveView = ObjectiveClass<Subview>()
         let ivars = objectiveView.ivars
-        XCTAssert(ivars.contains("_camera"))
+        XCTAssertEqual(ivars, ["customVar", "customLet"])
         let selectors = objectiveView.selectors
-        XCTAssert(selectors.contains(NSSelectorFromString("layoutSubviews")))
+        XCTAssertEqual(selectors.last, NSSelectorFromString("customSelector"))
         let protocols = objectiveView.protocols
-        XCTAssert(protocols.contains("MKAnnotationManagerDelegate"))
+        XCTAssertEqual(protocols, ["ObjectiveKitTests.CustomProtocol"])
         let properties = objectiveView.properties
-        XCTAssert(properties.contains("mapRegion"))
+        XCTAssertEqual(properties, ["customVar", "customLet"])
     }
-
-
 }
diff --git a/Package.swift b/Package.swift

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,7 @@ import Foundation`
`10`	`10`
`11`	`11`	`/// A class created at runtime.`
`12`	`12`	`public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {`
`13`		`-`
`14`	`13`	`public var internalClass: AnyClass`
`15`		`-`
`16`	`14`	`private var registered: Bool = false`
`17`	`15`
`18`	`16`	`// MARK: Lifecycle`
`@@ -22,7 +20,10 @@ public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {`
`22`	`20`	`/// - Parameter superclass: Superclass to inherit from.`
`23`	`21`	`public init(superclass: AnyClass = NSObject.classForCoder()) {`
`24`	`22`	`let name = NSUUID().uuidString`
`25`		`- self.internalClass = objc_allocateClassPair(superclass, name, 0)`
	`23`	`+ guard let internalClass = objc_allocateClassPair(superclass, name, 0) else {`
	`24`	`+ fatalError("The class '\(superclass)' could not be created")`
	`25`	`+ }`
	`26`	`+ self.internalClass = internalClass`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`// MARK: Dynamic class creation`
`@@ -41,7 +42,6 @@ public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {`
`41`	`42`	`class_addIvar(self.internalClass, name, size, UInt8(alignment), rawEncoding)`
`42`	`43`	`}`
`43`	`44`
`44`		`-`
`45`	`45`	`/// Register class. Required before usage. Happens automatically on allocate.`
`46`	`46`	`public func register() {`
`47`	`47`	`if registered == false {`
`@@ -57,10 +57,8 @@ public class RuntimeClass: NSObject, ObjectiveKitRuntimeModification {`
`57`	`57`	`self.register()`
`58`	`58`	`return internalClass.alloc() as! NSObject`
`59`	`59`	`}`
`60`		`-`
`61`	`60`	`}`
`62`	`61`
`63`		`-`
`64`	`62`	`/// Objective Type`
`65`	`63`	`///`
`66`	`64`	`/// - NSString: NSString`
`@@ -87,6 +85,4 @@ public enum ObjectiveType: Int {`
`87`	`85`	`case .Void: return "v"`
`88`	`86`	`}`
`89`	`87`	`}`
`90`		`-`
`91`	`88`	`}`
`92`		`-`